libupnp/libupnp.patch

Thu, 04 Oct 2012 20:30:05 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 04 Oct 2012 20:30:05 +0200
changeset 715
c10fb90893b9
parent 70
1b746d93c8f0
permissions
-rw-r--r--

Correct out of date build configuration, porting to Solaris 11 network
link infrastructure and new libpcap logic. This additionally allows for
device drivers in subdirectories of /dev. Correct packaged nmap
personalities and signatures to work out of the box. Finally, hack
arpd logic to properly close sockets and quit on TERM by repeating
signaling in the run command script. Sadly, all this fails to correct
the run time behaviour of honeyd which fails to bind to the IP layer.

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

mercurial