Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/zcip.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/networking/zcip.c (modified) (3 diffs)

branches/3.2/mindi-busybox/networking/zcip.c

@@ -24 +24 @@
 // - link status monitoring (restart on link-up; stop on link-down)
 
+//usage:#define zcip_trivial_usage
+//usage:       "[OPTIONS] IFACE SCRIPT"
+//usage:#define zcip_full_usage "\n\n"
+//usage:       "Manage a ZeroConf IPv4 link-local address\n"
+//usage:     "\n    -f      Run in foreground"
+//usage:     "\n    -q      Quit after obtaining address"
+//usage:     "\n    -r 169.254.x.x  Request this address first"
+//usage:     "\n    -v      Verbose"
+//usage:     "\n"
+//usage:     "\nWith no -q, runs continuously monitoring for ARP conflicts,"
+//usage:     "\nexits only on I/O errors (link down etc)"
+
+#include "libbb.h"
 #include <netinet/ether.h>
-#include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
-#include <linux/if_packet.h>
 #include <linux/sockios.h>
 
-#include "libbb.h"
 #include <syslog.h>
 
@@ -82 +92 @@
 #define saddr    (G.saddr   )
 #define eth_addr (G.eth_addr)
+#define INIT_G() do { } while (0)
 
 
@@ -214 +225 @@
 
     memset(&L, 0, sizeof(L));
+    INIT_G();
 
 #define FOREGROUND (opts & 1)