summaryrefslogtreecommitdiffhomepage
path: root/networking
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-09-18 16:28:43 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-09-18 16:28:43 +0200
commit0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5 (patch)
treecfe1328d742da3f0572ac8b2f06aa95259862ac5 /networking
parentb63afead4411c5832d427ed149683c85cc81a4c9 (diff)
regularize format of source file headers, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r--networking/hostname.c1
-rw-r--r--networking/ifupdown.c1
-rw-r--r--networking/nameif.c1
-rw-r--r--networking/nbd-client.c16
-rw-r--r--networking/ping.c43
-rw-r--r--networking/udhcp/d6_dhcpc.c1
-rw-r--r--networking/vconfig.c5
-rw-r--r--networking/wget.c1
-rw-r--r--networking/whois.c1
9 files changed, 31 insertions, 39 deletions
diff --git a/networking/hostname.c b/networking/hostname.c
index d87f6562f..8e3238d99 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -9,7 +9,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config HOSTNAME
//config: bool "hostname (5.6 kb)"
//config: default y
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index c2cfe82ec..5521e8a5a 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -16,7 +16,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config IFUP
//config: bool "ifup (17 kb)"
//config: default y
diff --git a/networking/nameif.c b/networking/nameif.c
index 1f2695495..91d50536a 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -9,7 +9,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config NAMEIF
//config: bool "nameif (6.6 kb)"
//config: default y
diff --git a/networking/nbd-client.c b/networking/nbd-client.c
index cf1857231..bedb01a1c 100644
--- a/networking/nbd-client.c
+++ b/networking/nbd-client.c
@@ -3,20 +3,20 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-#include "libbb.h"
-#include <netinet/tcp.h>
-#include <linux/fs.h>
-
-//applet:IF_NBDCLIENT(APPLET_NOEXEC(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient))
-
-//kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o
-
//config:config NBDCLIENT
//config: bool "nbd-client (4.6 kb)"
//config: default y
//config: help
//config: Network block device client
+//applet:IF_NBDCLIENT(APPLET_NOEXEC(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient))
+
+//kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o
+
+#include "libbb.h"
+#include <netinet/tcp.h>
+#include <linux/fs.h>
+
#define NBD_SET_SOCK _IO(0xab, 0)
#define NBD_SET_BLKSIZE _IO(0xab, 1)
#define NBD_SET_SIZE _IO(0xab, 2)
diff --git a/networking/ping.c b/networking/ping.c
index 7460e4414..774f8f3e0 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -24,28 +24,6 @@
* This version is an adaptation of ping.c from busybox.
* The code was modified by Bart Visscher <magick@linux-fan.com>
*/
-
-#include <net/if.h>
-#include <netinet/ip_icmp.h>
-#include "libbb.h"
-#include "common_bufsiz.h"
-
-#ifdef __BIONIC__
-/* should be in netinet/ip_icmp.h */
-# define ICMP_DEST_UNREACH 3 /* Destination Unreachable */
-# define ICMP_SOURCE_QUENCH 4 /* Source Quench */
-# define ICMP_REDIRECT 5 /* Redirect (change route) */
-# define ICMP_ECHO 8 /* Echo Request */
-# define ICMP_TIME_EXCEEDED 11 /* Time Exceeded */
-# define ICMP_PARAMETERPROB 12 /* Parameter Problem */
-# define ICMP_TIMESTAMP 13 /* Timestamp Request */
-# define ICMP_TIMESTAMPREPLY 14 /* Timestamp Reply */
-# define ICMP_INFO_REQUEST 15 /* Information Request */
-# define ICMP_INFO_REPLY 16 /* Information Reply */
-# define ICMP_ADDRESS 17 /* Address Mask Request */
-# define ICMP_ADDRESSREPLY 18 /* Address Mask Reply */
-#endif
-
//config:config PING
//config: bool "ping (9.5 kb)"
//config: default y
@@ -136,6 +114,27 @@
//usage: "1 packets transmitted, 1 packets received, 0% packet loss\n"
//usage: "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
+#include <net/if.h>
+#include <netinet/ip_icmp.h>
+#include "libbb.h"
+#include "common_bufsiz.h"
+
+#ifdef __BIONIC__
+/* should be in netinet/ip_icmp.h */
+# define ICMP_DEST_UNREACH 3 /* Destination Unreachable */
+# define ICMP_SOURCE_QUENCH 4 /* Source Quench */
+# define ICMP_REDIRECT 5 /* Redirect (change route) */
+# define ICMP_ECHO 8 /* Echo Request */
+# define ICMP_TIME_EXCEEDED 11 /* Time Exceeded */
+# define ICMP_PARAMETERPROB 12 /* Parameter Problem */
+# define ICMP_TIMESTAMP 13 /* Timestamp Request */
+# define ICMP_TIMESTAMPREPLY 14 /* Timestamp Reply */
+# define ICMP_INFO_REQUEST 15 /* Information Request */
+# define ICMP_INFO_REPLY 16 /* Information Reply */
+# define ICMP_ADDRESS 17 /* Address Mask Request */
+# define ICMP_ADDRESSREPLY 18 /* Address Mask Reply */
+#endif
+
#if ENABLE_PING6
# include <netinet/icmp6.h>
/* I see RENUMBERED constants in bits/in.h - !!?
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 849ca1388..714555fa8 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -8,7 +8,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
//config:config UDHCPC6
//config: bool "udhcpc6"
//config: default n # not yet ready
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 62a483865..8548c8c3b 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -6,9 +6,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
-/* BB_AUDIT SUSv3 N/A */
-
//config:config VCONFIG
//config: bool "vconfig (2.5 kb)"
//config: default y
@@ -34,6 +31,8 @@
#include "libbb.h"
#include <net/if.h>
+/* BB_AUDIT SUSv3 N/A */
+
/* Stuff from linux/if_vlan.h, kernel version 2.4.23 */
enum vlan_ioctl_cmds {
ADD_VLAN_CMD,
diff --git a/networking/wget.c b/networking/wget.c
index e1b40d3fd..d1d85230c 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -8,7 +8,6 @@
* Copyright (C) 2010 Bradley M. Kuhn <bkuhn@ebb.org>
* Kuhn's copyrights are licensed GPLv2-or-later. File as a whole remains GPLv2.
*/
-
//config:config WGET
//config: bool "wget (35 kb)"
//config: default y
diff --git a/networking/whois.c b/networking/whois.c
index fd1cdf43e..f0ec86301 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -9,7 +9,6 @@
* Add ipv6 support
* Add proxy support
*/
-
//config:config WHOIS
//config: bool "whois (6.6 kb)"
//config: default y