aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2010-10-29 11:46:52 +0200
committerDenys Vlasenko <dvlasenk@redhat.com>2010-10-29 11:46:52 +0200
commitfb132e47370378474c68ad22c1c0cb2ccee178de (patch)
tree4f78d0fdd1c2fa2341c7d9bb17f9d98d099a238c /networking
parent66cb7bed33da605674c3d24734466b8e8a60e337 (diff)
downloadbusybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.tar.gz
busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.tar.bz2
busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.zip
whitespace cleanup
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'networking')
-rw-r--r--networking/httpd.c4
-rw-r--r--networking/inetd.c2
-rw-r--r--networking/ip.c4
-rw-r--r--networking/ipcalc.c6
-rw-r--r--networking/libiproute/ip_parse_common_args.c15
-rw-r--r--networking/libiproute/ipaddress.c10
-rw-r--r--networking/libiproute/iplink.c6
-rw-r--r--networking/libiproute/iproute.c15
-rw-r--r--networking/libiproute/iprule.c21
-rw-r--r--networking/libiproute/iptunnel.c10
-rw-r--r--networking/libiproute/libnetlink.c12
-rw-r--r--networking/libiproute/libnetlink.h10
-rw-r--r--networking/libiproute/ll_addr.c12
-rw-r--r--networking/libiproute/ll_map.c15
-rw-r--r--networking/libiproute/ll_proto.c12
-rw-r--r--networking/libiproute/ll_types.c12
-rw-r--r--networking/libiproute/rt_names.c12
-rw-r--r--networking/libiproute/rtm_map.c13
-rw-r--r--networking/libiproute/utils.c4
-rw-r--r--networking/libiproute/utils.h6
-rw-r--r--networking/nameif.c4
-rw-r--r--networking/netstat.c2
-rw-r--r--networking/ntpd.c6
-rw-r--r--networking/ntpd_simple.c2
-rw-r--r--networking/slattach.c4
-rw-r--r--networking/telnetd.c6
-rw-r--r--networking/vconfig.c4
-rw-r--r--networking/wget.c6
28 files changed, 103 insertions, 132 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index c174958e2..fa42d9850 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -231,7 +231,7 @@ struct globals {
231 int verbose; /* must be int (used by getopt32) */ 231 int verbose; /* must be int (used by getopt32) */
232 smallint flg_deny_all; 232 smallint flg_deny_all;
233 233
234 unsigned rmt_ip; /* used for IP-based allow/deny rules */ 234 unsigned rmt_ip; /* used for IP-based allow/deny rules */
235 time_t last_mod; 235 time_t last_mod;
236 char *rmt_ip_str; /* for $REMOTE_ADDR and $REMOTE_PORT */ 236 char *rmt_ip_str; /* for $REMOTE_ADDR and $REMOTE_PORT */
237 const char *bind_addr_or_port; 237 const char *bind_addr_or_port;
@@ -267,7 +267,7 @@ struct globals {
267#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR 267#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
268 Htaccess *script_i; /* config script interpreters */ 268 Htaccess *script_i; /* config script interpreters */
269#endif 269#endif
270 char *iobuf; /* [IOBUF_SIZE] */ 270 char *iobuf; /* [IOBUF_SIZE] */
271#define hdr_buf bb_common_bufsiz1 271#define hdr_buf bb_common_bufsiz1
272 char *hdr_ptr; 272 char *hdr_ptr;
273 int hdr_cnt; 273 int hdr_cnt;
diff --git a/networking/inetd.c b/networking/inetd.c
index 7030062b6..ac42c5272 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -295,7 +295,7 @@ struct globals {
295 struct rlimit rlim_ofile; 295 struct rlimit rlim_ofile;
296 servtab_t *serv_list; 296 servtab_t *serv_list;
297 int global_queuelen; 297 int global_queuelen;
298 int maxsock; /* max fd# in allsock, -1: unknown */ 298 int maxsock; /* max fd# in allsock, -1: unknown */
299 /* whenever maxsock grows, prev_maxsock is set to new maxsock, 299 /* whenever maxsock grows, prev_maxsock is set to new maxsock,
300 * but if maxsock is set to -1, prev_maxsock is not changed */ 300 * but if maxsock is set to -1, prev_maxsock is not changed */
301 int prev_maxsock; 301 int prev_maxsock;
diff --git a/networking/ip.c b/networking/ip.c
index 7b1e2eb6a..350656cef 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -1,13 +1,11 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * "ip" utility frontend.
4 *
5 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 3 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
6 * 4 *
7 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> 5 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
8 * 6 *
9 * Changes: 7 * Changes:
10 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses 8 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
11 * Bernhard Reutner-Fischer rewrote to use index_in_substr_array 9 * Bernhard Reutner-Fischer rewrote to use index_in_substr_array
12 */ 10 */
13 11
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index d4aa885c6..acbaa4ac5 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -15,9 +15,9 @@
15/* After libbb.h, because on some systems it needs other includes */ 15/* After libbb.h, because on some systems it needs other includes */
16#include <arpa/inet.h> 16#include <arpa/inet.h>
17 17
18#define CLASS_A_NETMASK ntohl(0xFF000000) 18#define CLASS_A_NETMASK ntohl(0xFF000000)
19#define CLASS_B_NETMASK ntohl(0xFFFF0000) 19#define CLASS_B_NETMASK ntohl(0xFFFF0000)
20#define CLASS_C_NETMASK ntohl(0xFFFFFF00) 20#define CLASS_C_NETMASK ntohl(0xFFFFFF00)
21 21
22static unsigned long get_netmask(unsigned long ipaddr) 22static unsigned long get_netmask(unsigned long ipaddr)
23{ 23{
diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c
index bf01528c4..59c759b23 100644
--- a/networking/libiproute/ip_parse_common_args.c
+++ b/networking/libiproute/ip_parse_common_args.c
@@ -1,18 +1,15 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * ip.c "ip" utility frontend. 3 * This program is free software; you can redistribute it and/or
4 * 4 * modify it under the terms of the GNU General Public License
5 * This program is free software; you can redistribute it and/or 5 * as published by the Free Software Foundation; either version
6 * modify it under the terms of the GNU General Public License 6 * 2 of the License, or (at your option) any later version.
7 * as published by the Free Software Foundation; either version
8 * 2 of the License, or (at your option) any later version.
9 *
10 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
11 * 7 *
8 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
12 * 9 *
13 * Changes: 10 * Changes:
14 * 11 *
15 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses 12 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
16 */ 13 */
17 14
18#include "ip_common.h" /* #include "libbb.h" is inside */ 15#include "ip_common.h" /* #include "libbb.h" is inside */
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 1be03a6c3..397a8ee34 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -1,13 +1,11 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * ipaddress.c "ip address".
4 *
5 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 3 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
6 * 4 *
7 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> 5 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
8 * 6 *
9 * Changes: 7 * Changes:
10 * Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated 8 * Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated
11 */ 9 */
12 10
13#include <fnmatch.h> 11#include <fnmatch.h>
@@ -20,7 +18,7 @@
20 18
21#ifndef IFF_LOWER_UP 19#ifndef IFF_LOWER_UP
22/* from linux/if.h */ 20/* from linux/if.h */
23#define IFF_LOWER_UP 0x10000 /* driver signals L1 up*/ 21#define IFF_LOWER_UP 0x10000 /* driver signals L1 up */
24#endif 22#endif
25 23
26struct filter_t { 24struct filter_t {
@@ -365,7 +363,7 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
365 363
366struct nlmsg_list { 364struct nlmsg_list {
367 struct nlmsg_list *next; 365 struct nlmsg_list *next;
368 struct nlmsghdr h; 366 struct nlmsghdr h;
369}; 367};
370 368
371static int print_selected_addrinfo(int ifindex, struct nlmsg_list *ainfo) 369static int print_selected_addrinfo(int ifindex, struct nlmsg_list *ainfo)
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index c5ba294aa..5a86ce678 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -296,9 +296,9 @@ static int do_change(char **argv, const unsigned rtm)
296 }; 296 };
297 struct rtnl_handle rth; 297 struct rtnl_handle rth;
298 struct { 298 struct {
299 struct nlmsghdr n; 299 struct nlmsghdr n;
300 struct ifinfomsg i; 300 struct ifinfomsg i;
301 char buf[1024]; 301 char buf[1024];
302 } req; 302 } req;
303 smalluint arg; 303 smalluint arg;
304 char *name_str = NULL, *link_str = NULL, *type_str = NULL, *dev_str = NULL; 304 char *name_str = NULL, *link_str = NULL, *type_str = NULL, *dev_str = NULL;
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 1696e6a34..f66774afe 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -1,19 +1,16 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * iproute.c "ip route".
4 *
5 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 3 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
6 * 4 *
7 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> 5 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
8 *
9 * 6 *
10 * Changes: 7 * Changes:
11 * 8 *
12 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses 9 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
13 * Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized 10 * Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized
14 */ 11 */
15 12
16#include "ip_common.h" /* #include "libbb.h" is inside */ 13#include "ip_common.h" /* #include "libbb.h" is inside */
17#include "rt_names.h" 14#include "rt_names.h"
18#include "utils.h" 15#include "utils.h"
19 16
@@ -327,9 +324,9 @@ IF_FEATURE_IP_RULE(ARG_table,)
327 }; 324 };
328 struct rtnl_handle rth; 325 struct rtnl_handle rth;
329 struct { 326 struct {
330 struct nlmsghdr n; 327 struct nlmsghdr n;
331 struct rtmsg r; 328 struct rtmsg r;
332 char buf[1024]; 329 char buf[1024];
333 } req; 330 } req;
334 char mxbuf[256]; 331 char mxbuf[256];
335 struct rtattr * mxrta = (void*)mxbuf; 332 struct rtattr * mxrta = (void*)mxbuf;
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 3af6a83a8..dd3265c7c 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -1,18 +1,15 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * iprule.c "ip rule". 3 * This program is free software; you can redistribute it and/or
4 * 4 * modify it under the terms of the GNU General Public License
5 * This program is free software; you can redistribute it and/or 5 * as published by the Free Software Foundation; either version
6 * modify it under the terms of the GNU General Public License 6 * 2 of the License, or (at your option) any later version.
7 * as published by the Free Software Foundation; either version
8 * 2 of the License, or (at your option) any later version.
9 *
10 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
11 * 7 *
8 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
12 * 9 *
13 * Changes: 10 * Changes:
14 * 11 *
15 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses 12 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
16 * initially integrated into busybox by Bernhard Reutner-Fischer 13 * initially integrated into busybox by Bernhard Reutner-Fischer
17 */ 14 */
18 15
@@ -191,9 +188,9 @@ static int iprule_modify(int cmd, char **argv)
191 bool table_ok = 0; 188 bool table_ok = 0;
192 struct rtnl_handle rth; 189 struct rtnl_handle rth;
193 struct { 190 struct {
194 struct nlmsghdr n; 191 struct nlmsghdr n;
195 struct rtmsg r; 192 struct rtmsg r;
196 char buf[1024]; 193 char buf[1024];
197 } req; 194 } req;
198 smalluint key; 195 smalluint key;
199 196
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index bce373d05..5942feafc 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -1,16 +1,14 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * iptunnel.c "ip tunnel"
4 *
5 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 3 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
6 * 4 *
7 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> 5 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
8 * 6 *
9 * Changes: 7 * Changes:
10 * 8 *
11 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses 9 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
12 * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit 10 * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit
13 * Phil Karn <karn@ka9q.ampr.org> 990408: "pmtudisc" flag 11 * Phil Karn <karn@ka9q.ampr.org> 990408: "pmtudisc" flag
14 */ 12 */
15 13
16#include <netinet/ip.h> 14#include <netinet/ip.h>
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index 8da80b2fc..3a37d97f8 100644
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -74,8 +74,8 @@ int FAST_FUNC rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, in
74 struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } }; 74 struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } };
75 struct msghdr msg = { 75 struct msghdr msg = {
76 (void*)&nladdr, sizeof(nladdr), 76 (void*)&nladdr, sizeof(nladdr),
77 iov, 2, 77 iov, 2,
78 NULL, 0, 78 NULL, 0,
79 0 79 0
80 }; 80 };
81 81
@@ -108,8 +108,8 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
108 108
109 struct msghdr msg = { 109 struct msghdr msg = {
110 (void*)&nladdr, sizeof(nladdr), 110 (void*)&nladdr, sizeof(nladdr),
111 &iov, 1, 111 &iov, 1,
112 NULL, 0, 112 NULL, 0,
113 0 113 0
114 }; 114 };
115 115
@@ -214,8 +214,8 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
214 char *buf = xmalloc(8*1024); /* avoid big stack buffer */ 214 char *buf = xmalloc(8*1024); /* avoid big stack buffer */
215 struct msghdr msg = { 215 struct msghdr msg = {
216 (void*)&nladdr, sizeof(nladdr), 216 (void*)&nladdr, sizeof(nladdr),
217 &iov, 1, 217 &iov, 1,
218 NULL, 0, 218 NULL, 0,
219 0 219 0
220 }; 220 };
221 221
diff --git a/networking/libiproute/libnetlink.h b/networking/libiproute/libnetlink.h
index 4e4d5b7b9..51bee2d67 100644
--- a/networking/libiproute/libnetlink.h
+++ b/networking/libiproute/libnetlink.h
@@ -11,11 +11,11 @@
11PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN 11PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
12 12
13struct rtnl_handle { 13struct rtnl_handle {
14 int fd; 14 int fd;
15 struct sockaddr_nl local; 15 struct sockaddr_nl local;
16 struct sockaddr_nl peer; 16 struct sockaddr_nl peer;
17 uint32_t seq; 17 uint32_t seq;
18 uint32_t dump; 18 uint32_t dump;
19}; 19};
20 20
21extern void xrtnl_open(struct rtnl_handle *rth) FAST_FUNC; 21extern void xrtnl_open(struct rtnl_handle *rth) FAST_FUNC;
diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c
index c2c01305d..33a54ea6c 100644
--- a/networking/libiproute/ll_addr.c
+++ b/networking/libiproute/ll_addr.c
@@ -1,13 +1,11 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * ll_addr.c 3 * This program is free software; you can redistribute it and/or
4 * modify it under the terms of the GNU General Public License
5 * as published by the Free Software Foundation; either version
6 * 2 of the License, or (at your option) any later version.
4 * 7 *
5 * This program is free software; you can redistribute it and/or 8 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
6 * modify it under the terms of the GNU General Public License
7 * as published by the Free Software Foundation; either version
8 * 2 of the License, or (at your option) any later version.
9 *
10 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
11 */ 9 */
12 10
13#include <net/if_arp.h> 11#include <net/if_arp.h>
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index 246b9e33a..27cd90f34 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -1,17 +1,14 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * ll_map.c 3 * This program is free software; you can redistribute it and/or
4 * 4 * modify it under the terms of the GNU General Public License
5 * This program is free software; you can redistribute it and/or 5 * as published by the Free Software Foundation; either version
6 * modify it under the terms of the GNU General Public License 6 * 2 of the License, or (at your option) any later version.
7 * as published by the Free Software Foundation; either version
8 * 2 of the License, or (at your option) any later version.
9 *
10 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
11 * 7 *
8 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
12 */ 9 */
13 10
14#include <net/if.h> /* struct ifreq and co. */ 11#include <net/if.h> /* struct ifreq and co. */
15 12
16#include "libbb.h" 13#include "libbb.h"
17#include "libnetlink.h" 14#include "libnetlink.h"
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c
index 1cd576f1d..04925ecf6 100644
--- a/networking/libiproute/ll_proto.c
+++ b/networking/libiproute/ll_proto.c
@@ -1,13 +1,11 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * ll_proto.c 3 * This program is free software; you can redistribute it and/or
4 * modify it under the terms of the GNU General Public License
5 * as published by the Free Software Foundation; either version
6 * 2 of the License, or (at your option) any later version.
4 * 7 *
5 * This program is free software; you can redistribute it and/or 8 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
6 * modify it under the terms of the GNU General Public License
7 * as published by the Free Software Foundation; either version
8 * 2 of the License, or (at your option) any later version.
9 *
10 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
11 */ 9 */
12 10
13#include "libbb.h" 11#include "libbb.h"
diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c
index 3861c2870..38b6c0516 100644
--- a/networking/libiproute/ll_types.c
+++ b/networking/libiproute/ll_types.c
@@ -1,13 +1,11 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * ll_types.c 3 * This program is free software; you can redistribute it and/or
4 * modify it under the terms of the GNU General Public License
5 * as published by the Free Software Foundation; either version
6 * 2 of the License, or (at your option) any later version.
4 * 7 *
5 * This program is free software; you can redistribute it and/or 8 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
6 * modify it under the terms of the GNU General Public License
7 * as published by the Free Software Foundation; either version
8 * 2 of the License, or (at your option) any later version.
9 *
10 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
11 */ 9 */
12#include <arpa/inet.h> 10#include <arpa/inet.h>
13#include <linux/if_arp.h> 11#include <linux/if_arp.h>
diff --git a/networking/libiproute/rt_names.c b/networking/libiproute/rt_names.c
index 8dd16e3d3..c474ab903 100644
--- a/networking/libiproute/rt_names.c
+++ b/networking/libiproute/rt_names.c
@@ -1,13 +1,11 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * rt_names.c rtnetlink names DB. 3 * This program is free software; you can redistribute it and/or
4 * modify it under the terms of the GNU General Public License
5 * as published by the Free Software Foundation; either version
6 * 2 of the License, or (at your option) any later version.
4 * 7 *
5 * This program is free software; you can redistribute it and/or 8 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
6 * modify it under the terms of the GNU General Public License
7 * as published by the Free Software Foundation; either version
8 * 2 of the License, or (at your option) any later version.
9 *
10 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
11 */ 9 */
12#include "libbb.h" 10#include "libbb.h"
13#include "rt_names.h" 11#include "rt_names.h"
diff --git a/networking/libiproute/rtm_map.c b/networking/libiproute/rtm_map.c
index 5e358e105..3bab53baf 100644
--- a/networking/libiproute/rtm_map.c
+++ b/networking/libiproute/rtm_map.c
@@ -1,14 +1,11 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * rtm_map.c 3 * This program is free software; you can redistribute it and/or
4 * 4 * modify it under the terms of the GNU General Public License
5 * This program is free software; you can redistribute it and/or 5 * as published by the Free Software Foundation; either version
6 * modify it under the terms of the GNU General Public License 6 * 2 of the License, or (at your option) any later version.
7 * as published by the Free Software Foundation; either version
8 * 2 of the License, or (at your option) any later version.
9 *
10 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
11 * 7 *
8 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
12 */ 9 */
13 10
14#include "libbb.h" 11#include "libbb.h"
diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c
index 2b646f0ea..24698864d 100644
--- a/networking/libiproute/utils.c
+++ b/networking/libiproute/utils.c
@@ -4,11 +4,11 @@
4 * 4 *
5 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 5 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
6 * 6 *
7 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> 7 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
8 * 8 *
9 * Changes: 9 * Changes:
10 * 10 *
11 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses 11 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
12 */ 12 */
13 13
14#include "libbb.h" 14#include "libbb.h"
diff --git a/networking/libiproute/utils.h b/networking/libiproute/utils.h
index ed03e785a..93c9d25d6 100644
--- a/networking/libiproute/utils.h
+++ b/networking/libiproute/utils.h
@@ -17,14 +17,14 @@ extern smallint oneline;
17extern char _SL_; 17extern char _SL_;
18 18
19#ifndef IPPROTO_ESP 19#ifndef IPPROTO_ESP
20#define IPPROTO_ESP 50 20#define IPPROTO_ESP 50
21#endif 21#endif
22#ifndef IPPROTO_AH 22#ifndef IPPROTO_AH
23#define IPPROTO_AH 51 23#define IPPROTO_AH 51
24#endif 24#endif
25 25
26#define SPRINT_BSIZE 64 26#define SPRINT_BSIZE 64
27#define SPRINT_BUF(x) char x[SPRINT_BSIZE] 27#define SPRINT_BUF(x) char x[SPRINT_BSIZE]
28 28
29extern void incomplete_command(void) NORETURN; 29extern void incomplete_command(void) NORETURN;
30 30
diff --git a/networking/nameif.c b/networking/nameif.c
index 45a3229f4..d02c2c11b 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -21,10 +21,10 @@
21#endif 21#endif
22 22
23/* Taken from linux/sockios.h */ 23/* Taken from linux/sockios.h */
24#define SIOCSIFNAME 0x8923 /* set interface name */ 24#define SIOCSIFNAME 0x8923 /* set interface name */
25 25
26/* Octets in one Ethernet addr, from <linux/if_ether.h> */ 26/* Octets in one Ethernet addr, from <linux/if_ether.h> */
27#define ETH_ALEN 6 27#define ETH_ALEN 6
28 28
29#ifndef ifr_newname 29#ifndef ifr_newname
30#define ifr_newname ifr_ifru.ifru_slave 30#define ifr_newname ifr_ifru.ifru_slave
diff --git a/networking/netstat.c b/networking/netstat.c
index 2a83af3ac..356fb53cb 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -699,7 +699,7 @@ int netstat_main(int argc UNUSED_PARAM, char **argv)
699 flags |= opt; 699 flags |= opt;
700 } 700 }
701 if (flags & (NETSTAT_TCP|NETSTAT_UDP|NETSTAT_RAW)) { 701 if (flags & (NETSTAT_TCP|NETSTAT_UDP|NETSTAT_RAW)) {
702 printf("Active Internet connections "); /* xxx */ 702 printf("Active Internet connections "); /* xxx */
703 703
704 if ((flags & (NETSTAT_LISTENING|NETSTAT_CONNECTED)) == (NETSTAT_LISTENING|NETSTAT_CONNECTED)) 704 if ((flags & (NETSTAT_LISTENING|NETSTAT_CONNECTED)) == (NETSTAT_LISTENING|NETSTAT_CONNECTED))
705 printf("(servers and established)"); 705 printf("(servers and established)");
diff --git a/networking/ntpd.c b/networking/ntpd.c
index b7bd239b5..8fe529edb 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -89,7 +89,7 @@
89//UNUSED: #define PANIC_THRESHOLD 1000 /* panic threshold (sec) */ 89//UNUSED: #define PANIC_THRESHOLD 1000 /* panic threshold (sec) */
90 90
91#define FREQ_TOLERANCE 0.000015 /* frequency tolerance (15 PPM) */ 91#define FREQ_TOLERANCE 0.000015 /* frequency tolerance (15 PPM) */
92#define BURSTPOLL 0 /* initial poll */ 92#define BURSTPOLL 0 /* initial poll */
93#define MINPOLL 5 /* minimum poll interval. std ntpd uses 6 (6: 64 sec) */ 93#define MINPOLL 5 /* minimum poll interval. std ntpd uses 6 (6: 64 sec) */
94#define BIGPOLL 10 /* drop to lower poll at any trouble (10: 17 min) */ 94#define BIGPOLL 10 /* drop to lower poll at any trouble (10: 17 min) */
95#define MAXPOLL 12 /* maximum poll interval (12: 1.1h, 17: 36.4h). std ntpd uses 17 */ 95#define MAXPOLL 12 /* maximum poll interval (12: 1.1h, 17: 36.4h). std ntpd uses 17 */
@@ -865,7 +865,7 @@ fit(peer_t *p, double rd)
865 VERB3 bb_error_msg("peer %s unfit for selection: unreachable", p->p_dotted); 865 VERB3 bb_error_msg("peer %s unfit for selection: unreachable", p->p_dotted);
866 return 0; 866 return 0;
867 } 867 }
868#if 0 /* we filter out such packets earlier */ 868#if 0 /* we filter out such packets earlier */
869 if ((p->lastpkt_status & LI_ALARM) == LI_ALARM 869 if ((p->lastpkt_status & LI_ALARM) == LI_ALARM
870 || p->lastpkt_stratum >= MAXSTRAT 870 || p->lastpkt_stratum >= MAXSTRAT
871 ) { 871 ) {
@@ -2110,7 +2110,7 @@ direct_freq(double fp_offset)
2110} 2110}
2111 2111
2112static void 2112static void
2113set_freq(double freq) /* frequency update */ 2113set_freq(double freq) /* frequency update */
2114{ 2114{
2115 char tbuf[80]; 2115 char tbuf[80];
2116 2116
diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
index 5905e54e9..4ad44e4f3 100644
--- a/networking/ntpd_simple.c
+++ b/networking/ntpd_simple.c
@@ -870,7 +870,7 @@ static NOINLINE void ntp_init(char **argv)
870 int prec = 0; 870 int prec = 0;
871 int b; 871 int b;
872# if 0 872# if 0
873 struct timespec tp; 873 struct timespec tp;
874 /* We can use sys_clock_getres but assuming 10ms tick should be fine */ 874 /* We can use sys_clock_getres but assuming 10ms tick should be fine */
875 clock_getres(CLOCK_REALTIME, &tp); 875 clock_getres(CLOCK_REALTIME, &tp);
876 tp.tv_sec = 0; 876 tp.tv_sec = 0;
diff --git a/networking/slattach.c b/networking/slattach.c
index 921ec552d..71edd2f27 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -134,9 +134,9 @@ int slattach_main(int argc UNUSED_PARAM, char **argv)
134 int i, encap, opt; 134 int i, encap, opt;
135 struct termios state; 135 struct termios state;
136 const char *proto = "cslip"; 136 const char *proto = "cslip";
137 const char *extcmd; /* Command to execute after hangup */ 137 const char *extcmd; /* Command to execute after hangup */
138 const char *baud_str; 138 const char *baud_str;
139 int baud_code = -1; /* Line baud rate (system code) */ 139 int baud_code = -1; /* Line baud rate (system code) */
140 140
141 enum { 141 enum {
142 OPT_p_proto = 1 << 0, 142 OPT_p_proto = 1 << 0,
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 5c011e15d..671529d37 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -141,7 +141,7 @@ remove_iacs(struct tsession *ts, int *pnum_totty)
141 if (ptr[1] == SB && ptr[2] == TELOPT_NAWS) { 141 if (ptr[1] == SB && ptr[2] == TELOPT_NAWS) {
142 struct winsize ws; 142 struct winsize ws;
143 if ((ptr+8) >= end) 143 if ((ptr+8) >= end)
144 break; /* incomplete, can't process */ 144 break; /* incomplete, can't process */
145 ws.ws_col = (ptr[3] << 8) | ptr[4]; 145 ws.ws_col = (ptr[3] << 8) | ptr[4];
146 ws.ws_row = (ptr[5] << 8) | ptr[6]; 146 ws.ws_row = (ptr[5] << 8) | ptr[6];
147 ioctl(ts->ptyfd, TIOCSWINSZ, (char *)&ws); 147 ioctl(ts->ptyfd, TIOCSWINSZ, (char *)&ws);
@@ -273,8 +273,8 @@ make_new_session(
273 static const char iacs_to_send[] ALIGN1 = { 273 static const char iacs_to_send[] ALIGN1 = {
274 IAC, DO, TELOPT_ECHO, 274 IAC, DO, TELOPT_ECHO,
275 IAC, DO, TELOPT_NAWS, 275 IAC, DO, TELOPT_NAWS,
276 /* This requires telnetd.ctrlSQ.patch (incomplete) */ 276 /* This requires telnetd.ctrlSQ.patch (incomplete) */
277 /* IAC, DO, TELOPT_LFLOW, */ 277 /*IAC, DO, TELOPT_LFLOW,*/
278 IAC, WILL, TELOPT_ECHO, 278 IAC, WILL, TELOPT_ECHO,
279 IAC, WILL, TELOPT_SGA 279 IAC, WILL, TELOPT_SGA
280 }; 280 };
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 1f574d2ad..13c65ad78 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -47,8 +47,8 @@ struct vlan_ioctl_args {
47 short vlan_qos; 47 short vlan_qos;
48}; 48};
49 49
50#define VLAN_GROUP_ARRAY_LEN 4096 50#define VLAN_GROUP_ARRAY_LEN 4096
51#define SIOCSIFVLAN 0x8983 /* Set 802.1Q VLAN options */ 51#define SIOCSIFVLAN 0x8983 /* Set 802.1Q VLAN options */
52 52
53/* On entry, table points to the length of the current string 53/* On entry, table points to the length of the current string
54 * plus NUL terminator plus data length for the subsequent entry. 54 * plus NUL terminator plus data length for the subsequent entry.
diff --git a/networking/wget.c b/networking/wget.c
index 4521abfcf..0db9b3365 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2, see file LICENSE in this source tree. 6 * Licensed under GPLv2, see file LICENSE in this source tree.
7 * 7 *
8 * Copyright (C) 2010 Bradley M. Kuhn <bkuhn@ebb.org> 8 * Copyright (C) 2010 Bradley M. Kuhn <bkuhn@ebb.org>
9 * Kuhn's copyrights are licensed GPLv2-or-later. File as a whole remains GPLv2. 9 * Kuhn's copyrights are licensed GPLv2-or-later. File as a whole remains GPLv2.
10 */ 10 */
11#include "libbb.h" 11#include "libbb.h"
12 12
@@ -48,7 +48,7 @@ struct BUG_G_too_big {
48/* Must match option string! */ 48/* Must match option string! */
49enum { 49enum {
50 WGET_OPT_CONTINUE = (1 << 0), 50 WGET_OPT_CONTINUE = (1 << 0),
51 WGET_OPT_SPIDER = (1 << 1), 51 WGET_OPT_SPIDER = (1 << 1),
52 WGET_OPT_QUIET = (1 << 2), 52 WGET_OPT_QUIET = (1 << 2),
53 WGET_OPT_OUTNAME = (1 << 3), 53 WGET_OPT_OUTNAME = (1 << 3),
54 WGET_OPT_PREFIX = (1 << 4), 54 WGET_OPT_PREFIX = (1 << 4),
@@ -785,7 +785,7 @@ However, in real world it was observed that some web servers
785*/ 785*/
786 case 204: 786 case 204:
787 break; 787 break;
788 case 300: /* redirection */ 788 case 300: /* redirection */
789 case 301: 789 case 301:
790 case 302: 790 case 302:
791 case 303: 791 case 303: