1 diff -ruN iproute2.old/Makefile iproute2/Makefile
2 --- iproute2.old/Makefile Thu Aug 2 08:37:03 2001
3 +++ iproute2/Makefile Mon Dec 1 22:31:11 2003
6 ADDLIB+=ipx_ntop.o ipx_pton.o
8 -ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
9 - ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
10 - GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
13 -ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
14 - GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
16 +#ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
17 +# ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
18 +# GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
21 +#ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
22 +# GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
26 CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -Werror -g
27 diff -ruN iproute2.old/include/utils.h iproute2/include/utils.h
28 --- iproute2.old/include/utils.h Sun Apr 16 19:42:50 2000
29 +++ iproute2/include/utils.h Mon Dec 1 22:31:11 2003
32 #include <asm/types.h>
33 #include <asm/bitops.h>
34 +#include <netinet/in.h>
35 #include <linux/inetdevice.h>
39 #include "libnetlink.h"
41 diff -ruN iproute2.old/ip/ipaddress.c iproute2/ip/ipaddress.c
42 --- iproute2.old/ip/ipaddress.c Thu Aug 23 06:07:46 2001
43 +++ iproute2/ip/ipaddress.c Mon Dec 1 22:31:20 2003
45 #include <linux/netdevice.h>
46 #include <linux/if_arp.h>
47 #include <linux/sockios.h>
48 -#include <netinet/in.h>
49 -#include <arpa/inet.h>
53 diff -ruN iproute2.old/ip/ipmaddr.c iproute2/ip/ipmaddr.c
54 --- iproute2.old/ip/ipmaddr.c Sun Apr 16 19:42:51 2000
55 +++ iproute2/ip/ipmaddr.c Mon Dec 1 22:31:11 2003
58 #include <linux/if_arp.h>
59 #include <linux/sockios.h>
60 -#include <netinet/in.h>
61 -#include <arpa/inet.h>
64 -#include "rt_names.h"
66 +#include "rt_names.h"
70 diff -ruN iproute2.old/ip/ipmroute.c iproute2/ip/ipmroute.c
71 --- iproute2.old/ip/ipmroute.c Fri Aug 24 19:19:20 2001
72 +++ iproute2/ip/ipmroute.c Mon Dec 1 22:31:11 2003
75 #include <linux/if_arp.h>
76 #include <linux/sockios.h>
77 -#include <netinet/in.h>
78 -#include <arpa/inet.h>
82 diff -ruN iproute2.old/ip/ipneigh.c iproute2/ip/ipneigh.c
83 --- iproute2.old/ip/ipneigh.c Sun Apr 16 19:42:51 2000
84 +++ iproute2/ip/ipneigh.c Mon Dec 1 22:31:11 2003
86 #include <netinet/in.h>
87 #include <netinet/ip.h>
89 -#include "rt_names.h"
91 +#include "rt_names.h"
92 #include "ip_common.h"
94 #define NUD_VALID (NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE|NUD_PROBE|NUD_STALE|NUD_DELAY)
95 diff -ruN iproute2.old/ip/iproute.c iproute2/ip/iproute.c
96 --- iproute2.old/ip/iproute.c Mon Aug 6 02:31:52 2001
97 +++ iproute2/ip/iproute.c Mon Dec 1 22:31:11 2003
99 #include <arpa/inet.h>
100 #include <linux/in_route.h>
102 -#include "rt_names.h"
104 +#include "rt_names.h"
105 #include "ip_common.h"
108 diff -ruN iproute2.old/ip/iprule.c iproute2/ip/iprule.c
109 --- iproute2.old/ip/iprule.c Thu Aug 2 05:43:29 2001
110 +++ iproute2/ip/iprule.c Mon Dec 1 22:31:11 2003
112 #include <arpa/inet.h>
115 -#include "rt_names.h"
117 +#include "rt_names.h"
119 static void usage(void) __attribute__((noreturn));
121 diff -ruN iproute2.old/ip/rtacct.c iproute2/ip/rtacct.c
122 --- iproute2.old/ip/rtacct.c Sun Apr 16 19:42:51 2000
123 +++ iproute2/ip/rtacct.c Mon Dec 1 22:31:11 2003
125 #include <sys/time.h>
128 +#include <netinet/in.h>
131 #include "rt_names.h"
133 int main(int argc, char **argv)
134 diff -ruN iproute2.old/ip/rtm_map.c iproute2/ip/rtm_map.c
135 --- iproute2.old/ip/rtm_map.c Sun Apr 16 19:42:51 2000
136 +++ iproute2/ip/rtm_map.c Mon Dec 1 22:31:11 2003
138 #include <sys/socket.h>
139 #include <netinet/in.h>
141 -#include "rt_names.h"
143 +#include "rt_names.h"
145 char *rtnl_rtntype_n2a(int id, char *buf, int len)
147 diff -ruN iproute2.old/lib/dnet_ntop.c iproute2/lib/dnet_ntop.c
148 --- iproute2.old/lib/dnet_ntop.c Sun Apr 16 19:42:52 2000
149 +++ iproute2/lib/dnet_ntop.c Mon Dec 1 22:31:11 2003
152 #include <sys/types.h>
154 #include <netinet/in.h>
157 diff -ruN iproute2.old/lib/ll_proto.c iproute2/lib/ll_proto.c
158 --- iproute2.old/lib/ll_proto.c Thu Aug 2 04:41:41 2001
159 +++ iproute2/lib/ll_proto.c Mon Dec 1 22:31:11 2003
161 #include <linux/netdevice.h>
162 #include <linux/if_arp.h>
163 #include <linux/sockios.h>
164 -#include <netinet/in.h>
165 -#include <arpa/inet.h>
169 diff -ruN iproute2.old/lib/ll_types.c iproute2/lib/ll_types.c
170 --- iproute2.old/lib/ll_types.c Thu Aug 2 05:18:33 2001
171 +++ iproute2/lib/ll_types.c Mon Dec 1 22:31:11 2003
173 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
182 #include <sys/ioctl.h>
183 #include <sys/socket.h>
184 -#include <sys/ioctl.h>
185 #include <linux/netdevice.h>
186 #include <linux/if_arp.h>
187 #include <linux/sockios.h>
188 -#include <netinet/in.h>
189 -#include <arpa/inet.h>
192 char * ll_type_n2a(int type, char *buf, int len)
193 diff -ruN iproute2.old/lib/rt_names.c iproute2/lib/rt_names.c
194 --- iproute2.old/lib/rt_names.c Sun Apr 16 19:42:52 2000
195 +++ iproute2/lib/rt_names.c Mon Dec 1 22:31:11 2003
199 #include <sys/time.h>
200 +#include <asm/types.h>
202 static void rtnl_tab_initialize(char *file, char **tab, int size)
204 diff -ruN iproute2.old/lib/utils.c iproute2/lib/utils.c
205 --- iproute2.old/lib/utils.c Fri Aug 24 19:09:54 2001
206 +++ iproute2/lib/utils.c Mon Dec 1 22:31:11 2003
209 #include <arpa/inet.h>
211 -#include <linux/pkt_sched.h>
215 diff -ruN iproute2.old/tc/f_rsvp.c iproute2/tc/f_rsvp.c
216 --- iproute2.old/tc/f_rsvp.c Thu Aug 2 06:19:40 2001
217 +++ iproute2/tc/f_rsvp.c Mon Dec 1 22:31:11 2003
219 #include <arpa/inet.h>
222 -#include "rt_names.h"
224 +#include "rt_names.h"
227 static void explain(void)
228 diff -ruN iproute2.old/tc/q_htb.c iproute2/tc/q_htb.c
229 --- iproute2.old/tc/q_htb.c Mon Dec 1 22:30:53 2003
230 +++ iproute2/tc/q_htb.c Mon Dec 1 22:31:11 2003
232 #include <netinet/in.h>
233 #include <arpa/inet.h>
235 +#include <linux/param.h>
239 diff -ruN iproute2.old/tc/tc_filter.c iproute2/tc/tc_filter.c
240 --- iproute2.old/tc/tc_filter.c Fri Aug 24 19:19:19 2001
241 +++ iproute2/tc/tc_filter.c Mon Dec 1 22:31:11 2003
244 #include <linux/if_ether.h>
246 -#include "rt_names.h"
248 +#include "rt_names.h"
250 #include "tc_common.h"