X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fzcip.c;h=5e10673779a77f7da1f536c49e97703444058c3d;hb=59fe8b90890a07c87ec9c2943bae515d5c6d959d;hp=716c4a5e1fa9918defb803c35d3536cb8b49dea3;hpb=bc68cd14ccaebc17e7e03a08e51fddfb91007624;p=oweals%2Fbusybox.git
diff --git a/networking/zcip.c b/networking/zcip.c
index 716c4a5e1..5e1067377 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
/*
* RFC3927 ZeroConf IPv4 Link-Local addressing
* (see )
@@ -9,10 +10,6 @@
*/
/*
- * This can build as part of BusyBox or by itself:
- *
- * $(CROSS_COMPILE)cc -Os -Wall -DNO_BUSYBOX -DDEBUG -o zcip zcip.c
- *
* ZCIP just manages the 169.254.*.* addresses. That network is not
* routed at the IP level, though various proxies or bridges can
* certainly be used. Its naming is built over multicast DNS.
@@ -26,23 +23,15 @@
// - avoid silent script failures, especially under load...
// - link status monitoring (restart on link-up; stop on link-down)
+#include "busybox.h"
#include
-#include
-#include
#include
#include
#include
#include
-#include
-#include
-#include
#include
-#include
-#include
-#include
-#include
#include
#include
#include
@@ -79,34 +68,20 @@ enum {
DEFEND_INTERVAL = 10
};
-static const unsigned char ZCIP_VERSION[] = "0.75 (18 April 2005)";
-static char *prog;
-
static const struct in_addr null_ip = { 0 };
static const struct ether_addr null_addr = { {0, 0, 0, 0, 0, 0} };
static int verbose = 0;
-#ifdef DEBUG
-
-#define DBG(fmt,args...) \
- fprintf(stderr, "%s: " fmt , prog , ## args)
-#define VDBG(fmt,args...) do { \
- if (verbose) fprintf(stderr, "%s: " fmt , prog ,## args); \
- } while (0)
-#else
-
#define DBG(fmt,args...) \
do { } while (0)
#define VDBG DBG
-#endif /* DEBUG */
/**
* Pick a random link local IP address on 169.254/16, except that
* the first and last 256 addresses are reserved.
*/
-static void
-pick(struct in_addr *ip)
+static void pick(struct in_addr *ip)
{
unsigned tmp;
@@ -120,8 +95,7 @@ pick(struct in_addr *ip)
/**
* Broadcast an ARP packet.
*/
-static int
-arp(int fd, struct sockaddr *saddr, int op,
+static int arp(int fd, struct sockaddr *saddr, int op,
const struct ether_addr *source_addr, struct in_addr source_ip,
const struct ether_addr *target_addr, struct in_addr target_ip)
{
@@ -154,8 +128,7 @@ arp(int fd, struct sockaddr *saddr, int op,
/**
* Run a script.
*/
-static int
-run(char *script, char *arg, char *intf, struct in_addr *ip)
+static int run(char *script, char *arg, char *intf, struct in_addr *ip)
{
int pid, status;
char *why;
@@ -183,8 +156,8 @@ run(char *script, char *arg, char *intf, struct in_addr *ip)
goto bad;
}
if (WEXITSTATUS(status) != 0) {
- fprintf(stderr, "%s: script %s failed, exit=%d\n",
- prog, script, WEXITSTATUS(status));
+ bb_error_msg("script %s failed, exit=%d\n",
+ script, WEXITSTATUS(status));
return -errno;
}
}
@@ -196,35 +169,11 @@ bad:
return status;
}
-#ifndef NO_BUSYBOX
-#include "busybox.h"
-#endif
-
-/**
- * Print usage information.
- */
-static void ATTRIBUTE_NORETURN
-zcip_usage(const char *msg)
-{
- fprintf(stderr, "%s: %s\n", prog, msg);
-#ifdef NO_BUSYBOX
- fprintf(stderr, "Usage: %s [OPTIONS] ifname script\n"
- "\t-f foreground mode (implied by -v)\n"
- "\t-q quit after address (no daemon)\n"
- "\t-r 169.254.x.x request this address first\n"
- "\t-v verbose; show version\n",
- prog);
- exit(0);
-#else
- bb_show_usage();
-#endif
-}
/**
* Return milliseconds of random delay, up to "secs" seconds.
*/
-static inline unsigned
-ms_rdelay(unsigned secs)
+static inline unsigned ms_rdelay(unsigned secs)
{
return lrand48() % (secs * 1000);
}
@@ -233,12 +182,6 @@ ms_rdelay(unsigned secs)
* main program
*/
-#ifdef NO_BUSYBOX
-int
-main(int argc, char *argv[])
- __attribute__ ((weak, alias ("zcip_main")));
-#endif
-
int zcip_main(int argc, char *argv[])
{
char *intf = NULL;
@@ -260,7 +203,6 @@ int zcip_main(int argc, char *argv[])
int t;
// parse commandline: prog [options] ifname script
- prog = argv[0];
while ((t = getopt(argc, argv, "fqr:v")) != EOF) {
switch (t) {
case 'f':
@@ -273,17 +215,15 @@ int zcip_main(int argc, char *argv[])
if (inet_aton(optarg, &ip) == 0
|| (ntohl(ip.s_addr) & IN_CLASSB_NET)
!= LINKLOCAL_ADDR) {
- zcip_usage("invalid link address");
+ bb_error_msg_and_die("invalid link address");
}
continue;
case 'v':
- if (!verbose)
- printf("%s: version %s\n", prog, ZCIP_VERSION);
verbose++;
foreground = 1;
continue;
default:
- zcip_usage("bad option");
+ bb_error_msg_and_die("bad option");
}
}
if (optind < argc - 1) {
@@ -292,8 +232,8 @@ int zcip_main(int argc, char *argv[])
script = argv[optind++];
}
if (optind != argc || !intf)
- zcip_usage("wrong number of arguments");
- openlog(prog, 0, LOG_DAEMON);
+ bb_show_usage();
+ openlog(bb_applet_name, 0, LOG_DAEMON);
// initialize the interface (modprobe, ifup, etc)
if (run(script, "init", intf, NULL) < 0)
@@ -301,7 +241,7 @@ int zcip_main(int argc, char *argv[])
// initialize saddr
memset(&saddr, 0, sizeof (saddr));
- strncpy(saddr.sa_data, intf, sizeof (saddr.sa_data));
+ safe_strncpy(saddr.sa_data, intf, sizeof (saddr.sa_data));
// open an ARP socket
if ((fd = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP))) < 0) {
@@ -368,20 +308,20 @@ fail:
fds[0].revents = 0;
// poll, being ready to adjust current timeout
- if (timeout > 0) {
- gettimeofday(&tv1, NULL);
- tv1.tv_usec += (timeout % 1000) * 1000;
- while (tv1.tv_usec > 1000000) {
- tv1.tv_usec -= 1000000;
- tv1.tv_sec++;
- }
- tv1.tv_sec += timeout / 1000;
- } else if (timeout == 0) {
+ if (!timeout) {
timeout = ms_rdelay(PROBE_WAIT);
// FIXME setsockopt(fd, SO_ATTACH_FILTER, ...) to
// make the kernel filter out all packets except
// ones we'd care about.
}
+ gettimeofday(&tv1, NULL);
+ tv1.tv_usec += (timeout % 1000) * 1000;
+ while (tv1.tv_usec > 1000000) {
+ tv1.tv_usec -= 1000000;
+ tv1.tv_sec++;
+ }
+ tv1.tv_sec += timeout / 1000;
+
VDBG("...wait %ld %s nprobes=%d, nclaims=%d\n",
timeout, intf, nprobes, nclaims);
switch (poll(fds, 1, timeout)) {
@@ -437,7 +377,7 @@ fail:
gettimeofday(&tv2, NULL);
if (timercmp(&tv1, &tv2, <)) {
- timeout = -1;
+ timeout = 0;
} else {
timersub(&tv1, &tv2, &tv1);
timeout = 1000 * tv1.tv_sec
@@ -448,8 +388,7 @@ fail:
if (fds[0].revents & POLLERR) {
// FIXME: links routinely go down;
// this shouldn't necessarily exit.
- fprintf(stderr, "%s %s: poll error\n",
- prog, intf);
+ bb_error_msg("%s: poll error\n", intf);
if (ready) {
run(script, "deconfig",
intf, &ip);
@@ -537,6 +476,6 @@ bad:
perror(why);
else
syslog(LOG_ERR, "%s %s, %s error: %s",
- prog, intf, why, strerror(errno));
+ bb_applet_name, intf, why, strerror(errno));
return EXIT_FAILURE;
}