delete tons of extra #includes
[oweals/busybox.git] / networking / zcip.c
index ccf399bb70d4405749d9c60cef780fa3acea34ad..3b67a032e93162631a2b70047afcc7c4f4663f3e 100644 (file)
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * RFC3927 ZeroConf IPv4 Link-Local addressing
  * (see <http://www.zeroconf.org/>)
@@ -5,33 +6,16 @@
  * Copyright (C) 2003 by Arthur van Hoff (avh@strangeberry.com)
  * Copyright (C) 2004 by David Brownell
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
 /*
- * 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.
  */
 
-// #define      DEBUG
+//#define DEBUG
 
 // TODO:
 // - more real-world usage/testing, especially daemon mode
 // - avoid silent script failures, especially under load...
 // - link status monitoring (restart on link-up; stop on link-down)
 
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include "libbb.h"
 #include <syslog.h>
 #include <poll.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <sys/ioctl.h>
-#include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#include <arpa/inet.h>
-#include <netinet/in.h>
 #include <netinet/ether.h>
 #include <net/ethernet.h>
 #include <net/if.h>
 
 struct arp_packet {
        struct ether_header hdr;
-       // FIXME this part is netinet/if_ether.h "struct ether_arp"
-       struct arphdr arp;
-       struct ether_addr source_addr;
-       struct in_addr source_ip;
-       struct ether_addr target_addr;
-       struct in_addr target_ip;
-} __attribute__ ((__packed__));
+       struct ether_arp arp;
+} ATTRIBUTE_PACKED;
 
+enum {
 /* 169.254.0.0 */
-static const uint32_t LINKLOCAL_ADDR = 0xa9fe0000;
+       LINKLOCAL_ADDR = 0xa9fe0000,
 
 /* protocol timeout parameters, specified in seconds */
-static const unsigned PROBE_WAIT = 1;
-static const unsigned PROBE_MIN = 1;
-static const unsigned PROBE_MAX = 2;
-static const unsigned PROBE_NUM = 3;
-static const unsigned MAX_CONFLICTS = 10;
-static const unsigned RATE_LIMIT_INTERVAL = 60;
-static const unsigned ANNOUNCE_WAIT = 2;
-static const unsigned ANNOUNCE_NUM = 2;
-static const unsigned ANNOUNCE_INTERVAL = 2;
-static const time_t 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...) \
+       PROBE_WAIT = 1,
+       PROBE_MIN = 1,
+       PROBE_MAX = 2,
+       PROBE_NUM = 3,
+       MAX_CONFLICTS = 10,
+       RATE_LIMIT_INTERVAL = 60,
+       ANNOUNCE_WAIT = 2,
+       ANNOUNCE_NUM = 2,
+       ANNOUNCE_INTERVAL = 2,
+       DEFEND_INTERVAL = 10
+};
+
+/* States during the configuration process. */
+enum {
+       PROBE = 0,
+       RATE_LIMIT_PROBE,
+       ANNOUNCE,
+       MONITOR,
+       DEFEND
+};
+
+#define VDBG(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;
+       unsigned tmp;
 
        /* use cheaper math than lrand48() mod N */
        do {
@@ -128,15 +85,17 @@ pick(struct in_addr *ip)
        ip->s_addr = htonl((LINKLOCAL_ADDR + 0x0100) + tmp);
 }
 
+/* TODO: we need a flag to direct bb_[p]error_msg output to stderr. */
+
 /**
  * Broadcast an ARP packet.
  */
-static int
-arp(int fd, struct sockaddr *saddr, int op,
+static void 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)
 {
        struct arp_packet p;
+       memset(&p, 0, sizeof(p));
 
        // ether header
        p.hdr.ether_type = htons(ETHERTYPE_ARP);
@@ -144,98 +103,53 @@ arp(int fd, struct sockaddr *saddr, int op,
        memset(p.hdr.ether_dhost, 0xff, ETH_ALEN);
 
        // arp request
-       p.arp.ar_hrd = htons(ARPHRD_ETHER);
-       p.arp.ar_pro = htons(ETHERTYPE_IP);
-       p.arp.ar_hln = ETH_ALEN;
-       p.arp.ar_pln = 4;
-       p.arp.ar_op = htons(op);
-       memcpy(&p.source_addr, source_addr, ETH_ALEN);
-       memcpy(&p.source_ip, &source_ip, sizeof (p.source_ip));
-       memcpy(&p.target_addr, target_addr, ETH_ALEN);
-       memcpy(&p.target_ip, &target_ip, sizeof (p.target_ip));
+       p.arp.arp_hrd = htons(ARPHRD_ETHER);
+       p.arp.arp_pro = htons(ETHERTYPE_IP);
+       p.arp.arp_hln = ETH_ALEN;
+       p.arp.arp_pln = 4;
+       p.arp.arp_op = htons(op);
+       memcpy(&p.arp.arp_sha, source_addr, ETH_ALEN);
+       memcpy(&p.arp.arp_spa, &source_ip, sizeof(p.arp.arp_spa));
+       memcpy(&p.arp.arp_tha, target_addr, ETH_ALEN);
+       memcpy(&p.arp.arp_tpa, &target_ip, sizeof(p.arp.arp_tpa));
 
        // send it
-       if (sendto(fd, &p, sizeof (p), 0, saddr, sizeof (*saddr)) < 0) {
-               perror("sendto");
-               return -errno;
-       }
-       return 0;
+       xsendto(fd, &p, sizeof(p), saddr, sizeof(*saddr));
+
+       // Currently all callers ignore errors, that's why returns are
+       // commented out...
+       //return 0;
 }
 
 /**
- * Run a script.
+ * Run a script. argv[2] is already NULL.
  */
-static int
-run(char *script, char *arg, char *intf, struct in_addr *ip)
+static int run(char *argv[3], const char *intf, struct in_addr *ip)
 {
-       int pid, status;
-       char *why;
-
-       if (script != NULL) {
-               VDBG("%s run %s %s\n", intf, script, arg);
-               if (ip != NULL) {
-                       char *addr = inet_ntoa(*ip);
-                       setenv("ip", addr, 1);
-                       syslog(LOG_INFO, "%s %s %s", arg, intf, addr);
-               }
+       int status;
 
-               pid = vfork();
-               if (pid < 0) {                  // error
-                       why = "vfork";
-                       goto bad;
-               } else if (pid == 0) {          // child
-                       execl(script, script, arg, NULL);
-                       perror("execl");
-                       _exit(EXIT_FAILURE);
-               } 
-
-               if (waitpid(pid, &status, 0) <= 0) {
-                       why = "waitpid";
-                       goto bad;
-               }
-               if (WEXITSTATUS(status) != 0) {
-                       fprintf(stderr, "%s: script %s failed, exit=%d\n",
-                                       prog, script, WEXITSTATUS(status));
-                       return -errno;
-               }
-       }
-       return 0;
-bad:
-       status = -errno;
-       syslog(LOG_ERR, "%s %s, %s error: %s",
-               arg, intf, why, strerror(errno));
-       return status;
-}
+       VDBG("%s run %s %s\n", intf, argv[0], argv[1]);
 
-#ifndef        NO_BUSYBOX
-#include "busybox.h"
-#endif
+       if (ip) {
+               char *addr = inet_ntoa(*ip);
+               setenv("ip", addr, 1);
+               bb_info_msg("%s %s %s", argv[1], intf, addr);
+       }
 
-/**
- * Print usage information.
- */
-static void __attribute__ ((noreturn))
-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
+       status = wait4pid(spawn(argv));
+       if (status < 0) {
+               bb_perror_msg("%s %s", argv[1], intf);
+               return -errno;
+       }
+       if (status != 0)
+               bb_error_msg("script %s %s failed, exitcode=%d", argv[0], argv[1], status);
+       return status;
 }
 
 /**
  * Return milliseconds of random delay, up to "secs" seconds.
  */
-static inline unsigned
-ms_rdelay(unsigned secs)
+static unsigned ATTRIBUTE_ALWAYS_INLINE ms_rdelay(unsigned secs)
 {
        return lrand48() % (secs * 1000);
 }
@@ -243,119 +157,119 @@ ms_rdelay(unsigned secs)
 /**
  * main program
  */
-int
-main(int argc, char *argv[])
-       __attribute__ ((weak, alias ("zcip_main")));
-
-int zcip_main(int argc, char *argv[])
+int zcip_main(int argc, char **argv);
+int zcip_main(int argc, char **argv)
 {
-       char *intf = NULL;
-       char *script = NULL;
-       int quit = 0;
-       int foreground = 0;
-
-       char *why;
-       struct sockaddr saddr;
-       struct ether_addr addr;
-       struct in_addr ip = { 0 };
+       int state = PROBE;
+       struct ether_addr eth_addr;
+       const char *why;
        int fd;
-       int ready = 0;
-       suseconds_t timeout = 0;        // milliseconds
-       time_t defend = 0;
-       unsigned conflicts = 0;
-       unsigned nprobes = 0;
-       unsigned nclaims = 0;
-       int t;
-
+       char *r_opt;
+       unsigned opts;
+
+       /* Ugly trick, but I want these zeroed in one go */
+       struct {
+               const struct in_addr null_ip;
+               const struct ether_addr null_addr;
+               struct sockaddr saddr;
+               struct in_addr ip;
+               struct ifreq ifr;
+               char *intf;
+               char *script_av[3];
+               suseconds_t timeout; // milliseconds
+               unsigned conflicts;
+               unsigned nprobes;
+               unsigned nclaims;
+               int ready;
+               int verbose;
+       } L;
+#define null_ip   (L.null_ip  )
+#define null_addr (L.null_addr)
+#define saddr     (L.saddr    )
+#define ip        (L.ip       )
+#define ifr       (L.ifr      )
+#define intf      (L.intf     )
+#define script_av (L.script_av)
+#define timeout   (L.timeout  )
+#define conflicts (L.conflicts)
+#define nprobes   (L.nprobes  )
+#define nclaims   (L.nclaims  )
+#define ready     (L.ready    )
+#define verbose   (L.verbose  )
+
+       memset(&L, 0, sizeof(L));
+
+#define FOREGROUND (opts & 1)
+#define QUIT       (opts & 2)
        // parse commandline: prog [options] ifname script
-       prog = argv[0];
-       while ((t = getopt(argc, argv, "fqr:v")) != EOF) {
-               switch (t) {
-               case 'f':
-                       foreground = 1;
-                       continue;
-               case 'q':
-                       quit = 1;
-                       continue;
-               case 'r':
-                       if (inet_aton(optarg, &ip) == 0
-                                       || (ntohl(ip.s_addr) & IN_CLASSB_NET)
-                                               != LINKLOCAL_ADDR) {
-                               usage("invalid link address");
-                       }
-                       continue;
-               case 'v':
-                       if (!verbose)
-                               printf("%s: version %s\n", prog, ZCIP_VERSION);
-                       verbose++;
-                       foreground = 1;
-                       continue;
-               default:
-                       usage("bad option");
-               }
+       // exactly 2 args; -v accumulates and implies -f
+       opt_complementary = "=2:vv:vf";
+       opts = getopt32(argc, argv, "fqr:v", &r_opt, &verbose);
+       if (!FOREGROUND) {
+               /* Do it early, before all bb_xx_msg calls */
+               openlog(applet_name, 0, LOG_DAEMON);
+               logmode |= LOGMODE_SYSLOG;
        }
-       if (optind < argc - 1) {
-               intf = argv[optind++];
-               setenv("interface", intf, 1);
-               script = argv[optind++];
+       if (opts & 4) { // -r n.n.n.n
+               if (inet_aton(r_opt, &ip) == 0
+                || (ntohl(ip.s_addr) & IN_CLASSB_NET) != LINKLOCAL_ADDR
+               ) {
+                       bb_error_msg_and_die("invalid link address");
+               }
        }
-       if (optind != argc || !intf)
-               usage("wrong number of arguments");
-       openlog(prog, 0, LOG_DAEMON);
+       // On NOMMU reexec early (or else we will rerun things twice)
+#if !BB_MMU
+       if (!FOREGROUND)
+               bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
+#endif
+       argc -= optind;
+       argv += optind;
+
+       intf = argv[0];
+       script_av[0] = argv[1];
+       setenv("interface", intf, 1);
 
        // initialize the interface (modprobe, ifup, etc)
-       if (run(script, "init", intf, NULL) < 0)
+       script_av[1] = (char*)"init";
+       if (run(script_av, intf, NULL))
                return EXIT_FAILURE;
 
        // initialize saddr
-       memset(&saddr, 0, sizeof (saddr));
-       strncpy(saddr.sa_data, intf, sizeof (saddr.sa_data));
+       //memset(&saddr, 0, sizeof(saddr));
+       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) {
-               why = "open";
-fail:
-               foreground = 1;
-               goto bad;
-       }
+       fd = xsocket(PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP));
        // bind to the interface's ARP socket
-       if (bind(fd, &saddr, sizeof (saddr)) < 0) {
-               why = "bind";
-               goto fail;
-       } else {
-               struct ifreq ifr;
-               short seed[3];
-
-               // get the interface's ethernet address
-               memset(&ifr, 0, sizeof (ifr));
-               strncpy(ifr.ifr_name, intf, sizeof (ifr.ifr_name));
-               if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) {
-                       why = "get ethernet address";
-                       goto fail;
-               }
-               memcpy(&addr, &ifr.ifr_hwaddr.sa_data, ETH_ALEN);
-
-               // start with some stable ip address, either a function of
-               // the hardware address or else the last address we used.
-               // NOTE: the sequence of addresses we try changes only
-               // depending on when we detect conflicts.
-               memcpy(seed, &ifr.ifr_hwaddr.sa_data, ETH_ALEN);
-               seed48(seed);
-               if (ip.s_addr == 0)
-                       pick(&ip);
+       xbind(fd, &saddr, sizeof(saddr));
+
+       // get the interface's ethernet address
+       //memset(&ifr, 0, sizeof(ifr));
+       strncpy(ifr.ifr_name, intf, sizeof(ifr.ifr_name));
+       if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) {
+               bb_perror_msg_and_die("get ethernet address");
        }
+       memcpy(&eth_addr, &ifr.ifr_hwaddr.sa_data, ETH_ALEN);
+
+       // start with some stable ip address, either a function of
+       // the hardware address or else the last address we used.
+       // NOTE: the sequence of addresses we try changes only
+       // depending on when we detect conflicts.
+       // (SVID 3 bogon: who says that "short" is always 16 bits?)
+       seed48( (unsigned short*)&ifr.ifr_hwaddr.sa_data );
+       if (ip.s_addr == 0)
+               pick(&ip);
 
        // FIXME cases to handle:
        //  - zcip already running!
        //  - link already has local address... just defend/update
 
        // daemonize now; don't delay system startup
-       if (!foreground) {
-               if (daemon(0, verbose) < 0) {
-                       why = "daemon";
-                       goto bad;
-               }
-               syslog(LOG_INFO, "start, interface %s", intf);
+       if (!FOREGROUND) {
+#if BB_MMU
+               bb_daemonize(DAEMON_CHDIR_ROOT);
+#endif
+               bb_info_msg("start, interface %s", intf);
        }
 
        // run the dynamic address negotiation protocol,
@@ -371,180 +285,262 @@ fail:
                struct timeval tv1;
                struct arp_packet p;
 
+               int source_ip_conflict = 0;
+               int target_ip_conflict = 0;
+
                fds[0].fd = fd;
                fds[0].events = POLLIN;
                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) {
+               // poll, being ready to adjust current timeout
+               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.
                }
+               // set tv1 to the point in time when we timeout
+               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)) {
 
-               // timeouts trigger protocol transitions
+               // timeout
                case 0:
-                       // probes
-                       if (nprobes < PROBE_NUM) {
-                               nprobes++;
-                               VDBG("probe/%d %s@%s\n",
-                                               nprobes, intf, inet_ntoa(ip));
-                               (void)arp(fd, &saddr, ARPOP_REQUEST,
-                                               &addr, null_ip,
-                                               &null_addr, ip);
+                       VDBG("state = %d\n", state);
+                       switch (state) {
+                       case PROBE:
+                               // timeouts in the PROBE state mean no conflicting ARP packets
+                               // have been received, so we can progress through the states
                                if (nprobes < PROBE_NUM) {
+                                       nprobes++;
+                                       VDBG("probe/%d %s@%s\n",
+                                                       nprobes, intf, inet_ntoa(ip));
+                                       arp(fd, &saddr, ARPOP_REQUEST,
+                                                       &eth_addr, null_ip,
+                                                       &null_addr, ip);
                                        timeout = PROBE_MIN * 1000;
                                        timeout += ms_rdelay(PROBE_MAX
                                                        - PROBE_MIN);
-                               } else
-                                       timeout = ANNOUNCE_WAIT * 1000;
-                       }
-                       // then announcements
-                       else if (nclaims < ANNOUNCE_NUM) {
-                               nclaims++;
+                               }
+                               else {
+                                       // Switch to announce state.
+                                       state = ANNOUNCE;
+                                       nclaims = 0;
+                                       VDBG("announce/%d %s@%s\n",
+                                                       nclaims, intf, inet_ntoa(ip));
+                                       arp(fd, &saddr, ARPOP_REQUEST,
+                                                       &eth_addr, ip,
+                                                       &eth_addr, ip);
+                                       timeout = ANNOUNCE_INTERVAL * 1000;
+                               }
+                               break;
+                       case RATE_LIMIT_PROBE:
+                               // timeouts in the RATE_LIMIT_PROBE state mean no conflicting ARP packets
+                               // have been received, so we can move immediately to the announce state
+                               state = ANNOUNCE;
+                               nclaims = 0;
                                VDBG("announce/%d %s@%s\n",
                                                nclaims, intf, inet_ntoa(ip));
-                               (void)arp(fd, &saddr, ARPOP_REQUEST,
-                                               &addr, ip,
-                                               &addr, ip);
+                               arp(fd, &saddr, ARPOP_REQUEST,
+                                               &eth_addr, ip,
+                                               &eth_addr, ip);
+                               timeout = ANNOUNCE_INTERVAL * 1000;
+                               break;
+                       case ANNOUNCE:
+                               // timeouts in the ANNOUNCE state mean no conflicting ARP packets
+                               // have been received, so we can progress through the states
                                if (nclaims < ANNOUNCE_NUM) {
+                                       nclaims++;
+                                       VDBG("announce/%d %s@%s\n",
+                                                       nclaims, intf, inet_ntoa(ip));
+                                       arp(fd, &saddr, ARPOP_REQUEST,
+                                                       &eth_addr, ip,
+                                                       &eth_addr, ip);
                                        timeout = ANNOUNCE_INTERVAL * 1000;
-                               } else {
+                               }
+                               else {
+                                       // Switch to monitor state.
+                                       state = MONITOR;
                                        // link is ok to use earlier
-                                       run(script, "config", intf, &ip);
+                                       // FIXME update filters
+                                       script_av[1] = (char*)"config";
+                                       run(script_av, intf, &ip);
                                        ready = 1;
                                        conflicts = 0;
-                                       timeout = -1;
+                                       timeout = -1; // Never timeout in the monitor state.
 
-                                       // NOTE:  all other exit paths
+                                       // NOTE: all other exit paths
                                        // should deconfig ...
-                                       if (quit)
+                                       if (QUIT)
                                                return EXIT_SUCCESS;
-                                       // FIXME update filters
                                }
-                       }
-                       break;
-
+                               break;
+                       case DEFEND:
+                               // We won!  No ARP replies, so just go back to monitor.
+                               state = MONITOR;
+                               timeout = -1;
+                               conflicts = 0;
+                               break;
+                       default:
+                               // Invalid, should never happen.  Restart the whole protocol.
+                               state = PROBE;
+                               pick(&ip);
+                               timeout = 0;
+                               nprobes = 0;
+                               nclaims = 0;
+                               break;
+                       } // switch (state)
+                       break; // case 0 (timeout)
                // packets arriving
                case 1:
-                       // maybe adjust timeout
+                       // We need to adjust the timeout in case we didn't receive
+                       // a conflicting packet.
                        if (timeout > 0) {
                                struct timeval tv2;
 
                                gettimeofday(&tv2, NULL);
                                if (timercmp(&tv1, &tv2, <)) {
-                                       timeout = -1;
+                                       // Current time is greater than the expected timeout time.
+                                       // Should never happen.
+                                       VDBG("missed an expected timeout\n");
+                                       timeout = 0;
                                } else {
+                                       VDBG("adjusting timeout\n");
                                        timersub(&tv1, &tv2, &tv1);
                                        timeout = 1000 * tv1.tv_sec
                                                        + tv1.tv_usec / 1000;
                                }
                        }
+
                        if ((fds[0].revents & POLLIN) == 0) {
                                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", intf);
                                        if (ready) {
-                                               run(script, "deconfig",
-                                                               intf, &ip);
+                                               script_av[1] = (char*)"deconfig";
+                                               run(script_av, intf, &ip);
                                        }
                                        return EXIT_FAILURE;
                                }
                                continue;
                        }
+
                        // read ARP packet
-                       if (recv(fd, &p, sizeof (p), 0) < 0) {
+                       if (recv(fd, &p, sizeof(p), 0) < 0) {
                                why = "recv";
                                goto bad;
                        }
                        if (p.hdr.ether_type != htons(ETHERTYPE_ARP))
                                continue;
 
-                       VDBG("%s recv arp type=%d, op=%d,\n",
+#ifdef DEBUG
+                       {
+                               struct ether_addr * sha = (struct ether_addr *) p.arp.arp_sha;
+                               struct ether_addr * tha = (struct ether_addr *) p.arp.arp_tha;
+                               struct in_addr * spa = (struct in_addr *) p.arp.arp_spa;
+                               struct in_addr * tpa = (struct in_addr *) p.arp.arp_tpa;
+                               VDBG("%s recv arp type=%d, op=%d,\n",
                                        intf, ntohs(p.hdr.ether_type),
-                                       ntohs(p.arp.ar_op));
-                       VDBG("\tsource=%s %s\n",
-                                       ether_ntoa(&p.source_addr),
-                                       inet_ntoa(p.source_ip));
-                       VDBG("\ttarget=%s %s\n",
-                                       ether_ntoa(&p.target_addr),
-                                       inet_ntoa(p.target_ip));
-                       if (p.arp.ar_op != htons(ARPOP_REQUEST)
-                                       && p.arp.ar_op != htons(ARPOP_REPLY))
+                                       ntohs(p.arp.arp_op));
+                               VDBG("\tsource=%s %s\n",
+                                       ether_ntoa(sha),
+                                       inet_ntoa(*spa));
+                               VDBG("\ttarget=%s %s\n",
+                                       ether_ntoa(tha),
+                                       inet_ntoa(*tpa));
+                       }
+#endif
+                       if (p.arp.arp_op != htons(ARPOP_REQUEST)
+                                       && p.arp.arp_op != htons(ARPOP_REPLY))
                                continue;
 
-                       // some cases are always conflicts 
-                       if ((p.source_ip.s_addr == ip.s_addr)
-                                       && (memcmp(&addr, &p.source_addr,
-                                                       ETH_ALEN) != 0)) {
-collision:
-                               VDBG("%s ARP conflict from %s\n", intf,
-                                               ether_ntoa(&p.source_addr));
-                               if (ready) {
-                                       time_t now = time(0);
-
-                                       if ((defend + DEFEND_INTERVAL)
-                                                       < now) {
-                                               defend = now;
-                                               (void)arp(fd, &saddr,
-                                                               ARPOP_REQUEST,
-                                                               &addr, ip,
-                                                               &addr, ip);
-                                               VDBG("%s defend\n", intf);
-                                               timeout = -1;
-                                               continue;
+                       if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr)) == 0 &&
+                               memcmp(&eth_addr, &p.arp.arp_sha, ETH_ALEN) != 0) {
+                               source_ip_conflict = 1;
+                       }
+                       if (memcmp(p.arp.arp_tpa, &ip.s_addr, sizeof(struct in_addr)) == 0 &&
+                               p.arp.arp_op == htons(ARPOP_REQUEST) &&
+                               memcmp(&eth_addr, &p.arp.arp_tha, ETH_ALEN) != 0) {
+                               target_ip_conflict = 1;
+                       }
+
+                       VDBG("state = %d, source ip conflict = %d, target ip conflict = %d\n",
+                               state, source_ip_conflict, target_ip_conflict);
+                       switch (state) {
+                       case PROBE:
+                       case ANNOUNCE:
+                               // When probing or announcing, check for source IP conflicts
+                               // and other hosts doing ARP probes (target IP conflicts).
+                               if (source_ip_conflict || target_ip_conflict) {
+                                       conflicts++;
+                                       if (conflicts >= MAX_CONFLICTS) {
+                                               VDBG("%s ratelimit\n", intf);
+                                               timeout = RATE_LIMIT_INTERVAL * 1000;
+                                               state = RATE_LIMIT_PROBE;
                                        }
-                                       defend = now;
-                                       ready = 0;
-                                       run(script, "deconfig", intf, &ip);
-                                       // FIXME rm filters: setsockopt(fd,
-                                       // SO_DETACH_FILTER, ...)
+
+                                       // restart the whole protocol
+                                       pick(&ip);
+                                       timeout = 0;
+                                       nprobes = 0;
+                                       nclaims = 0;
                                }
-                               conflicts++;
-                               if (conflicts >= MAX_CONFLICTS) {
-                                       VDBG("%s ratelimit\n", intf);
-                                       sleep(RATE_LIMIT_INTERVAL);
+                               break;
+                       case MONITOR:
+                               // If a conflict, we try to defend with a single ARP probe.
+                               if (source_ip_conflict) {
+                                       VDBG("monitor conflict -- defending\n");
+                                       state = DEFEND;
+                                       timeout = DEFEND_INTERVAL * 1000;
+                                       arp(fd, &saddr,
+                                                       ARPOP_REQUEST,
+                                                       &eth_addr, ip,
+                                                       &eth_addr, ip);
                                }
-                               // restart the whole protocol
+                               break;
+                       case DEFEND:
+                               // Well, we tried.  Start over (on conflict).
+                               if (source_ip_conflict) {
+                                       state = PROBE;
+                                       VDBG("defend conflict -- starting over\n");
+                                       ready = 0;
+                                       script_av[1] = (char*)"deconfig";
+                                       run(script_av, intf, &ip);
+
+                                       // restart the whole protocol
+                                       pick(&ip);
+                                       timeout = 0;
+                                       nprobes = 0;
+                                       nclaims = 0;
+                               }
+                               break;
+                       default:
+                               // Invalid, should never happen.  Restart the whole protocol.
+                               VDBG("invalid state -- starting over\n");
+                               state = PROBE;
                                pick(&ip);
                                timeout = 0;
                                nprobes = 0;
                                nclaims = 0;
-                       }
-                       // two hosts probing one address is a collision too
-                       else if (p.target_ip.s_addr == ip.s_addr
-                                       && nclaims == 0
-                                       && p.arp.ar_op == htons(ARPOP_REQUEST)
-                                       && memcmp(&addr, &p.target_addr,
-                                                       ETH_ALEN) != 0) {
-                               goto collision;
-                       }
-                       break;
+                               break;
+                       } // switch state
 
+                       break; // case 1 (packets arriving)
                default:
                        why = "poll";
                        goto bad;
-               }
+               } // switch poll
        }
-bad:
-       if (foreground)
-               perror(why);
-       else 
-               syslog(LOG_ERR, "%s %s, %s error: %s",
-                       prog, intf, why, strerror(errno));
+ bad:
+       bb_perror_msg("%s, %s", intf, why);
        return EXIT_FAILURE;
 }