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

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

@@ -11 +11 @@
  */
 
+//config:config NAMEIF
+//config:   bool "nameif"
+//config:   default y
+//config:   select PLATFORM_LINUX
+//config:   select FEATURE_SYSLOG
+//config:   help
+//config:     nameif is used to rename network interface by its MAC address.
+//config:     Renamed interfaces MUST be in the down state.
+//config:     It is possible to use a file (default: /etc/mactab)
+//config:     with list of new interface names and MACs.
+//config:     Maximum interface name length: IFNAMSIZ = 16
+//config:     File fields are separated by space or tab.
+//config:     File format:
+//config:     # Comment
+//config:     new_interface_name    XX:XX:XX:XX:XX:XX
+//config:
+//config:config FEATURE_NAMEIF_EXTENDED
+//config:   bool "Extended nameif"
+//config:   default y
+//config:   depends on NAMEIF
+//config:   help
+//config:     This extends the nameif syntax to support the bus_info, driver,
+//config:     phyaddr selectors. The syntax is compatible to the normal nameif.
+//config:     File format:
+//config:       new_interface_name  driver=asix bus=usb-0000:00:08.2-3
+//config:       new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
+//config:       new_interface_name  phy_address=2 00:80:C8:38:91:B5
+//config:       new_interface_name  mac=00:80:C8:38:91:B5
+//config:       new_interface_name  00:80:C8:38:91:B5
+
+//usage:#define nameif_trivial_usage
+//usage:    IF_NOT_FEATURE_NAMEIF_EXTENDED(
+//usage:        "[-s] [-c FILE] [IFNAME HWADDR]..."
+//usage:    )
+//usage:    IF_FEATURE_NAMEIF_EXTENDED(
+//usage:        "[-s] [-c FILE] [IFNAME SELECTOR]..."
+//usage:    )
+//usage:#define nameif_full_usage "\n\n"
+//usage:    "Rename network interface while it in the down state."
+//usage:    IF_NOT_FEATURE_NAMEIF_EXTENDED(
+//usage:     "\nThe device with address HWADDR is renamed to IFACE."
+//usage:    )
+//usage:    IF_FEATURE_NAMEIF_EXTENDED(
+//usage:     "\nThe device matched by SELECTOR is renamed to IFACE."
+//usage:     "\nSELECTOR can be a combination of:"
+//usage:     "\n    driver=STRING"
+//usage:     "\n    bus=STRING"
+//usage:     "\n    phy_address=NUM"
+//usage:     "\n    [mac=]XX:XX:XX:XX:XX:XX"
+//usage:    )
+//usage:     "\n"
+//usage:     "\n    -c FILE Configuration file (default: /etc/mactab)"
+//usage:     "\n    -s  Log to syslog"
+//usage:
+//usage:#define nameif_example_usage
+//usage:       "$ nameif -s dmz0 00:A0:C9:8C:F6:3F\n"
+//usage:       " or\n"
+//usage:       "$ nameif -c /etc/my_mactab_file\n"
+
 #include "libbb.h"
 #include <syslog.h>
@@ -39 +98 @@
     char *bus_info;
     char *driver;
+    int32_t phy_address;
 #endif
 } ethtable_t;
@@ -60 +120 @@
     uint32_t regdump_len;  /* Size of data from ETHTOOL_GREGS (bytes) */
 };
+
+struct ethtool_cmd {
+    uint32_t   cmd;
+    uint32_t   supported;      /* Features this interface supports */
+    uint32_t   advertising;    /* Features this interface advertises */
+    uint16_t   speed;          /* The forced speed, 10Mb, 100Mb, gigabit */
+    uint8_t    duplex;         /* Duplex, half or full */
+    uint8_t    port;           /* Which connector port */
+    uint8_t    phy_address;
+    uint8_t    transceiver;    /* Which transceiver to use */
+    uint8_t    autoneg;        /* Enable or disable autonegotiation */
+    uint32_t   maxtxpkt;       /* Tx pkts before generating tx int */
+    uint32_t   maxrxpkt;       /* Rx pkts before generating rx int */
+    uint16_t   speed_hi;
+    uint16_t   reserved2;
+    uint32_t   reserved[3];
+};
+
+#define ETHTOOL_GSET      0x00000001 /* Get settings. */
 #define ETHTOOL_GDRVINFO  0x00000003 /* Get driver info. */
 #endif
@@ -75 +154 @@
         selector = skip_whitespace(selector);
 #if ENABLE_FEATURE_NAMEIF_EXTENDED
+        ch->phy_address = -1;
         if (*selector == '\0')
             break;
@@ -88 +168 @@
             ch->driver = xstrdup(selector + 7);
             found_selector++;
+        } else if (strncmp(selector, "phyaddr=", 8) == 0) {
+            ch->phy_address = xatoi_positive(selector + 8);
+            found_selector++;
         } else {
 #endif
@@ -134 +217 @@
 
 int nameif_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int nameif_main(int argc, char **argv)
+int nameif_main(int argc UNUSED_PARAM, char **argv)
 {
     ethtable_t *clist = NULL;
@@ -149 +232 @@
         logmode |= LOGMODE_SYSLOG;
     }
-    argc -= optind;
     argv += optind;
 
-    if (argc & 1)
-        bb_show_usage();
-
-    if (argc) {
-        while (*argv) {
-            char *ifname = xstrdup(*argv++);
-            prepend_new_eth_table(&clist, ifname, *argv++);
-        }
+    if (argv[0]) {
+        do {
+            if (!argv[1])
+                bb_show_usage();
+            prepend_new_eth_table(&clist, argv[0], argv[1]);
+            argv += 2;
+        } while (*argv);
     } else {
         parser = config_open(fname);
@@ -174 +255 @@
 #if  ENABLE_FEATURE_NAMEIF_EXTENDED
         struct ethtool_drvinfo drvinfo;
-#endif
-        if (parser->lineno < 2)
+        struct ethtool_cmd eth_settings;
+#endif
+        if (parser->lineno <= 2)
             continue; /* Skip the first two lines */
 
@@ -183 +265 @@
 
 #if ENABLE_FEATURE_NAMEIF_EXTENDED
+        /* Check for phy address */
+        memset(&eth_settings, 0, sizeof(eth_settings));
+        eth_settings.cmd = ETHTOOL_GSET;
+        ifr.ifr_data = (caddr_t) &eth_settings;
+        ioctl(ctl_sk, SIOCETHTOOL, &ifr);
+
         /* Check for driver etc. */
-        memset(&drvinfo, 0, sizeof(struct ethtool_drvinfo));
+        memset(&drvinfo, 0, sizeof(drvinfo));
         drvinfo.cmd = ETHTOOL_GDRVINFO;
         ifr.ifr_data = (caddr_t) &drvinfo;
@@ -198 +286 @@
                 continue;
             if (ch->driver && strcmp(ch->driver, drvinfo.driver) != 0)
+                continue;
+            if (ch->phy_address != -1 && ch->phy_address != eth_settings.phy_address)
                 continue;
 #endif