|
|
|
@ -17,94 +17,46 @@ |
|
|
|
# |
|
|
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
|
|
|
|
|
|
--- ./include/rt_names.h.orig 2003-04-06 17:07:44.000000000 +0200
|
|
|
|
+++ ./include/rt_names.h 2003-04-06 17:07:52.000000000 +0200
|
|
|
|
@@ -1,6 +1,8 @@
|
|
|
|
#ifndef RT_NAMES_H_ |
|
|
|
#define RT_NAMES_H_ 1 |
|
|
|
diff -urN iproute2-2.6.10-ss050112/include/libnetlink.h iproute2-2.6.10-ss050112-diet/include/libnetlink.h
|
|
|
|
--- iproute2-2.6.10-ss050112/include/libnetlink.h 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/include/libnetlink.h 2005-01-15 00:20:05.355728253 +0100
|
|
|
|
@@ -1,6 +1,7 @@
|
|
|
|
#ifndef __LIBNETLINK_H__ |
|
|
|
#define __LIBNETLINK_H__ 1 |
|
|
|
|
|
|
|
+#include <asm/types.h>
|
|
|
|
+
|
|
|
|
const char* rtnl_rtprot_n2a(int id, char *buf, int len); |
|
|
|
const char* rtnl_rtscope_n2a(int id, char *buf, int len); |
|
|
|
const char* rtnl_rttable_n2a(int id, char *buf, int len); |
|
|
|
--- ./include-glibc/netinet/ip.h.orig 2003-04-06 17:20:41.000000000 +0200
|
|
|
|
+++ ./include-glibc/netinet/ip.h 2003-04-06 17:23:28.000000000 +0200
|
|
|
|
@@ -1,3 +1,5 @@
|
|
|
|
+#include_next <netinet/ip.h>
|
|
|
|
+#if 0
|
|
|
|
#ifndef __NETINET_IP_H |
|
|
|
#define __NETINET_IP_H 1 |
|
|
|
|
|
|
|
@@ -7,3 +9,4 @@
|
|
|
|
#include <linux/ip.h> |
|
|
|
+#include <stdio.h>
|
|
|
|
#include <asm/types.h> |
|
|
|
#include <linux/netlink.h> |
|
|
|
#include <linux/rtnetlink.h> |
|
|
|
diff -urN iproute2-2.6.10-ss050112/include/utils.h iproute2-2.6.10-ss050112-diet/include/utils.h
|
|
|
|
--- iproute2-2.6.10-ss050112/include/utils.h 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/include/utils.h 2005-01-15 00:20:05.355728253 +0100
|
|
|
|
@@ -1,8 +1,8 @@
|
|
|
|
#ifndef __UTILS_H__ |
|
|
|
#define __UTILS_H__ 1 |
|
|
|
|
|
|
|
-#include <asm/types.h>
|
|
|
|
-#include <resolv.h>
|
|
|
|
+// #include <asm/types.h>
|
|
|
|
+// #include <resolv.h>
|
|
|
|
|
|
|
|
#include "libnetlink.h" |
|
|
|
#include "ll_map.h" |
|
|
|
diff -urN iproute2-2.6.10-ss050112/ip/ipaddress.c iproute2-2.6.10-ss050112-diet/ip/ipaddress.c
|
|
|
|
--- iproute2-2.6.10-ss050112/ip/ipaddress.c 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/ip/ipaddress.c 2005-01-15 00:20:05.356728114 +0100
|
|
|
|
@@ -25,7 +25,7 @@
|
|
|
|
#include <string.h> |
|
|
|
#include <fnmatch.h> |
|
|
|
|
|
|
|
#endif /* netinet/ip.h */ |
|
|
|
+#endif
|
|
|
|
--- ./ip/ipaddress.c.orig 2001-08-23 06:07:46.000000000 +0200
|
|
|
|
+++ ./ip/ipaddress.c 2003-04-06 17:05:14.000000000 +0200
|
|
|
|
@@ -20,8 +20,9 @@
|
|
|
|
#include <sys/ioctl.h> |
|
|
|
#include <sys/socket.h> |
|
|
|
#include <sys/ioctl.h> |
|
|
|
-#include <linux/netdevice.h>
|
|
|
|
-#include <linux/if_arp.h>
|
|
|
|
+// #include <linux/netdevice.h>
|
|
|
|
+#include <net/if.h>
|
|
|
|
+#include <net/if_arp.h>
|
|
|
|
#include <linux/sockios.h> |
|
|
|
#include <netinet/in.h> |
|
|
|
#include <arpa/inet.h> |
|
|
|
@@ -33,6 +34,39 @@
|
|
|
|
#include "ll_map.h" |
|
|
|
#include "ip_common.h" |
|
|
|
|
|
|
|
+struct net_device_stats
|
|
|
|
+{
|
|
|
|
+ unsigned long rx_packets; /* total packets received */
|
|
|
|
+ unsigned long tx_packets; /* total packets transmitted */
|
|
|
|
+ unsigned long rx_bytes; /* total bytes received */
|
|
|
|
+ unsigned long tx_bytes; /* total bytes transmitted */
|
|
|
|
+ unsigned long rx_errors; /* bad packets received */
|
|
|
|
+ unsigned long tx_errors; /* packet transmit problems */
|
|
|
|
+ unsigned long rx_dropped; /* no space in linux buffers */
|
|
|
|
+ unsigned long tx_dropped; /* no space available in linux */
|
|
|
|
+ unsigned long multicast; /* multicast packets received */
|
|
|
|
+ unsigned long collisions;
|
|
|
|
+
|
|
|
|
+ /* detailed rx_errors: */
|
|
|
|
+ unsigned long rx_length_errors;
|
|
|
|
+ unsigned long rx_over_errors; /* receiver ring buff overflow */
|
|
|
|
+ unsigned long rx_crc_errors; /* recved pkt with crc error */
|
|
|
|
+ unsigned long rx_frame_errors; /* recv'd frame alignment error */
|
|
|
|
+ unsigned long rx_fifo_errors; /* recv'r fifo overrun */
|
|
|
|
+ unsigned long rx_missed_errors; /* receiver missed packet */
|
|
|
|
+
|
|
|
|
+ /* detailed tx_errors */
|
|
|
|
+ unsigned long tx_aborted_errors;
|
|
|
|
+ unsigned long tx_carrier_errors;
|
|
|
|
+ unsigned long tx_fifo_errors;
|
|
|
|
+ unsigned long tx_heartbeat_errors;
|
|
|
|
+ unsigned long tx_window_errors;
|
|
|
|
+
|
|
|
|
+ /* for cslip etc */
|
|
|
|
+ unsigned long rx_compressed;
|
|
|
|
+ unsigned long tx_compressed;
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
static struct |
|
|
|
{ |
|
|
|
int ifindex; |
|
|
|
--- ./ip/iptunnel.c.orig 2003-04-06 17:08:43.000000000 +0200
|
|
|
|
+++ ./ip/iptunnel.c 2003-04-06 17:09:17.000000000 +0200
|
|
|
|
@@ -30,4 +30,5 @@
|
|
|
|
#include <sys/ioctl.h> |
|
|
|
+#include <asm/byteorder.h>
|
|
|
|
#include <linux/if.h> |
|
|
|
#include <linux/if_arp.h> |
|
|
|
#include <netinet/in.h> |
|
|
|
--- ./ip/iplink.c.orig 2003-04-06 17:09:55.000000000 +0200
|
|
|
|
+++ ./ip/iplink.c 2003-04-06 17:10:04.000000000 +0200
|
|
|
|
#include <linux/sockios.h> |
|
|
|
|
|
|
|
diff -urN iproute2-2.6.10-ss050112/ip/iplink.c iproute2-2.6.10-ss050112-diet/ip/iplink.c
|
|
|
|
--- iproute2-2.6.10-ss050112/ip/iplink.c 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/ip/iplink.c 2005-01-15 00:20:05.357727976 +0100
|
|
|
|
@@ -10,6 +10,9 @@
|
|
|
|
* |
|
|
|
*/ |
|
|
|
@ -115,8 +67,9 @@ |
|
|
|
#include <stdio.h> |
|
|
|
#include <stdlib.h> |
|
|
|
#include <unistd.h> |
|
|
|
--- ./ip/ipmaddr.c.orig 2003-04-06 17:14:25.000000000 +0200
|
|
|
|
+++ ./ip/ipmaddr.c 2003-04-06 17:14:31.000000000 +0200
|
|
|
|
diff -urN iproute2-2.6.10-ss050112/ip/ipmaddr.c iproute2-2.6.10-ss050112-diet/ip/ipmaddr.c
|
|
|
|
--- iproute2-2.6.10-ss050112/ip/ipmaddr.c 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/ip/ipmaddr.c 2005-01-15 00:20:05.358727837 +0100
|
|
|
|
@@ -10,6 +10,9 @@
|
|
|
|
* |
|
|
|
*/ |
|
|
|
@ -127,8 +80,9 @@ |
|
|
|
#include <stdio.h> |
|
|
|
#include <stdlib.h> |
|
|
|
#include <unistd.h> |
|
|
|
--- ./ip/ipmroute.c.orig 2003-04-06 17:14:38.000000000 +0200
|
|
|
|
+++ ./ip/ipmroute.c 2003-04-06 17:14:43.000000000 +0200
|
|
|
|
diff -urN iproute2-2.6.10-ss050112/ip/ipmroute.c iproute2-2.6.10-ss050112-diet/ip/ipmroute.c
|
|
|
|
--- iproute2-2.6.10-ss050112/ip/ipmroute.c 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/ip/ipmroute.c 2005-01-15 00:20:05.359727698 +0100
|
|
|
|
@@ -10,6 +10,9 @@
|
|
|
|
* |
|
|
|
*/ |
|
|
|
@ -139,69 +93,80 @@ |
|
|
|
#include <stdio.h> |
|
|
|
#include <stdlib.h> |
|
|
|
#include <unistd.h> |
|
|
|
--- ./lib/rt_names.c.orig 2000-04-16 19:42:52.000000000 +0200
|
|
|
|
+++ ./lib/rt_names.c 2003-04-06 11:36:43.000000000 +0200
|
|
|
|
@@ -16,6 +16,7 @@
|
|
|
|
#include <fcntl.h> |
|
|
|
#include <string.h> |
|
|
|
#include <sys/time.h> |
|
|
|
+#include <asm/types.h>
|
|
|
|
|
|
|
|
static void rtnl_tab_initialize(char *file, char **tab, int size) |
|
|
|
{ |
|
|
|
--- ./lib/utils.c.orig 2001-08-24 19:09:54.000000000 +0200
|
|
|
|
+++ ./lib/utils.c 2003-04-06 11:36:43.000000000 +0200
|
|
|
|
@@ -25,6 +25,7 @@
|
|
|
|
#include <netdb.h> |
|
|
|
diff -urN iproute2-2.6.10-ss050112/ip/iptunnel.c iproute2-2.6.10-ss050112-diet/ip/iptunnel.c
|
|
|
|
--- iproute2-2.6.10-ss050112/ip/iptunnel.c 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/ip/iptunnel.c 2005-01-15 00:20:05.360727559 +0100
|
|
|
|
@@ -26,6 +26,7 @@
|
|
|
|
#include <netinet/in.h> |
|
|
|
#include <arpa/inet.h> |
|
|
|
#include <resolv.h> |
|
|
|
+#include <asm/types.h>
|
|
|
|
#include <linux/pkt_sched.h> |
|
|
|
|
|
|
|
#include "utils.h" |
|
|
|
--- ./lib/ll_addr.c.orig 2000-04-16 19:42:52.000000000 +0200
|
|
|
|
+++ ./lib/ll_addr.c 2003-04-06 11:36:43.000000000 +0200
|
|
|
|
@@ -17,8 +17,8 @@
|
|
|
|
#include <sys/ioctl.h> |
|
|
|
+#include <asm/byteorder.h>
|
|
|
|
#include <linux/if.h> |
|
|
|
#include <linux/if_arp.h> |
|
|
|
#include <linux/ip.h> |
|
|
|
diff -urN iproute2-2.6.10-ss050112/ip/ipxfrm.c iproute2-2.6.10-ss050112-diet/ip/ipxfrm.c
|
|
|
|
--- iproute2-2.6.10-ss050112/ip/ipxfrm.c 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/ip/ipxfrm.c 2005-01-15 00:20:05.361727421 +0100
|
|
|
|
@@ -32,6 +32,7 @@
|
|
|
|
#include <sys/socket.h> |
|
|
|
#include <sys/ioctl.h> |
|
|
|
#include <time.h> |
|
|
|
#include <netdb.h> |
|
|
|
+#include <netinet/in.h>
|
|
|
|
#include <net/if.h> |
|
|
|
#include <linux/netlink.h> |
|
|
|
#include <linux/rtnetlink.h> |
|
|
|
diff -urN iproute2-2.6.10-ss050112/ip/xfrm.h iproute2-2.6.10-ss050112-diet/ip/xfrm.h
|
|
|
|
--- iproute2-2.6.10-ss050112/ip/xfrm.h 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/ip/xfrm.h 2005-01-15 00:20:05.362727282 +0100
|
|
|
|
@@ -26,7 +26,7 @@
|
|
|
|
#define __XFRM_H__ 1 |
|
|
|
|
|
|
|
#include <stdio.h> |
|
|
|
-#include <sys/socket.h>
|
|
|
|
+// #include <sys/socket.h>
|
|
|
|
#include <linux/xfrm.h> |
|
|
|
|
|
|
|
#ifndef IPPROTO_SCTP |
|
|
|
diff -urN iproute2-2.6.10-ss050112/lib/ll_addr.c iproute2-2.6.10-ss050112-diet/lib/ll_addr.c
|
|
|
|
--- iproute2-2.6.10-ss050112/lib/ll_addr.c 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/lib/ll_addr.c 2005-01-15 00:20:05.362727282 +0100
|
|
|
|
@@ -21,7 +21,7 @@
|
|
|
|
#include <arpa/inet.h> |
|
|
|
#include <string.h> |
|
|
|
|
|
|
|
-#include <linux/netdevice.h>
|
|
|
|
-#include <linux/if_arp.h>
|
|
|
|
+//#include <linux/netdevice.h>
|
|
|
|
+#include <net/if_arp.h>
|
|
|
|
+// #include <linux/netdevice.h>
|
|
|
|
#include <linux/if_arp.h> |
|
|
|
#include <linux/sockios.h> |
|
|
|
#include <netinet/in.h> |
|
|
|
|
|
|
|
diff -urN iproute2-2.6.10-ss050112/lib/ll_proto.c iproute2-2.6.10-ss050112-diet/lib/ll_proto.c
|
|
|
|
--- iproute2-2.6.10-ss050112/lib/ll_proto.c 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/lib/ll_proto.c 2005-01-15 00:20:05.363727143 +0100
|
|
|
|
@@ -21,7 +21,7 @@
|
|
|
|
#include <arpa/inet.h> |
|
|
|
--- ./lib/ll_proto.c.orig 2001-08-02 04:41:41.000000000 +0200
|
|
|
|
+++ ./lib/ll_proto.c 2003-04-06 11:36:43.000000000 +0200
|
|
|
|
@@ -17,8 +17,9 @@
|
|
|
|
#include <sys/ioctl.h> |
|
|
|
#include <sys/socket.h> |
|
|
|
#include <sys/ioctl.h> |
|
|
|
#include <string.h> |
|
|
|
|
|
|
|
-#include <linux/netdevice.h>
|
|
|
|
-#include <linux/if_arp.h>
|
|
|
|
+//#include <linux/netdevice.h>
|
|
|
|
+#include <net/if_arp.h>
|
|
|
|
+#include <net/if_ether.h>
|
|
|
|
+// #include <linux/netdevice.h>
|
|
|
|
#include <linux/if_arp.h> |
|
|
|
#include <linux/sockios.h> |
|
|
|
#include <netinet/in.h> |
|
|
|
|
|
|
|
diff -urN iproute2-2.6.10-ss050112/lib/ll_types.c iproute2-2.6.10-ss050112-diet/lib/ll_types.c
|
|
|
|
--- iproute2-2.6.10-ss050112/lib/ll_types.c 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/lib/ll_types.c 2005-01-15 00:20:05.364727004 +0100
|
|
|
|
@@ -21,7 +21,7 @@
|
|
|
|
#include <arpa/inet.h> |
|
|
|
--- ./lib/ll_types.c.orig 2001-08-02 05:18:33.000000000 +0200
|
|
|
|
+++ ./lib/ll_types.c 2003-04-06 11:36:43.000000000 +0200
|
|
|
|
@@ -17,8 +17,8 @@
|
|
|
|
#include <sys/ioctl.h> |
|
|
|
#include <sys/socket.h> |
|
|
|
#include <sys/ioctl.h> |
|
|
|
#include <string.h> |
|
|
|
|
|
|
|
-#include <linux/netdevice.h>
|
|
|
|
-#include <linux/if_arp.h>
|
|
|
|
+//#include <linux/netdevice.h>
|
|
|
|
+#include <net/if_arp.h>
|
|
|
|
+// #include <linux/netdevice.h>
|
|
|
|
#include <linux/if_arp.h> |
|
|
|
#include <linux/sockios.h> |
|
|
|
#include <netinet/in.h> |
|
|
|
#include <arpa/inet.h> |
|
|
|
--- ./Makefile.orig Fri Sep 5 14:30:17 2003
|
|
|
|
+++ ./Makefile Fri Sep 5 14:37:24 2003
|
|
|
|
@@ -5,7 +5,7 @@
|
|
|
|
|
|
|
|
diff -urN iproute2-2.6.10-ss050112/Makefile iproute2-2.6.10-ss050112-diet/Makefile
|
|
|
|
--- iproute2-2.6.10-ss050112/Makefile 2005-01-12 21:19:46.000000000 +0100
|
|
|
|
+++ iproute2-2.6.10-ss050112-diet/Makefile 2005-01-15 00:20:28.643496189 +0100
|
|
|
|
@@ -10,7 +10,7 @@
|
|
|
|
DEFINES= -DRESOLVE_HOSTNAMES |
|
|
|
|
|
|
|
#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc) |
|
|
|
@ -209,8 +174,8 @@ |
|
|
|
+LDLIBS=
|
|
|
|
ADDLIB= |
|
|
|
|
|
|
|
#options if you compile with libc5, and without a bind>=4.9.4 libresolv |
|
|
|
@@ -33,7 +33,7 @@
|
|
|
|
#options for decnet |
|
|
|
@@ -25,7 +25,7 @@
|
|
|
|
|
|
|
|
LDLIBS += -L../lib -lnetlink -lutil |
|
|
|
|
|
|
|
|
Stefan Paletta
20 years ago