Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/ifplugd.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/ifplugd.c (modified) (12 diffs)

branches/3.3/mindi-busybox/networking/ifplugd.c

@@ -39 +39 @@
 #include <linux/ethtool.h>
 #ifdef HAVE_NET_ETHERNET_H
-# include <net/ethernet.h>
+/* musl breakage:
+ * In file included from /usr/include/net/ethernet.h:10,
+ *                  from networking/ifplugd.c:41:
+ * /usr/include/netinet/if_ether.h:96: error: redefinition of 'struct ethhdr'
+ *
+ * Build succeeds without it on musl. Commented it out.
+ * If on your system you need it, consider removing <linux/ethtool.h>
+ * and copy-pasting its definitions here (<linux/ethtool.h> is what pulls in
+ * conflicting definition of struct ethhdr on musl).
+ */
+/* # include <net/ethernet.h> */
 #endif
 #include <linux/netlink.h>
@@ -48 +58 @@
 #define __user
 #include <linux/wireless.h>
+
+#ifndef ETH_ALEN
+# define ETH_ALEN  6
+#endif
 
 /*
@@ -290 +304 @@
 };
 
-
-
 static const char *strstatus(int status)
 {
@@ -452 +464 @@
 {
     int iface_len;
-    char replybuf[1024];
+    /* Buffer was 1K, but on linux-3.9.9 it was reported to be too small.
+     * netlink.h: "limit to 8K to avoid MSG_TRUNC when PAGE_SIZE is very large".
+     * Note: on error returns (-1) we exit, no need to free replybuf.
+     */
+    enum { BUF_SIZE = 8 * 1024 };
+    char *replybuf = xmalloc(BUF_SIZE);
 
     iface_len = strlen(G.iface);
@@ -459 +476 @@
         ssize_t bytes;
 
-        bytes = recv(netlink_fd, &replybuf, sizeof(replybuf), MSG_DONTWAIT);
+        bytes = recv(netlink_fd, replybuf, BUF_SIZE, MSG_DONTWAIT);
         if (bytes < 0) {
             if (errno == EAGAIN)
-                return G.iface_exists;
+                goto ret;
             if (errno == EINTR)
                 continue;
-
             bb_perror_msg("netlink: recv");
             return -1;
@@ -508 +524 @@
     }
 
+ ret:
+    free(replybuf);
     return G.iface_exists;
 }
@@ -557 +575 @@
     if (opts & FLAG_KILL) {
         if (pid_from_pidfile > 0)
-            kill(pid_from_pidfile, SIGQUIT);
+            /* Upstream tool use SIGINT for -k */
+            kill(pid_from_pidfile, SIGINT);
         return EXIT_SUCCESS;
     }
@@ -646 +665 @@
     while (1) {
         int iface_status_old;
-        int iface_exists_old;
 
         switch (bb_got_signal) {
@@ -672 +690 @@
         }
 
-        iface_status_old = iface_status;
-        iface_exists_old = G.iface_exists;
-
         if ((opts & FLAG_MONITOR)
          && (netlink_pollfd[0].revents & POLLIN)
         ) {
+            int iface_exists_old;
+
+            iface_exists_old = G.iface_exists;
             G.iface_exists = check_existence_through_netlink();
             if (G.iface_exists < 0) /* error */
@@ -690 +708 @@
 
         /* note: if !G.iface_exists, returns DOWN */
+        iface_status_old = iface_status;
         iface_status = detect_link();
         if (iface_status == IFSTATUS_ERR) {
@@ -703 +722 @@
             if (delay_time) {
                 /* link restored its old status before
-                 * we run script. don't run the script: */
+                 * we ran script. don't run the script: */
                 delay_time = 0;
             } else {
@@ -711 +730 @@
                 if (iface_status == IFSTATUS_DOWN)
                     delay_time += G.delay_down;
-                if (delay_time == 0)
-                    delay_time++;
+#if 0  /* if you are back in 1970... */
+                if (delay_time == 0) {
+                    sleep(1);
+                    delay_time = 1;
+                }
+#endif
             }
         }
 
         if (delay_time && (int)(monotonic_sec() - delay_time) >= 0) {
-            delay_time = 0;
             if (run_script(iface_status_str) != 0)
                 goto exiting;
+            delay_time = 0;
         }
     } /* while (1) */