1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
diff -ur iproute2-2.6.7.orig/lib/ll_addr.c iproute2-2.6.7/lib/ll_addr.c
--- iproute2-2.6.7.orig/lib/ll_addr.c 2004-06-22 15:23:26.671351840 -0400
+++ iproute2-2.6.7/lib/ll_addr.c 2004-06-22 15:24:05.193495584 -0400
@@ -17,10 +17,10 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
+#include <netinet/in.h>
#include <linux/netdevice.h>
#include <linux/if_arp.h>
#include <linux/sockios.h>
-#include <netinet/in.h>
#include <arpa/inet.h>
#include <string.h>
diff -ur iproute2-2.6.7.orig/lib/ll_proto.c iproute2-2.6.7/lib/ll_proto.c
--- iproute2-2.6.7.orig/lib/ll_proto.c 2004-06-22 15:23:26.671351840 -0400
+++ iproute2-2.6.7/lib/ll_proto.c 2004-06-22 15:23:55.268004488 -0400
@@ -17,10 +17,10 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
+#include <netinet/in.h>
#include <linux/netdevice.h>
#include <linux/if_arp.h>
#include <linux/sockios.h>
-#include <netinet/in.h>
#include <arpa/inet.h>
#include <string.h>
diff -ur iproute2-2.6.7.orig/lib/ll_types.c iproute2-2.6.7/lib/ll_types.c
--- iproute2-2.6.7.orig/lib/ll_types.c 2004-06-22 15:23:26.671351840 -0400
+++ iproute2-2.6.7/lib/ll_types.c 2004-06-22 15:23:42.533940360 -0400
@@ -17,10 +17,10 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
+#include <netinet/in.h>
#include <linux/netdevice.h>
#include <linux/if_arp.h>
#include <linux/sockios.h>
-#include <netinet/in.h>
#include <arpa/inet.h>
#include <string.h>
diff -ur iproute2-2.6.7.orig/ip/ipaddress.c iproute2-2.6.7/ip/ipaddress.c
--- iproute2-2.6.7.orig/ip/ipaddress.c 2004-06-22 15:26:00.353988528 -0400
+++ iproute2-2.6.7/ip/ipaddress.c 2004-06-22 15:26:11.743257096 -0400
@@ -20,10 +20,10 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
+#include <netinet/in.h>
#include <linux/netdevice.h>
#include <linux/if_arp.h>
#include <linux/sockios.h>
-#include <netinet/in.h>
#include <arpa/inet.h>
#include <string.h>
#include <fnmatch.h>
diff -ur iproute2-2.6.7.orig/misc/ss.c iproute2-2.6.7/misc/ss.c
--- iproute2-2.6.7.orig/misc/ss.c 2004-06-22 15:26:00.414979256 -0400
+++ iproute2-2.6.7/misc/ss.c 2004-06-22 15:26:30.166456344 -0400
@@ -35,6 +35,7 @@
#include <asm/byteorder.h>
#include <linux/tcp.h>
#include <linux/tcp_diag.h>
+#include <linux/version.h>
int resolve_hosts = 0;
int resolve_services = 1;
@@ -1318,11 +1319,14 @@
if (info->tcpi_snd_ssthresh < 0xFFFF)
printf(" ssthresh:%d", info->tcpi_snd_ssthresh);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
if (info->tcpi_rcv_rtt)
printf(" rcv_rtt:%g", (double) info->tcpi_rcv_rtt/1000);
if (info->tcpi_rcv_space)
printf(" rcv_space:%d", info->tcpi_rcv_space);
+#endif
+#ifdef TCPDIAG_VEGASINFO
if (tb[TCPDIAG_VEGASINFO]) {
const struct tcpvegas_info *vinfo
= RTA_DATA(tb[TCPDIAG_VEGASINFO]);
@@ -1340,6 +1341,7 @@
8000000. / (double) vinfo->tcpv_rtt);
}
}
+#endif
}
}
diff -ur iproute2-2.6.7.orig/ip/ipmaddr.c iproute2-2.6.7/ip/ipmaddr.c
--- iproute2-2.6.7.orig/ip/ipmaddr.c 2004-06-22 15:27:35.910461736 -0400
+++ iproute2-2.6.7/ip/ipmaddr.c 2004-06-22 15:28:30.871106448 -0400
@@ -17,11 +17,11 @@
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <linux/netdevice.h>
#include <linux/if.h>
#include <linux/if_arp.h>
#include <linux/sockios.h>
-#include <netinet/in.h>
#include <arpa/inet.h>
#include <string.h>
diff -ur iproute2-2.6.7.orig/ip/ipmroute.c iproute2-2.6.7/ip/ipmroute.c
--- iproute2-2.6.7.orig/ip/ipmroute.c 2004-06-22 15:27:35.912461432 -0400
+++ iproute2-2.6.7/ip/ipmroute.c 2004-06-22 15:28:55.027434128 -0400
@@ -17,11 +17,11 @@
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <linux/netdevice.h>
#include <linux/if.h>
#include <linux/if_arp.h>
#include <linux/sockios.h>
-#include <netinet/in.h>
#include <arpa/inet.h>
#include <string.h>
|
GitWeb