src/patches/iputils-20020927-headers.patch

   1 diff -urN iputils/clockdiff.c iputils.new/clockdiff.c
   2 --- iputils/clockdiff.c 2002-02-22 19:10:59.000000000 -0500
   3 +++ iputils.new/clockdiff.c     2003-09-10 09:20:28.000000000 -0400
   4 @@ -2,6 +2,7 @@
   5  #include <sys/types.h>
   6  #include <sys/param.h>
   7  #include <stdio.h>
   8 +#include <linux/types.h>
   9  #include <unistd.h>
  10  #include <stdlib.h>
  11  #include <math.h>
  12 diff -urN iputils/ping6.c iputils.new/ping6.c
  13 --- iputils/ping6.c     2003-09-10 17:27:48.000000000 -0400
  14 +++ iputils.new/ping6.c 2003-09-10 17:22:43.000000000 -0400
  15 @@ -68,8 +68,44 @@
  16   */
  17  #include "ping_common.h"
  18
  19 -#include <linux/in6.h>
  20 -#include <linux/ipv6.h>
  21 +struct ipv6_rt_hdr {
  22 +        __u8            nexthdr;
  23 +        __u8            hdrlen;
  24 +        __u8            type;
  25 +        __u8            segments_left;
  26 +
  27 +        /*
  28 +         *      type specific data
  29 +         *      variable length field
  30 +         */
  31 +};
  32 +
  33 +struct rt0_hdr {
  34 +        struct ipv6_rt_hdr      rt_hdr;
  35 +        __u32                   bitmap;         /* strict/loose bit map */
  36 +        struct in6_addr         addr[0];
  37 +
  38 +#define rt0_type                rt_hdr.type;
  39 +};
  40 +#define IPV6_SRCRT_TYPE_0     0       /* IPv6 type 0 Routing Header   */
  41 +struct ipv6hdr {
  42 +#if defined(__LITTLE_ENDIAN)
  43 +        __u8                    priority:4,
  44 +                                version:4;
  45 +#elif defined(__BIG_ENDIAN)
  46 +        __u8                    version:4,
  47 +                                priority:4;
  48 +#endif
  49 +        __u8                    flow_lbl[3];
  50 +
  51 +        __u16                   payload_len;
  52 +        __u8                    nexthdr;
  53 +        __u8                    hop_limit;
  54 +
  55 +        struct  in6_addr        saddr;
  56 +        struct  in6_addr        daddr;
  57 +};
  58 +
  59  #include <linux/icmpv6.h>
  60
  61  #define BIT_CLEAR(nr, addr) do { ((__u32 *)(addr))[(nr) >> 5] &= ~(1U << ((nr) & 31)); } while(0)
  62 diff -urN iputils/ping.c iputils.new/ping.c
  63 --- iputils/ping.c      2003-09-10 17:27:48.000000000 -0400
  64 +++ iputils.new/ping.c  2003-09-10 17:18:16.000000000 -0400
  65 @@ -60,8 +60,8 @@
  66
  67  #include "ping_common.h"
  68
  69 +#include <linux/icmp.h>
  70  #include <netinet/ip.h>
  71 -#include <netinet/ip_icmp.h>
  72
  73
  74  #define        MAXIPLEN        60
  75 diff -urN iputils/ping_common.h iputils.new/ping_common.h
  76 --- iputils/ping_common.h       2002-09-20 11:08:11.000000000 -0400
  77 +++ iputils.new/ping_common.h   2003-09-10 17:16:16.000000000 -0400
  78 @@ -19,6 +19,7 @@
  79
  80  #include <netinet/in.h>
  81  #include <arpa/inet.h>
  82 +#include <linux/types.h>
  83  #include <linux/errqueue.h>
  84
  85  #include "SNAPSHOT.h"
  86 diff -urN iputils/tftpd.c iputils.new/tftpd.c
  87 --- iputils/tftpd.c     2002-01-23 19:31:41.000000000 -0500
  88 +++ iputils.new/tftpd.c 2003-09-10 09:39:45.000000000 -0400
  89 @@ -57,7 +57,6 @@
  90
  91  #include <sys/socket.h>
  92  #include <netinet/in.h>
  93 -#include <linux/in6.h>
  94  #include <netdb.h>
  95
  96  #include <setjmp.h>
  97 diff -urN iputils/tracepath6.c iputils.new/tracepath6.c
  98 --- iputils/tracepath6.c        2001-09-01 22:03:46.000000000 -0400
  99 +++ iputils.new/tracepath6.c    2003-09-10 09:40:18.000000000 -0400
 100 @@ -14,8 +14,7 @@
 101  #include <unistd.h>
 102  #include <sys/socket.h>
 103  #include <netinet/in.h>
 104 -
 105 -#include <linux/in6.h>
 106 +#include <linux/types.h>
 107  #include <linux/errqueue.h>
 108  #include <errno.h>
 109  #include <string.h>
 110 diff -urN iputils/tracepath.c iputils.new/tracepath.c
 111 --- iputils/tracepath.c 2002-02-22 19:10:59.000000000 -0500
 112 +++ iputils.new/tracepath.c     2003-09-10 06:14:35.000000000 -0400
 113 @@ -13,6 +13,7 @@
 114  #include <stdlib.h>
 115  #include <unistd.h>
 116  #include <sys/socket.h>
 117 +#include <linux/types.h>
 118  #include <linux/errqueue.h>
 119  #include <errno.h>
 120  #include <string.h>
 121 diff -urN iputils/traceroute6.c iputils.new/traceroute6.c
 122 --- iputils/traceroute6.c       2002-09-20 11:44:22.000000000 -0400
 123 +++ iputils.new/traceroute6.c   2003-09-10 10:12:47.000000000 -0400
 124 @@ -246,9 +246,24 @@
 125  #include <netinet/ip_icmp.h>
 126  #include <netinet/udp.h>
 127
 128 -#include <linux/ipv6.h>
 129 -#include <linux/in6.h>
 130 +#include <linux/types.h>
 131 +struct ipv6hdr {
 132 +#if defined(__LITTLE_ENDIAN)
 133 +        __u8                    priority:4,
 134 +                                version:4;
 135 +#elif defined(__BIG_ENDIAN)
 136 +        __u8                    version:4,
 137 +                                priority:4;
 138 +#endif
 139 +        __u8                    flow_lbl[3];
 140 +
 141 +        __u16                   payload_len;
 142 +        __u8                    nexthdr;
 143 +        __u8                    hop_limit;
 144
 145 +        struct  in6_addr        saddr;
 146 +        struct  in6_addr        daddr;
 147 +};
 148  #include <linux/icmpv6.h>
 149
 150  #include <arpa/inet.h>