diff options
| -rw-r--r-- | networking/libiproute/ipaddress.c | 21 | ||||
| -rw-r--r-- | networking/libiproute/iplink.c | 18 | ||||
| -rw-r--r-- | networking/libiproute/iproute.c | 14 | ||||
| -rw-r--r-- | networking/libiproute/iptunnel.c | 15 | ||||
| -rw-r--r-- | networking/libiproute/libnetlink.c | 13 | ||||
| -rw-r--r-- | networking/libiproute/ll_addr.c | 11 | ||||
| -rw-r--r-- | networking/libiproute/ll_map.c | 7 | ||||
| -rw-r--r-- | networking/libiproute/ll_proto.c | 10 | ||||
| -rw-r--r-- | networking/libiproute/ll_types.c | 12 | ||||
| -rw-r--r-- | networking/libiproute/rt_names.c | 6 | ||||
| -rw-r--r-- | networking/libiproute/rtm_map.c | 6 | ||||
| -rw-r--r-- | networking/libiproute/utils.c | 9 |
12 files changed, 29 insertions, 113 deletions
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index 6bba6e077..2821f2e8d 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c | |||
| @@ -12,31 +12,24 @@ | |||
| 12 | * Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated | 12 | * Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <stdio.h> | ||
| 16 | #include <stdlib.h> | ||
| 17 | #include <unistd.h> | ||
| 18 | #include <syslog.h> | ||
| 19 | #include <fcntl.h> | ||
| 20 | #include <sys/ioctl.h> | ||
| 21 | #include <sys/socket.h> | 15 | #include <sys/socket.h> |
| 22 | #include <sys/ioctl.h> | 16 | #include <sys/ioctl.h> |
| 23 | #include <netinet/in.h> | 17 | |
| 24 | #include <arpa/inet.h> | ||
| 25 | #include <string.h> | ||
| 26 | #include <fnmatch.h> | 18 | #include <fnmatch.h> |
| 19 | #include <stdlib.h> | ||
| 20 | #include <string.h> | ||
| 21 | #include <unistd.h> | ||
| 22 | |||
| 23 | #include <arpa/inet.h> | ||
| 27 | 24 | ||
| 28 | #define sysinfo kernel_sysinfo | 25 | #define sysinfo kernel_sysinfo |
| 29 | #include <linux/netdevice.h> | ||
| 30 | #include <linux/if_arp.h> | 26 | #include <linux/if_arp.h> |
| 31 | #include <linux/sockios.h> | ||
| 32 | #undef sysinfo | 27 | #undef sysinfo |
| 33 | 28 | ||
| 34 | #include "rt_names.h" | 29 | #include "rt_names.h" |
| 35 | #include "utils.h" | 30 | #include "utils.h" |
| 36 | #include "ll_map.h" | ||
| 37 | #include "ip_common.h" | ||
| 38 | 31 | ||
| 39 | #include "busybox.h" | 32 | #include "libbb.h" |
| 40 | 33 | ||
| 41 | static struct | 34 | static struct |
| 42 | { | 35 | { |
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index 33f38918a..ef4d6b9a5 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c | |||
| @@ -10,28 +10,24 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <stdio.h> | 13 | #include <sys/ioctl.h> |
| 14 | #include <sys/socket.h> | ||
| 15 | |||
| 16 | #include <errno.h> | ||
| 14 | #include <stdlib.h> | 17 | #include <stdlib.h> |
| 18 | #include <string.h> | ||
| 15 | #include <unistd.h> | 19 | #include <unistd.h> |
| 16 | #include <syslog.h> | 20 | |
| 17 | #include <fcntl.h> | ||
| 18 | #include <errno.h> | ||
| 19 | #include <sys/socket.h> | ||
| 20 | #include <linux/if.h> | 21 | #include <linux/if.h> |
| 21 | #include <linux/if_packet.h> | 22 | #include <linux/if_packet.h> |
| 22 | #include <linux/if_ether.h> | 23 | #include <linux/if_ether.h> |
| 23 | #include <linux/sockios.h> | 24 | #include <linux/sockios.h> |
| 24 | #include <netinet/in.h> | ||
| 25 | #include <arpa/inet.h> | ||
| 26 | #include <string.h> | ||
| 27 | #include <sys/ioctl.h> | ||
| 28 | #include <linux/sockios.h> | ||
| 29 | 25 | ||
| 30 | #include "rt_names.h" | 26 | #include "rt_names.h" |
| 31 | #include "utils.h" | 27 | #include "utils.h" |
| 32 | #include "ip_common.h" | 28 | #include "ip_common.h" |
| 33 | 29 | ||
| 34 | #include "busybox.h" | 30 | #include "libbb.h" |
| 35 | 31 | ||
| 36 | static int do_link; | 32 | static int do_link; |
| 37 | 33 | ||
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index f29a5158a..114fb6c90 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c | |||
| @@ -15,23 +15,15 @@ | |||
| 15 | * Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized | 15 | * Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <stdio.h> | 18 | #include <sys/socket.h> |
| 19 | |||
| 19 | #include <stdlib.h> | 20 | #include <stdlib.h> |
| 20 | #include <unistd.h> | ||
| 21 | #include <syslog.h> | ||
| 22 | #include <fcntl.h> | ||
| 23 | #include <string.h> | 21 | #include <string.h> |
| 24 | #include <sys/time.h> | ||
| 25 | #include <sys/socket.h> | ||
| 26 | #include <netinet/in.h> | ||
| 27 | #include <netinet/ip.h> | ||
| 28 | #include <arpa/inet.h> | ||
| 29 | #include <linux/in_route.h> | ||
| 30 | 22 | ||
| 31 | #include "rt_names.h" | 23 | #include "rt_names.h" |
| 32 | #include "utils.h" | 24 | #include "utils.h" |
| 33 | 25 | ||
| 34 | #include "busybox.h" | 26 | #include "libbb.h" |
| 35 | 27 | ||
| 36 | #ifndef RTAX_RTTVAR | 28 | #ifndef RTAX_RTTVAR |
| 37 | #define RTAX_RTTVAR RTAX_HOPS | 29 | #define RTAX_RTTVAR RTAX_HOPS |
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c index 58ec7cce6..3d73ca81c 100644 --- a/networking/libiproute/iptunnel.c +++ b/networking/libiproute/iptunnel.c | |||
| @@ -16,26 +16,23 @@ | |||
| 16 | * Phil Karn <karn@ka9q.ampr.org> 990408: "pmtudisc" flag | 16 | * Phil Karn <karn@ka9q.ampr.org> 990408: "pmtudisc" flag |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <stdio.h> | 19 | #include <sys/socket.h> |
| 20 | #include <sys/ioctl.h> | ||
| 21 | |||
| 20 | #include <stdlib.h> | 22 | #include <stdlib.h> |
| 21 | #include <string.h> | 23 | #include <string.h> |
| 22 | #include <unistd.h> | 24 | #include <unistd.h> |
| 23 | #include <syslog.h> | 25 | |
| 24 | #include <fcntl.h> | ||
| 25 | #include <sys/socket.h> | ||
| 26 | #include <sys/ioctl.h> | ||
| 27 | #include <netinet/in.h> | ||
| 28 | #include <netinet/ip.h> | ||
| 29 | #include <arpa/inet.h> | 26 | #include <arpa/inet.h> |
| 27 | #include <netinet/ip.h> | ||
| 30 | 28 | ||
| 31 | #include <linux/if.h> | ||
| 32 | #include <linux/if_arp.h> | 29 | #include <linux/if_arp.h> |
| 33 | #include <linux/if_tunnel.h> | 30 | #include <linux/if_tunnel.h> |
| 34 | 31 | ||
| 35 | #include "rt_names.h" | 32 | #include "rt_names.h" |
| 36 | #include "utils.h" | 33 | #include "utils.h" |
| 37 | 34 | ||
| 38 | #include "busybox.h" | 35 | #include "libbb.h" |
| 39 | 36 | ||
| 40 | static int do_ioctl_get_ifindex(char *dev) | 37 | static int do_ioctl_get_ifindex(char *dev) |
| 41 | { | 38 | { |
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c index 99672382a..fbc555dfe 100644 --- a/networking/libiproute/libnetlink.c +++ b/networking/libiproute/libnetlink.c | |||
| @@ -10,18 +10,13 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <stdio.h> | ||
| 14 | #include <stdlib.h> | ||
| 15 | #include <unistd.h> | ||
| 16 | #include <syslog.h> | ||
| 17 | #include <fcntl.h> | ||
| 18 | #include <net/if_arp.h> | ||
| 19 | #include <sys/socket.h> | 13 | #include <sys/socket.h> |
| 20 | #include <netinet/in.h> | 14 | |
| 21 | #include <string.h> | ||
| 22 | #include <errno.h> | 15 | #include <errno.h> |
| 16 | #include <stdio.h> | ||
| 17 | #include <string.h> | ||
| 23 | #include <time.h> | 18 | #include <time.h> |
| 24 | #include <sys/uio.h> | 19 | #include <unistd.h> |
| 25 | 20 | ||
| 26 | #include "libnetlink.h" | 21 | #include "libnetlink.h" |
| 27 | #include "libbb.h" | 22 | #include "libbb.h" |
diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c index 19b31366c..551484cf6 100644 --- a/networking/libiproute/ll_addr.c +++ b/networking/libiproute/ll_addr.c | |||
| @@ -9,21 +9,10 @@ | |||
| 9 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> | 9 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <stdio.h> | ||
| 13 | #include <stdlib.h> | ||
| 14 | #include <unistd.h> | ||
| 15 | #include <syslog.h> | ||
| 16 | #include <fcntl.h> | ||
| 17 | #include <sys/ioctl.h> | ||
| 18 | #include <sys/socket.h> | ||
| 19 | #include <sys/ioctl.h> | ||
| 20 | #include <netinet/in.h> | ||
| 21 | #include <arpa/inet.h> | 12 | #include <arpa/inet.h> |
| 22 | #include <string.h> | 13 | #include <string.h> |
| 23 | 14 | ||
| 24 | #include <linux/netdevice.h> | ||
| 25 | #include <linux/if_arp.h> | 15 | #include <linux/if_arp.h> |
| 26 | #include <linux/sockios.h> | ||
| 27 | 16 | ||
| 28 | #include "utils.h" | 17 | #include "utils.h" |
| 29 | #include "libbb.h" | 18 | #include "libbb.h" |
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c index e5a95e6a4..b7a828421 100644 --- a/networking/libiproute/ll_map.c +++ b/networking/libiproute/ll_map.c | |||
| @@ -11,16 +11,11 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <stdio.h> | 13 | #include <stdio.h> |
| 14 | #include <string.h> | ||
| 14 | #include <stdlib.h> | 15 | #include <stdlib.h> |
| 15 | #include <unistd.h> | ||
| 16 | #include <syslog.h> | ||
| 17 | #include <fcntl.h> | ||
| 18 | #include <sys/socket.h> | ||
| 19 | #include <netinet/in.h> | 16 | #include <netinet/in.h> |
| 20 | #include <string.h> | ||
| 21 | 17 | ||
| 22 | #include "libnetlink.h" | 18 | #include "libnetlink.h" |
| 23 | #include "ll_map.h" | ||
| 24 | 19 | ||
| 25 | struct idxmap | 20 | struct idxmap |
| 26 | { | 21 | { |
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c index 394338aea..d7b1dedfc 100644 --- a/networking/libiproute/ll_proto.c +++ b/networking/libiproute/ll_proto.c | |||
| @@ -10,20 +10,10 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <stdio.h> | 12 | #include <stdio.h> |
| 13 | #include <stdlib.h> | ||
| 14 | #include <unistd.h> | ||
| 15 | #include <syslog.h> | ||
| 16 | #include <fcntl.h> | ||
| 17 | #include <sys/ioctl.h> | ||
| 18 | #include <sys/socket.h> | ||
| 19 | #include <sys/ioctl.h> | ||
| 20 | #include <netinet/in.h> | ||
| 21 | #include <arpa/inet.h> | 13 | #include <arpa/inet.h> |
| 22 | #include <string.h> | 14 | #include <string.h> |
| 23 | 15 | ||
| 24 | #include <linux/netdevice.h> | ||
| 25 | #include <linux/if_arp.h> | 16 | #include <linux/if_arp.h> |
| 26 | #include <linux/sockios.h> | ||
| 27 | 17 | ||
| 28 | #include "utils.h" | 18 | #include "utils.h" |
| 29 | 19 | ||
diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c index f14583634..925d60ddc 100644 --- a/networking/libiproute/ll_types.c +++ b/networking/libiproute/ll_types.c | |||
| @@ -8,22 +8,10 @@ | |||
| 8 | * | 8 | * |
| 9 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> | 9 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> |
| 10 | */ | 10 | */ |
| 11 | |||
| 12 | #include <stdio.h> | 11 | #include <stdio.h> |
| 13 | #include <stdlib.h> | ||
| 14 | #include <unistd.h> | ||
| 15 | #include <syslog.h> | ||
| 16 | #include <fcntl.h> | ||
| 17 | #include <sys/ioctl.h> | ||
| 18 | #include <sys/socket.h> | ||
| 19 | #include <sys/ioctl.h> | ||
| 20 | #include <netinet/in.h> | ||
| 21 | #include <arpa/inet.h> | 12 | #include <arpa/inet.h> |
| 22 | #include <string.h> | ||
| 23 | 13 | ||
| 24 | #include <linux/netdevice.h> | ||
| 25 | #include <linux/if_arp.h> | 14 | #include <linux/if_arp.h> |
| 26 | #include <linux/sockios.h> | ||
| 27 | 15 | ||
| 28 | char * ll_type_n2a(int type, char *buf, int len) | 16 | char * ll_type_n2a(int type, char *buf, int len) |
| 29 | { | 17 | { |
diff --git a/networking/libiproute/rt_names.c b/networking/libiproute/rt_names.c index 2a7d85cdb..d503645b0 100644 --- a/networking/libiproute/rt_names.c +++ b/networking/libiproute/rt_names.c | |||
| @@ -8,14 +8,10 @@ | |||
| 8 | * | 8 | * |
| 9 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> | 9 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> |
| 10 | */ | 10 | */ |
| 11 | |||
| 12 | #include <stdio.h> | 11 | #include <stdio.h> |
| 13 | #include <stdlib.h> | 12 | #include <stdlib.h> |
| 14 | #include <unistd.h> | ||
| 15 | #include <syslog.h> | ||
| 16 | #include <fcntl.h> | ||
| 17 | #include <string.h> | 13 | #include <string.h> |
| 18 | #include <sys/time.h> | 14 | |
| 19 | #include <stdint.h> | 15 | #include <stdint.h> |
| 20 | 16 | ||
| 21 | static void rtnl_tab_initialize(char *file, char **tab, int size) | 17 | static void rtnl_tab_initialize(char *file, char **tab, int size) |
diff --git a/networking/libiproute/rtm_map.c b/networking/libiproute/rtm_map.c index 21e818b4a..5f6a9e69c 100644 --- a/networking/libiproute/rtm_map.c +++ b/networking/libiproute/rtm_map.c | |||
| @@ -10,14 +10,8 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <stdio.h> | ||
| 14 | #include <stdlib.h> | 13 | #include <stdlib.h> |
| 15 | #include <unistd.h> | ||
| 16 | #include <syslog.h> | ||
| 17 | #include <fcntl.h> | ||
| 18 | #include <string.h> | 14 | #include <string.h> |
| 19 | #include <sys/socket.h> | ||
| 20 | #include <netinet/in.h> | ||
| 21 | 15 | ||
| 22 | #include "rt_names.h" | 16 | #include "rt_names.h" |
| 23 | #include "utils.h" | 17 | #include "utils.h" |
diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c index 9ae21b464..63084e15e 100644 --- a/networking/libiproute/utils.c +++ b/networking/libiproute/utils.c | |||
| @@ -14,19 +14,10 @@ | |||
| 14 | * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses | 14 | * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <stdio.h> | ||
| 18 | #include <stdlib.h> | 17 | #include <stdlib.h> |
| 19 | #include <unistd.h> | ||
| 20 | #include <syslog.h> | ||
| 21 | #include <fcntl.h> | ||
| 22 | #include <sys/socket.h> | ||
| 23 | #include <netinet/in.h> | ||
| 24 | #include <string.h> | 18 | #include <string.h> |
| 25 | #include <netdb.h> | ||
| 26 | #include <arpa/inet.h> | 19 | #include <arpa/inet.h> |
| 27 | #include <resolv.h> | ||
| 28 | 20 | ||
| 29 | #include "./linux/pkt_sched.h" | ||
| 30 | #include "utils.h" | 21 | #include "utils.h" |
| 31 | #include "libbb.h" | 22 | #include "libbb.h" |
| 32 | 23 | ||
