diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-07-15 16:20:42 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-07-15 16:20:42 +0000 |
| commit | e4b519a09f47be4c342e27d6b59d6d682e3d5641 (patch) | |
| tree | 51f5a8b70d793ba38c3428087f0d6aee626e9b2c /net-analyzer/netselect/files | |
| parent | Added fence_xen, closed bug #124345. (diff) | |
| download | gentoo-2-e4b519a09f47be4c342e27d6b59d6d682e3d5641.tar.gz gentoo-2-e4b519a09f47be4c342e27d6b59d6d682e3d5641.tar.bz2 gentoo-2-e4b519a09f47be4c342e27d6b59d6d682e3d5641.zip | |
Add patch to make netselect work on non-Linux systems (BSDish), thanks to Timothy Redaelli in bug #140414. Add ~x86-fbsd keyword.
(Portage version: 2.1.1_pre2-r8)
Diffstat (limited to 'net-analyzer/netselect/files')
| -rw-r--r-- | net-analyzer/netselect/files/digest-netselect-0.3-r1 | 2 | ||||
| -rw-r--r-- | net-analyzer/netselect/files/netselect-0.3-bsd.patch | 55 |
2 files changed, 57 insertions, 0 deletions
diff --git a/net-analyzer/netselect/files/digest-netselect-0.3-r1 b/net-analyzer/netselect/files/digest-netselect-0.3-r1 index c6c319950d7b..b8cf6541048d 100644 --- a/net-analyzer/netselect/files/digest-netselect-0.3-r1 +++ b/net-analyzer/netselect/files/digest-netselect-0.3-r1 @@ -1 +1,3 @@ MD5 3a3714946db2458e5db3d55373057ef2 netselect-0.3.tar.gz 22047 +RMD160 f57b7348549a033c008d3b67b85ef12a3f91c9aa netselect-0.3.tar.gz 22047 +SHA256 fe81942589d5219d030e5cecfb12787fb6d3613416cb326dea4952bf53f9c978 netselect-0.3.tar.gz 22047 diff --git a/net-analyzer/netselect/files/netselect-0.3-bsd.patch b/net-analyzer/netselect/files/netselect-0.3-bsd.patch new file mode 100644 index 000000000000..6e7f1cacca48 --- /dev/null +++ b/net-analyzer/netselect/files/netselect-0.3-bsd.patch @@ -0,0 +1,55 @@ +--- netselect.c.orig 2006-07-14 22:59:18.000000000 +0200 ++++ netselect.c 2006-07-14 22:57:22.000000000 +0200 +@@ -39,14 +39,13 @@ + * 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> ++#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 +151,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 +234,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 +717,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); |