diff options
Diffstat (limited to 'net-analyzer/netselect/files')
-rw-r--r-- | net-analyzer/netselect/files/netselect-0.3-bsd.patch | 56 | ||||
-rw-r--r-- | net-analyzer/netselect/files/netselect-0.3-glibc.patch | 11 |
2 files changed, 0 insertions, 67 deletions
diff --git a/net-analyzer/netselect/files/netselect-0.3-bsd.patch b/net-analyzer/netselect/files/netselect-0.3-bsd.patch deleted file mode 100644 index e9624d87215a..000000000000 --- a/net-analyzer/netselect/files/netselect-0.3-bsd.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/netselect.c -+++ b/netselect.c -@@ -39,14 +39,14 @@ - * hey, great! Let me know. -- apenwarr - */ - --#ifdef __EMX__ --# include <io.h> --# include <fcntl.h> --# include <sys/types.h> --# include <sys/select.h> --# include <machine/endian.h> --#else --# include <endian.h> -+#ifdef __linux__ -+#include <endian.h> -+#include <sys/types.h> -+#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) -+#if defined(__OpenBSD__) -+#include <machine/types.h> -+#endif -+#include <machine/endian.h> - #endif - - #include <sys/param.h> -@@ -152,6 +152,7 @@ - extern int optind; - int hostcount, startcount, endcount = 0, sent_one, lag, min_lag = 100; - int ch, seq, ttl, max_ttl = 30, min_tries = 10, num_score = 1; -+ int on = 1; - struct timeval now; - struct timezone tz; - OPacket outpacket; /* last output (udp) packet */ -@@ -234,7 +235,12 @@ - if (verbose >= 1) - fprintf(stderr, "Running netselect to choose %d out of %d address%s.\n", - num_score, numhosts, numhosts==1 ? "" : "es"); -- -+ -+ if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on)) < 0) { -+ perror("IP_HDRINCL"); -+ _exit(EXIT_FAILURE); -+ } -+ - /* keep going until most of the hosts have been finished */ - must_continue = numhosts; - while (must_continue && must_continue >= numhosts/2) -@@ -712,7 +718,7 @@ - ip->ip_off = 0; - ip->ip_hl = sizeof(*ip) >> 2; - ip->ip_p = IPPROTO_UDP; -- ip->ip_len = 0; /* kernel fills this in */ -+ ip->ip_len = sizeof(OPacket); - ip->ip_ttl = ttl; - ip->ip_v = IPVERSION; - ip->ip_id = htons(ident + seq); diff --git a/net-analyzer/netselect/files/netselect-0.3-glibc.patch b/net-analyzer/netselect/files/netselect-0.3-glibc.patch deleted file mode 100644 index 053e5865b341..000000000000 --- a/net-analyzer/netselect/files/netselect-0.3-glibc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/netselect.c -+++ b/netselect.c -@@ -780,7 +780,7 @@ - #if !defined(__GLIBC__) - int fromlen = sizeof(from); - #else /* __GLIBC__ */ -- size_t fromlen = sizeof(from); -+ socklen_t fromlen = sizeof(from); - #endif /* __GLIBC__ */ - - FD_ZERO(&fds); |