From e58817d14871a3d2718d53e43630d2a57e3d6330 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 21 Aug 2009 01:16:24 +0200 Subject: remove unused crap --- package/ndisc/patches/patch-rdnssd_rdnssd_c.orig | 61 ----------- package/ndisc/patches/patch-src_ndisc_c.orig | 20 ---- package/ndisc/patches/patch-src_tcpspray_c.orig | 31 ------ package/ndisc/patches/patch-src_traceroute_c.orig | 128 ---------------------- package/ndisc/patches/patch-src_traceroute_h.orig | 26 ----- 5 files changed, 266 deletions(-) delete mode 100644 package/ndisc/patches/patch-rdnssd_rdnssd_c.orig delete mode 100644 package/ndisc/patches/patch-src_ndisc_c.orig delete mode 100644 package/ndisc/patches/patch-src_tcpspray_c.orig delete mode 100644 package/ndisc/patches/patch-src_traceroute_c.orig delete mode 100644 package/ndisc/patches/patch-src_traceroute_h.orig (limited to 'package/ndisc') diff --git a/package/ndisc/patches/patch-rdnssd_rdnssd_c.orig b/package/ndisc/patches/patch-rdnssd_rdnssd_c.orig deleted file mode 100644 index be06580f6..000000000 --- a/package/ndisc/patches/patch-rdnssd_rdnssd_c.orig +++ /dev/null @@ -1,61 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- ndisc6-0.9.8.orig/rdnssd/rdnssd.c 2008-05-01 14:52:28.000000000 +0200 -+++ ndisc6-0.9.8/rdnssd/rdnssd.c 2009-05-10 19:41:53.000000000 +0200 -@@ -76,6 +76,7 @@ static struct - - static void write_resolv(const char *resolvpath) - { -+ size_t i; - FILE *resolv; - int rval; - char tmpfile[strlen(resolvpath) + sizeof(".tmp")]; -@@ -89,7 +90,7 @@ static void write_resolv(const char *res - return; - } - -- for (size_t i = 0; i < servers.count; i++) { -+ for (i = 0; i < servers.count; i++) { - char addr[INET6_ADDRSTRLEN]; - inet_ntop(AF_INET6, &servers.list[i].addr, addr, INET6_ADDRSTRLEN); - -@@ -132,6 +133,7 @@ static int rdnss_older (const void *a, c - static void rdnss_update (const struct in6_addr *addr, unsigned int ifindex, time_t expiry) - { - size_t i; -+ unsigned int j; - - /* Does this entry already exist? */ - for (i = 0; i < servers.count; i++) -@@ -165,12 +167,12 @@ static void rdnss_update (const struct i - qsort (servers.list, servers.count, sizeof (rdnss_t), rdnss_older); - - #ifndef NDEBUG -- for (unsigned i = 0; i < servers.count; i++) -+ for (j = 0; j < servers.count; j++) - { - char buf[INET6_ADDRSTRLEN]; -- inet_ntop (AF_INET6, &servers.list[i].addr, buf, -+ inet_ntop (AF_INET6, &servers.list[j].addr, buf, - sizeof (buf)); -- syslog (LOG_DEBUG, "%u: %48s expires at %u\n", i, buf, -+ syslog (LOG_DEBUG, "%u: %48s expires at %u\n", j, buf, - (unsigned)servers.list[i].expiry); - } - #endif -@@ -178,6 +180,7 @@ static void rdnss_update (const struct i - - int parse_nd_opts (const struct nd_opt_hdr *opt, size_t opts_len, unsigned int ifindex) - { -+ struct in6_addr *addr; - for (; opts_len >= sizeof(struct nd_opt_hdr); - opts_len -= opt->nd_opt_len << 3, - opt = (const struct nd_opt_hdr *) -@@ -206,7 +209,7 @@ int parse_nd_opts (const struct nd_opt_h - - lifetime = now + ntohl(rdnss_opt->nd_opt_rdnss_lifetime); - -- for (struct in6_addr *addr = (struct in6_addr *) (rdnss_opt + 1); -+ for (addr = (struct in6_addr *) (rdnss_opt + 1); - nd_opt_len >= 2; addr++, nd_opt_len -= 2) - rdnss_update(addr, ifindex, lifetime); - diff --git a/package/ndisc/patches/patch-src_ndisc_c.orig b/package/ndisc/patches/patch-src_ndisc_c.orig deleted file mode 100644 index 8bc600948..000000000 --- a/package/ndisc/patches/patch-src_ndisc_c.orig +++ /dev/null @@ -1,20 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- ndisc6-0.9.8.orig/src/ndisc.c 2008-05-01 14:52:28.000000000 +0200 -+++ ndisc6-0.9.8/src/ndisc.c 2009-05-10 19:16:18.000000000 +0200 -@@ -521,6 +521,7 @@ static ssize_t - recvfromLL (int fd, void *buf, size_t len, int flags, - struct sockaddr_in6 *addr) - { -+ struct cmsghdr *cmsg; - char cbuf[CMSG_SPACE (sizeof (int))]; - struct iovec iov = - { -@@ -542,7 +543,7 @@ recvfromLL (int fd, void *buf, size_t le - return val; - - /* ensures the hop limit is 255 */ -- for (struct cmsghdr *cmsg = CMSG_FIRSTHDR (&hdr); -+ for (cmsg = CMSG_FIRSTHDR (&hdr); - cmsg != NULL; - cmsg = CMSG_NXTHDR (&hdr, cmsg)) - { diff --git a/package/ndisc/patches/patch-src_tcpspray_c.orig b/package/ndisc/patches/patch-src_tcpspray_c.orig deleted file mode 100644 index 15106ea1c..000000000 --- a/package/ndisc/patches/patch-src_tcpspray_c.orig +++ /dev/null @@ -1,31 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- ndisc6-0.9.8.orig/src/tcpspray.c 2008-05-01 14:52:28.000000000 +0200 -+++ ndisc6-0.9.8/src/tcpspray.c 2009-05-10 19:11:15.000000000 +0200 -@@ -60,7 +60,7 @@ static unsigned verbose = 0; - - static int tcpconnect (const char *host, const char *serv) - { -- struct addrinfo hints, *res; -+ struct addrinfo hints, *res, *p; - - memset (&hints, 0, sizeof (hints)); - hints.ai_family = family; -@@ -78,7 +78,7 @@ static int tcpconnect (const char *host, - - val = -1; - -- for (struct addrinfo *p = res; (p != NULL) && (val == -1); p = p->ai_next) -+ for (p = res; (p != NULL) && (val == -1); p = p->ai_next) - { - val = socket (p->ai_family, p->ai_socktype, p->ai_protocol); - if (val == -1) -@@ -172,7 +172,8 @@ tcpspray (const char *host, const char * - switch (child) - { - case 0: -- for (unsigned i = 0; i < n; i++) -+ unsigned int i; -+ for (i = 0; i < n; i++) - { - ssize_t val = recv (fd, block, blen, MSG_WAITALL); - if (val != (ssize_t)blen) diff --git a/package/ndisc/patches/patch-src_traceroute_c.orig b/package/ndisc/patches/patch-src_traceroute_c.orig deleted file mode 100644 index a7ff0cd44..000000000 --- a/package/ndisc/patches/patch-src_traceroute_c.orig +++ /dev/null @@ -1,128 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- ndisc6-0.9.8.orig/src/traceroute.c 2008-05-01 14:52:28.000000000 +0200 -+++ ndisc6-0.9.8/src/traceroute.c 2009-05-10 19:29:37.000000000 +0200 -@@ -149,6 +149,7 @@ static ssize_t - recv_payload (int fd, void *buf, size_t len, - struct sockaddr_in6 *addr, int *hlim) - { -+ struct cmsghdr *cmsg; - char cbuf[CMSG_SPACE (sizeof (int))]; - struct iovec iov = - { -@@ -170,7 +171,7 @@ recv_payload (int fd, void *buf, size_t - return val; - - /* ensures the hop limit is 255 */ -- for (struct cmsghdr *cmsg = CMSG_FIRSTHDR (&hdr); -+ for (cmsg = CMSG_FIRSTHDR (&hdr); - cmsg != NULL; - cmsg = CMSG_NXTHDR (&hdr, cmsg)) - if ((cmsg->cmsg_level == IPPROTO_IPV6) -@@ -625,14 +626,16 @@ static void - display (const tracetest_t *tab, unsigned min_ttl, unsigned max_ttl, - unsigned retries) - { -- for (unsigned ttl = min_ttl; ttl <= max_ttl; ttl++) -+ unsigned int ttl, col; -+ -+ for (ttl = min_ttl; ttl <= max_ttl; ttl++) - { - struct sockaddr_in6 hop = { .sin6_family = AF_UNSPEC }; - const tracetest_t *line = tab + retries * (ttl - min_ttl); - - printf ("%2d ", ttl); - -- for (unsigned col = 0; col < retries; col++) -+ for (col = 0; col < retries; col++) - { - const tracetest_t *test = line + col; - if (test->result == TRACE_TIMEOUT) -@@ -821,6 +824,7 @@ static void setup_socket (int fd) - - static int setsock_rth (int fd, int type, const char **segv, int segc) - { -+ int i; - uint8_t hdr[inet6_rth_space (type, segc)]; - inet6_rth_init (hdr, sizeof (hdr), type, segc); - -@@ -829,7 +833,7 @@ static int setsock_rth (int fd, int type - hints.ai_family = AF_INET6; - hints.ai_flags = AI_IDN; - -- for (int i = 0; i < segc; i++) -+ for (i = 0; i < segc; i++) - { - struct addrinfo *res; - -@@ -868,7 +872,8 @@ static struct - - static int prepare_sockets (void) - { -- for (unsigned i = 0; i < sizeof (protofd) / sizeof (protofd[0]); i++) -+ unsigned int i; -+ for (i = 0; i < sizeof (protofd) / sizeof (protofd[0]); i++) - { - protofd[i].fd = socket (AF_INET6, SOCK_RAW, protofd[i].protocol); - if (protofd[i].fd == -1) -@@ -883,8 +888,9 @@ static int prepare_sockets (void) - - static int get_socket (int protocol) - { -+ unsigned int i; - errno = EPROTONOSUPPORT; -- for (unsigned i = 0; i < sizeof (protofd) / sizeof (protofd[0]); i++) -+ for (i = 0; i < sizeof (protofd) / sizeof (protofd[0]); i++) - if (protofd[i].protocol == protocol) - { - int fd = protofd[i].fd; -@@ -902,7 +908,8 @@ static int get_socket (int protocol) - - static void drop_sockets (void) - { -- for (unsigned i = 0; i < sizeof (protofd) / sizeof (protofd[0]); i++) -+ unsigned int i; -+ for (i = 0; i < sizeof (protofd) / sizeof (protofd[0]); i++) - if (protofd[i].fd != -1) - close (protofd[i].fd); - } -@@ -914,6 +921,8 @@ traceroute (const char *dsthost, const c - unsigned timeout, unsigned delay, unsigned retries, - size_t packet_len, int min_ttl, int max_ttl) - { -+ unsigned int i, j, step; -+ - /* Creates ICMPv6 socket to collect error packets */ - int icmpfd = get_socket (IPPROTO_ICMPV6); - if (icmpfd == -1) -@@ -1020,7 +1029,7 @@ traceroute (const char *dsthost, const c - .filter = f, - }; - -- for (unsigned i = 0; i < 4; i++) -+ for (i = 0; i < 4; i++) - { - /* A = icmp->ip6_dst.s6_addr32[i]; */ - pc->code = BPF_LD + BPF_W + BPF_ABS; -@@ -1076,7 +1085,7 @@ traceroute (const char *dsthost, const c - tracetest_t tab[(1 + max_ttl - min_ttl) * retries]; - memset (tab, 0, sizeof (tab)); - -- for (unsigned step = 1, progress = 0; -+ for (step = 1, progress = 0; - step < (1 + max_ttl - min_ttl) + retries; - step++) - { -@@ -1093,10 +1102,10 @@ traceroute (const char *dsthost, const c - mono_nanosleep (&delay_ts); - - /* Sends requests */ -- for (unsigned i = 0; i < retries; i++) -+ for (j = 0; j < retries; j++) - { -- int attempt = (retries - 1) - i; -- int hlim = min_ttl + step + i - retries; -+ int attempt = (retries - 1) - j; -+ int hlim = min_ttl + step + j - retries; - - if ((hlim > max_ttl) || (hlim < min_ttl)) - continue; diff --git a/package/ndisc/patches/patch-src_traceroute_h.orig b/package/ndisc/patches/patch-src_traceroute_h.orig deleted file mode 100644 index 48da9765a..000000000 --- a/package/ndisc/patches/patch-src_traceroute_h.orig +++ /dev/null @@ -1,26 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- ndisc6-0.9.8.orig/src/traceroute.h 2008-05-01 14:52:28.000000000 +0200 -+++ ndisc6-0.9.8/src/traceroute.h 2009-05-10 19:23:18.000000000 +0200 -@@ -24,9 +24,9 @@ - typedef ssize_t (*trace_send_t) (int fd, unsigned ttl, unsigned n, - size_t plen, uint16_t port); - --typedef ssize_t (*trace_parser_t) (const void *restrict data, size_t len, -- int *restrict ttl, -- unsigned *restrict n, uint16_t port); -+typedef ssize_t (*trace_parser_t) (const void data, size_t len, -+ int ttl, -+ unsigned n, uint16_t port); - - typedef struct tracetype - { -@@ -34,7 +34,8 @@ typedef struct tracetype - int protocol; - int checksum_offset; - trace_send_t send_probe; -- trace_parser_t parse_resp, parse_err; -+ trace_parser_t parse_resp; -+ trace_parser_t parse_err; - } tracetype; - - # ifdef __cplusplus -- cgit v1.2.3