summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-05-26 19:00:18 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-05-26 19:00:18 +0000
commitb6adbf1be29841501cc49917249e85f273e1df7c (patch)
treee28a5603e6009b2479e949b8b9b4aa0620fed400 /networking
parent5a6aeddfa7262e41802c77f70c9ef88e9c2c2476 (diff)
downloadbusybox-w32-b6adbf1be29841501cc49917249e85f273e1df7c.tar.gz
busybox-w32-b6adbf1be29841501cc49917249e85f273e1df7c.tar.bz2
busybox-w32-b6adbf1be29841501cc49917249e85f273e1df7c.zip
usage.c: remove reference to busybox.h
*: s/include "busybox.h"/include "libbb.h"
Diffstat (limited to 'networking')
-rw-r--r--networking/arp.c2
-rw-r--r--networking/arping.c2
-rw-r--r--networking/dnsd.c2
-rw-r--r--networking/ether-wake.c2
-rw-r--r--networking/ftpgetput.c2
-rw-r--r--networking/hostname.c2
-rw-r--r--networking/httpd.c2
-rw-r--r--networking/ifconfig.c2
-rw-r--r--networking/ifupdown.c3
-rw-r--r--networking/inetd.c2
-rw-r--r--networking/interface.c2
-rw-r--r--networking/ip.c2
-rw-r--r--networking/ipcalc.c4
-rw-r--r--networking/isrv.c2
-rw-r--r--networking/isrv_identd.c2
-rw-r--r--networking/libiproute/ip_common.h2
-rw-r--r--networking/nameif.c2
-rw-r--r--networking/nc.c2
-rw-r--r--networking/nc_bloaty.c2
-rw-r--r--networking/netstat.c2
-rw-r--r--networking/nslookup.c2
-rw-r--r--networking/ping.c2
-rw-r--r--networking/route.c5
-rw-r--r--networking/telnet.c2
-rw-r--r--networking/telnetd.c2
-rw-r--r--networking/tftp.c2
-rw-r--r--networking/traceroute.c2
-rw-r--r--networking/udhcp/common.h2
-rw-r--r--networking/vconfig.c2
-rw-r--r--networking/wget.c2
-rw-r--r--networking/zcip.c2
31 files changed, 35 insertions, 33 deletions
diff --git a/networking/arp.c b/networking/arp.c
index 7a36f44bb..6a7c862b8 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -13,7 +13,7 @@
13 * modified for getopt32 by Arne Bernin <arne [at] alamut.de> 13 * modified for getopt32 by Arne Bernin <arne [at] alamut.de>
14 */ 14 */
15 15
16#include "busybox.h" 16#include "libbb.h"
17#include "inet_common.h" 17#include "inet_common.h"
18 18
19#include <arpa/inet.h> 19#include <arpa/inet.h>
diff --git a/networking/arping.c b/networking/arping.c
index d71ac4930..0371df369 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -16,7 +16,7 @@
16#include <netinet/ether.h> 16#include <netinet/ether.h>
17#include <netpacket/packet.h> 17#include <netpacket/packet.h>
18 18
19#include "busybox.h" 19#include "libbb.h"
20 20
21static struct in_addr src; 21static struct in_addr src;
22static struct in_addr dst; 22static struct in_addr dst;
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 8807bbedc..32166e555 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -18,7 +18,7 @@
18 */ 18 */
19 19
20#include <syslog.h> 20#include <syslog.h>
21#include "busybox.h" 21#include "libbb.h"
22 22
23//#define DEBUG 1 23//#define DEBUG 1
24#define DEBUG 0 24#define DEBUG 0
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index ed41590aa..9de0d489b 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -70,7 +70,7 @@
70#include <netinet/ether.h> 70#include <netinet/ether.h>
71#include <linux/if.h> 71#include <linux/if.h>
72 72
73#include "busybox.h" 73#include "libbb.h"
74 74
75/* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to 75/* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to
76 * work as non-root, but we need SOCK_PACKET to specify the Ethernet 76 * work as non-root, but we need SOCK_PACKET to specify the Ethernet
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 9b0510df9..54b5f5a91 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -13,8 +13,8 @@
13 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 13 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
14 */ 14 */
15 15
16#include "busybox.h"
17#include <getopt.h> 16#include <getopt.h>
17#include "libbb.h"
18 18
19typedef struct ftp_host_info_s { 19typedef struct ftp_host_info_s {
20 const char *user; 20 const char *user;
diff --git a/networking/hostname.c b/networking/hostname.c
index 3f6a658d6..50ef7b5d1 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -12,7 +12,7 @@
12 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 12 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
13 */ 13 */
14 14
15#include "busybox.h" 15#include "libbb.h"
16 16
17static void do_sethostname(char *s, int isfile) 17static void do_sethostname(char *s, int isfile)
18{ 18{
diff --git a/networking/httpd.c b/networking/httpd.c
index d8ea483eb..f47e2c11f 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -91,7 +91,7 @@
91 * 91 *
92*/ 92*/
93 93
94#include "busybox.h" 94#include "libbb.h"
95 95
96/* amount of buffering in a pipe */ 96/* amount of buffering in a pipe */
97#ifndef PIPE_BUF 97#ifndef PIPE_BUF
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 3dcc902ca..5742399c5 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -37,7 +37,7 @@
37#include <netinet/if_ether.h> 37#include <netinet/if_ether.h>
38#endif 38#endif
39#include "inet_common.h" 39#include "inet_common.h"
40#include "busybox.h" 40#include "libbb.h"
41 41
42#if ENABLE_FEATURE_IFCONFIG_SLIP 42#if ENABLE_FEATURE_IFCONFIG_SLIP
43# include <net/if_slip.h> 43# include <net/if_slip.h>
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 5b2251777..8e8341e96 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -15,11 +15,12 @@
15 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 15 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
16 */ 16 */
17 17
18#include "busybox.h"
19#include <sys/utsname.h> 18#include <sys/utsname.h>
20#include <fnmatch.h> 19#include <fnmatch.h>
21#include <getopt.h> 20#include <getopt.h>
22 21
22#include "libbb.h"
23
23#define MAX_OPT_DEPTH 10 24#define MAX_OPT_DEPTH 10
24#define EUNBALBRACK 10001 25#define EUNBALBRACK 10001
25#define EUNDEFVAR 10002 26#define EUNDEFVAR 10002
diff --git a/networking/inetd.c b/networking/inetd.c
index dc191a40e..211a8dcbf 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -155,7 +155,7 @@
155 * setuid() 155 * setuid()
156 */ 156 */
157 157
158#include "busybox.h" 158#include "libbb.h"
159#include <syslog.h> 159#include <syslog.h>
160#include <sys/un.h> 160#include <sys/un.h>
161 161
diff --git a/networking/interface.c b/networking/interface.c
index b1b935e7e..51e3d7487 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -34,7 +34,7 @@
34#include <net/if.h> 34#include <net/if.h>
35#include <net/if_arp.h> 35#include <net/if_arp.h>
36#include "inet_common.h" 36#include "inet_common.h"
37#include "busybox.h" 37#include "libbb.h"
38 38
39#if ENABLE_FEATURE_IPV6 39#if ENABLE_FEATURE_IPV6
40# define HAVE_AFINET6 1 40# define HAVE_AFINET6 1
diff --git a/networking/ip.c b/networking/ip.c
index c7816c8cc..0105bd98b 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -13,7 +13,7 @@
13 * Bernhard Fischer rewrote to use index_in_substr_array 13 * Bernhard Fischer rewrote to use index_in_substr_array
14 */ 14 */
15 15
16#include "busybox.h" 16#include "libbb.h"
17 17
18#include "libiproute/utils.h" 18#include "libiproute/utils.h"
19#include "libiproute/ip_common.h" 19#include "libiproute/ip_common.h"
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 63ce99ffe..a39ad1a67 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -12,12 +12,12 @@
12 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 12 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
13 */ 13 */
14 14
15#include "busybox.h"
16#include <ctype.h>
17#include <getopt.h> 15#include <getopt.h>
18#include <sys/socket.h> 16#include <sys/socket.h>
19#include <arpa/inet.h> 17#include <arpa/inet.h>
20 18
19#include "libbb.h"
20
21#define CLASS_A_NETMASK ntohl(0xFF000000) 21#define CLASS_A_NETMASK ntohl(0xFF000000)
22#define CLASS_B_NETMASK ntohl(0xFFFF0000) 22#define CLASS_B_NETMASK ntohl(0xFFFF0000)
23#define CLASS_C_NETMASK ntohl(0xFFFFFF00) 23#define CLASS_C_NETMASK ntohl(0xFFFFFF00)
diff --git a/networking/isrv.c b/networking/isrv.c
index f0df2229c..a51618af1 100644
--- a/networking/isrv.c
+++ b/networking/isrv.c
@@ -8,7 +8,7 @@
8 * Licensed under GPL version 2, see file LICENSE in this tarball for details. 8 * Licensed under GPL version 2, see file LICENSE in this tarball for details.
9 */ 9 */
10 10
11#include "busybox.h" 11#include "libbb.h"
12#include "isrv.h" 12#include "isrv.h"
13 13
14#define DEBUG 0 14#define DEBUG 0
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index 59daf99ed..84cf6da6a 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -8,7 +8,7 @@
8 */ 8 */
9 9
10#include <syslog.h> 10#include <syslog.h>
11#include "busybox.h" 11#include "libbb.h"
12#include "isrv.h" 12#include "isrv.h"
13 13
14enum { TIMEOUT = 20 }; 14enum { TIMEOUT = 20 };
diff --git a/networking/libiproute/ip_common.h b/networking/libiproute/ip_common.h
index 96df6100a..97101079f 100644
--- a/networking/libiproute/ip_common.h
+++ b/networking/libiproute/ip_common.h
@@ -2,7 +2,7 @@
2#ifndef _IP_COMMON_H 2#ifndef _IP_COMMON_H
3#define _IP_COMMON_H 1 3#define _IP_COMMON_H 1
4 4
5#include "busybox.h" 5#include "libbb.h"
6#include <asm/types.h> 6#include <asm/types.h>
7#include <linux/netlink.h> 7#include <linux/netlink.h>
8#include <linux/rtnetlink.h> 8#include <linux/rtnetlink.h>
diff --git a/networking/nameif.c b/networking/nameif.c
index ec77512c3..a65f30819 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -9,7 +9,7 @@
9 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 9 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
10 */ 10 */
11 11
12#include "busybox.h" 12#include "libbb.h"
13#include <syslog.h> 13#include <syslog.h>
14#include <net/if.h> 14#include <net/if.h>
15#include <netinet/ether.h> 15#include <netinet/ether.h>
diff --git a/networking/nc.c b/networking/nc.c
index e89eb7615..1fb38f83c 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -7,7 +7,7 @@
7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
8 */ 8 */
9 9
10#include "busybox.h" 10#include "libbb.h"
11 11
12#if ENABLE_DESKTOP 12#if ENABLE_DESKTOP
13#include "nc_bloaty.c" 13#include "nc_bloaty.c"
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 57af7ebe5..3e333b7d5 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -48,7 +48,7 @@
48 * are closed, but nc doesn't exit - continues to listen/accept. 48 * are closed, but nc doesn't exit - continues to listen/accept.
49 */ 49 */
50 50
51/* done in nc.c: #include "busybox.h" */ 51/* done in nc.c: #include "libbb.h" */
52 52
53enum { 53enum {
54 SLEAZE_PORT = 31337, /* for UDP-scan RTT trick, change if ya want */ 54 SLEAZE_PORT = 31337, /* for UDP-scan RTT trick, change if ya want */
diff --git a/networking/netstat.c b/networking/netstat.c
index 5fb5c386f..38091ae3a 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -11,7 +11,7 @@
11 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 11 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
12 */ 12 */
13 13
14#include "busybox.h" 14#include "libbb.h"
15#include "inet_common.h" 15#include "inet_common.h"
16 16
17enum { 17enum {
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 424a0e4b9..608e65462 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include <resolv.h> 14#include <resolv.h>
15#include "busybox.h" 15#include "libbb.h"
16 16
17/* 17/*
18 * I'm only implementing non-interactive mode; 18 * I'm only implementing non-interactive mode;
diff --git a/networking/ping.c b/networking/ping.c
index e413bec70..2f331910e 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -27,7 +27,7 @@
27 27
28#include <net/if.h> 28#include <net/if.h>
29#include <netinet/ip_icmp.h> 29#include <netinet/ip_icmp.h>
30#include "busybox.h" 30#include "libbb.h"
31 31
32#if ENABLE_PING6 32#if ENABLE_PING6
33#include <netinet/icmp6.h> 33#include <netinet/icmp6.h>
diff --git a/networking/route.c b/networking/route.c
index da5969868..881332b9f 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -25,12 +25,13 @@
25 * remove ridiculous amounts of bloat. 25 * remove ridiculous amounts of bloat.
26 */ 26 */
27 27
28#include "busybox.h"
29#include "inet_common.h"
30#include <getopt.h> 28#include <getopt.h>
31#include <net/route.h> 29#include <net/route.h>
32#include <net/if.h> 30#include <net/if.h>
33 31
32#include "libbb.h"
33#include "inet_common.h"
34
34 35
35#ifndef RTF_UP 36#ifndef RTF_UP
36/* Keep this in sync with /usr/src/linux/include/linux/route.h */ 37/* Keep this in sync with /usr/src/linux/include/linux/route.h */
diff --git a/networking/telnet.c b/networking/telnet.c
index 5c75a7409..a59450505 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -24,7 +24,7 @@
24#include <termios.h> 24#include <termios.h>
25#include <arpa/telnet.h> 25#include <arpa/telnet.h>
26#include <netinet/in.h> 26#include <netinet/in.h>
27#include "busybox.h" 27#include "libbb.h"
28 28
29#ifdef DOTRACE 29#ifdef DOTRACE
30#define TRACE(x, y) do { if (x) printf y; } while (0) 30#define TRACE(x, y) do { if (x) printf y; } while (0)
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 4ab6f5656..21b704a46 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -24,7 +24,7 @@
24/*#define DEBUG 1 */ 24/*#define DEBUG 1 */
25#define DEBUG 0 25#define DEBUG 0
26 26
27#include "busybox.h" 27#include "libbb.h"
28 28
29#if DEBUG 29#if DEBUG
30#define TELCMDS 30#define TELCMDS
diff --git a/networking/tftp.c b/networking/tftp.c
index 3fb76ecbb..e1e278aba 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -19,7 +19,7 @@
19 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 19 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
20 * ------------------------------------------------------------------------- */ 20 * ------------------------------------------------------------------------- */
21 21
22#include "busybox.h" 22#include "libbb.h"
23 23
24 24
25#if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT 25#if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
diff --git a/networking/traceroute.c b/networking/traceroute.c
index b4cca25b0..ce8dc8395 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -215,7 +215,7 @@
215#include <netinet/ip.h> 215#include <netinet/ip.h>
216#include <netinet/ip_icmp.h> 216#include <netinet/ip_icmp.h>
217 217
218#include "busybox.h" 218#include "libbb.h"
219#include "inet_common.h" 219#include "inet_common.h"
220 220
221 221
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 6c0db5b4c..006d580d3 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -10,7 +10,7 @@
10#ifndef _COMMON_H 10#ifndef _COMMON_H
11#define _COMMON_H 11#define _COMMON_H
12 12
13#include "busybox.h" 13#include "libbb.h"
14 14
15#define DEFAULT_SCRIPT "/usr/share/udhcpc/default.script" 15#define DEFAULT_SCRIPT "/usr/share/udhcpc/default.script"
16 16
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 06c06cb5e..e063d0a49 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -9,7 +9,7 @@
9 9
10/* BB_AUDIT SUSv3 N/A */ 10/* BB_AUDIT SUSv3 N/A */
11 11
12#include "busybox.h" 12#include "libbb.h"
13#include <net/if.h> 13#include <net/if.h>
14 14
15/* Stuff from linux/if_vlan.h, kernel version 2.4.23 */ 15/* Stuff from linux/if_vlan.h, kernel version 2.4.23 */
diff --git a/networking/wget.c b/networking/wget.c
index 026722afc..2c060d77d 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -10,8 +10,8 @@
10/* http://www.unix.org/version2/whatsnew/lfs20mar.html */ 10/* http://www.unix.org/version2/whatsnew/lfs20mar.html */
11#define _LARGEFILE64_SOURCE 1 11#define _LARGEFILE64_SOURCE 1
12 12
13#include "busybox.h"
14#include <getopt.h> /* for struct option */ 13#include <getopt.h> /* for struct option */
14#include "libbb.h"
15 15
16struct host_info { 16struct host_info {
17 // May be used if we ever will want to free() all xstrdup()s... 17 // May be used if we ever will want to free() all xstrdup()s...
diff --git a/networking/zcip.c b/networking/zcip.c
index 195ae50ab..3b67a032e 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -23,7 +23,7 @@
23// - avoid silent script failures, especially under load... 23// - avoid silent script failures, especially under load...
24// - link status monitoring (restart on link-up; stop on link-down) 24// - link status monitoring (restart on link-up; stop on link-down)
25 25
26#include "busybox.h" 26#include "libbb.h"
27#include <syslog.h> 27#include <syslog.h>
28#include <poll.h> 28#include <poll.h>
29#include <sys/wait.h> 29#include <sys/wait.h>