Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/ifplugd.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/ifplugd.c (modified) (7 diffs)

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

@@ -7 +7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define ifplugd_trivial_usage
+//usage:       "[OPTIONS]"
+//usage:#define ifplugd_full_usage "\n\n"
+//usage:       "Network interface plug detection daemon\n"
+//usage:     "\n    -n      Don't daemonize"
+//usage:     "\n    -s      Don't log to syslog"
+//usage:     "\n    -i IFACE    Interface"
+//usage:     "\n    -f/-F       Treat link detection error as link down/link up"
+//usage:     "\n            (otherwise exit on error)"
+//usage:     "\n    -a      Don't up interface at each link probe"
+//usage:     "\n    -M      Monitor creation/destruction of interface"
+//usage:     "\n            (otherwise it must exist)"
+//usage:     "\n    -r PROG     Script to run"
+//usage:     "\n    -x ARG      Extra argument for script"
+//usage:     "\n    -I      Don't exit on nonzero exit code from script"
+//usage:     "\n    -p      Don't run \"up\" script on startup"
+//usage:     "\n    -q      Don't run \"down\" script on exit"
+//usage:     "\n    -l      Always run script on startup"
+//usage:     "\n    -t SECS     Poll time in seconds"
+//usage:     "\n    -u SECS     Delay before running script after link up"
+//usage:     "\n    -d SECS     Delay after link down"
+//usage:     "\n    -m MODE     API mode (mii, priv, ethtool, wlan, iff, auto)"
+//usage:     "\n    -k      Kill running daemon"
+
 #include "libbb.h"
 
@@ -13 +38 @@
 #include <linux/mii.h>
 #include <linux/ethtool.h>
-#include <net/ethernet.h>
+#ifdef HAVE_NET_ETHERNET_H
+# include <net/ethernet.h>
+#endif
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
@@ -132 +159 @@
 static smallint detect_link_mii(void)
 {
-    struct ifreq ifreq;
-    struct mii_ioctl_data *mii = (void *)&ifreq.ifr_data;
-
-    set_ifreq_to_ifname(&ifreq);
-
-    if (network_ioctl(SIOCGMIIPHY, &ifreq, "SIOCGMIIPHY") < 0) {
+    /* char buffer instead of bona-fide struct avoids aliasing warning */
+    char buf[sizeof(struct ifreq)];
+    struct ifreq *const ifreq = (void *)buf;
+
+    struct mii_ioctl_data *mii = (void *)&ifreq->ifr_data;
+
+    set_ifreq_to_ifname(ifreq);
+
+    if (network_ioctl(SIOCGMIIPHY, ifreq, "SIOCGMIIPHY") < 0) {
         return IFSTATUS_ERR;
     }
@@ -143 +173 @@
     mii->reg_num = 1;
 
-    if (network_ioctl(SIOCGMIIREG, &ifreq, "SIOCGMIIREG") < 0) {
+    if (network_ioctl(SIOCGMIIREG, ifreq, "SIOCGMIIREG") < 0) {
         return IFSTATUS_ERR;
     }
@@ -152 +182 @@
 static smallint detect_link_priv(void)
 {
-    struct ifreq ifreq;
-    struct mii_ioctl_data *mii = (void *)&ifreq.ifr_data;
-
-    set_ifreq_to_ifname(&ifreq);
-
-    if (network_ioctl(SIOCDEVPRIVATE, &ifreq, "SIOCDEVPRIVATE") < 0) {
+    /* char buffer instead of bona-fide struct avoids aliasing warning */
+    char buf[sizeof(struct ifreq)];
+    struct ifreq *const ifreq = (void *)buf;
+
+    struct mii_ioctl_data *mii = (void *)&ifreq->ifr_data;
+
+    set_ifreq_to_ifname(ifreq);
+
+    if (network_ioctl(SIOCDEVPRIVATE, ifreq, "SIOCDEVPRIVATE") < 0) {
         return IFSTATUS_ERR;
     }
@@ -163 +196 @@
     mii->reg_num = 1;
 
-    if (network_ioctl(SIOCDEVPRIVATE+1, &ifreq, "SIOCDEVPRIVATE+1") < 0) {
+    if (network_ioctl(SIOCDEVPRIVATE+1, ifreq, "SIOCDEVPRIVATE+1") < 0) {
         return IFSTATUS_ERR;
     }
@@ -519 +552 @@
 
 #if ENABLE_FEATURE_PIDFILE
-    pidfile_name = xasprintf(_PATH_VARRUN"ifplugd.%s.pid", G.iface);
+    pidfile_name = xasprintf(CONFIG_PID_FILE_PATH "/ifplugd.%s.pid", G.iface);
     pid_from_pidfile = read_pid(pidfile_name);