Mon, 28 Jan 2013 17:37:18 +0100
Correct socket error reporting improvement with IPv6 portable code,
after helpful recommendation by Saúl Ibarra Corretgé on OSips devlist.
michael@632 | 1 | Index: upnp/sample/linux/tv_ctrlpt_main.c |
michael@632 | 2 | diff -Nau upnp/sample/linux/tv_ctrlpt_main.c.orig upnp/sample/linux/tv_ctrlpt_main.c |
michael@632 | 3 | --- upnp/sample/linux/tv_ctrlpt_main.c.orig 2008-03-22 17:48:13.000000000 +0100 |
michael@632 | 4 | +++ upnp/sample/linux/tv_ctrlpt_main.c 2009-01-12 16:05:10.847325711 +0100 |
michael@632 | 5 | @@ -60,7 +60,11 @@ |
michael@632 | 6 | /* Catch Ctrl-C and properly shutdown */ |
michael@632 | 7 | sigemptyset(&sigs_to_catch); |
michael@632 | 8 | sigaddset(&sigs_to_catch, SIGINT); |
michael@70 | 9 | +#if (defined(sun) && defined(__svr4__)) |
michael@632 | 10 | + sigwait(&sigs_to_catch); |
michael@70 | 11 | +#else |
michael@632 | 12 | sigwait(&sigs_to_catch, &sig); |
michael@70 | 13 | +#endif |
michael@632 | 14 | SampleUtil_Print("Shutting down on signal %d...\n", sig); |
michael@632 | 15 | #endif |
michael@632 | 16 | rc = TvCtrlPointStop(); |
michael@632 | 17 | Index: upnp/sample/linux/tv_combo_main.c |
michael@632 | 18 | diff -Nau upnp/sample/linux/tv_combo_main.c.orig upnp/sample/linux/tv_combo_main.c |
michael@632 | 19 | --- upnp/sample/linux/tv_combo_main.c.orig 2009-01-12 16:12:00.406762331 +0100 |
michael@632 | 20 | +++ upnp/sample/linux/tv_combo_main.c 2009-01-12 16:14:23.401611284 +0100 |
michael@632 | 21 | @@ -61,7 +61,11 @@ |
michael@632 | 22 | /* Catch Ctrl-C and properly shutdown */ |
michael@632 | 23 | sigemptyset(&sigs_to_catch); |
michael@632 | 24 | sigaddset(&sigs_to_catch, SIGINT); |
michael@70 | 25 | +#if (defined(sun) && defined(__svr4__)) |
michael@632 | 26 | + sigwait(&sigs_to_catch); |
michael@70 | 27 | +#else |
michael@632 | 28 | sigwait(&sigs_to_catch, &sig); |
michael@70 | 29 | +#endif |
michael@632 | 30 | SampleUtil_Print("Shutting down on signal %d...\n", sig); |
michael@632 | 31 | #endif |
michael@632 | 32 | TvDeviceStop(); |
michael@632 | 33 | Index: upnp/sample/linux/tv_device_main.c |
michael@632 | 34 | diff -Nau upnp/sample/linux/tv_device_main.c.orig upnp/sample/linux/tv_device_main.c |
michael@632 | 35 | --- upnp/sample/linux/tv_device_main.c.orig 2008-03-22 18:04:30.000000000 +0100 |
michael@632 | 36 | +++ upnp/sample/linux/tv_device_main.c 2009-01-12 16:19:03.504059810 +0100 |
michael@632 | 37 | @@ -59,7 +59,11 @@ |
michael@632 | 38 | /* Catch Ctrl-C and properly shutdown */ |
michael@632 | 39 | sigemptyset(&sigs_to_catch); |
michael@632 | 40 | sigaddset(&sigs_to_catch, SIGINT); |
michael@70 | 41 | +#if (defined(sun) && defined(__svr4__)) |
michael@632 | 42 | + sigwait(&sigs_to_catch); |
michael@70 | 43 | +#else |
michael@632 | 44 | sigwait(&sigs_to_catch, &sig); |
michael@70 | 45 | +#endif |
michael@632 | 46 | SampleUtil_Print("Shutting down on signal %d...\n", sig); |
michael@632 | 47 | #endif |
michael@632 | 48 | rc = TvDeviceStop(); |