Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/ifupdown.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/ifupdown.c (modified) (27 diffs)

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

@@ -45 +45 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 /* After libbb.h, since it needs sys/types.h on some systems */
 #include <sys/utsname.h>
@@ -130 +131 @@
     char *shell;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define G (*(struct globals*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 
@@ -290 +291 @@
                      * unlike ifconfig, ip doesnt want <class>
                      * (usually "ether" keyword). Skip it. */
-                    if (strncmp(command, "hwaddress", 9) == 0) {
+                    if (is_prefixed_with(command, "hwaddress")) {
                         varvalue = skip_whitespace(skip_non_whitespace(varvalue));
                     }
@@ -299 +300 @@
                     /* Sigh...  Add a special case for 'ip' to convert from
                      * dotted quad to bit count style netmasks.  */
-                    if (strncmp(command, "bnmask", 6) == 0) {
+                    if (is_prefixed_with(command, "bnmask")) {
                         unsigned res;
                         varvalue = get_var("netmask", 7, ifd);
@@ -395 +396 @@
     result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec);
     result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
-    /* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */
-    result += execute("[[ip route add ::/0 via %gateway%]][[ prio %metric%]]", ifd, exec);
+    /* Reportedly, IPv6 needs "dev %iface%", but IPv4 does not: */
+    result += execute("[[ip route add ::/0 via %gateway% dev %iface%]][[ metric %metric%]]", ifd, exec);
 # else
     result = execute("ifconfig %iface%[[ media %media%]][[ hw %hwaddress%]][[ mtu %mtu%]] up", ifd, exec);
@@ -422 +423 @@
     result += execute("ip link set %iface% up", ifd, exec);
     result += execute("ip addr add %address%/%netmask% dev %iface%", ifd, exec);
-    result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec);
+    /* Reportedly, IPv6 needs "dev %iface%", but IPv4 does not: */
+    result += execute("[[ip route add ::/0 via %gateway% dev %iface%]]", ifd, exec);
     return ((result == 4) ? 4 : 0);
 }
@@ -483 +485 @@
             "dev %iface%[[ peer %pointopoint%]][[ label %label%]]", ifd, exec);
     result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
-    result += execute("[[ip route add default via %gateway% dev %iface%[[ prio %metric%]]]]", ifd, exec);
+    result += execute("[[ip route add default via %gateway% dev %iface%[[ metric %metric%]]]]", ifd, exec);
     return ((result == 3) ? 3 : 0);
 # else
@@ -535 +537 @@
     },
     { "udhcpc",
-        "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %client%]]"
+        "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -x hostname:%hostname%]][[ -c %client%]]"
                 "[[ -s %script%]][[ %udhcpc_opts%]]",
         "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
@@ -556 +558 @@
 #  endif
     for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
-        if (exists_execable(ext_dhcp_clients[i].name))
+        if (executable_exists(ext_dhcp_clients[i].name))
             return execute(ext_dhcp_clients[i].startcmd, ifd, exec);
     }
@@ -575 +577 @@
 #  endif
     return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid "
-            "-i %iface%[[ -H %hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]",
+            "-i %iface%[[ -x hostname:%hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]",
             ifd, exec);
 }
@@ -593 +595 @@
 
     for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
-        if (exists_execable(ext_dhcp_clients[i].name)) {
+        if (executable_exists(ext_dhcp_clients[i].name)) {
             result = execute(ext_dhcp_clients[i].stopcmd, ifd, exec);
             if (result)
@@ -686 +688 @@
 #endif  /* FEATURE_IFUPDOWN_IPV4 */
 
+static int FAST_FUNC link_up_down(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM)
+{
+    return 1;
+}
+
+static const struct method_t link_methods[] = {
+    { "none", link_up_down, link_up_down }
+};
+
+static const struct address_family_t addr_link = {
+    "link", ARRAY_SIZE(link_methods), link_methods
+};
 
 /* Returns pointer to the next word, or NULL.
@@ -744 +758 @@
 }
 
-static struct interfaces_file_t *read_interfaces(const char *filename)
+static struct interfaces_file_t *read_interfaces(const char *filename, struct interfaces_file_t *defn)
 {
     /* Let's try to be compatible.
@@ -759 +773 @@
      * A "\" character at the very end of the line indicates the next line
      * should be treated as a continuation of the current one.
+     *
+     * Lines  beginning with "source" are used to include stanzas from
+     * other files, so configuration can be split into many files.
+     * The word "source" is followed by the path of file to be sourced.
      */
 #if ENABLE_FEATURE_IFUPDOWN_MAPPING
@@ -764 +782 @@
 #endif
     struct interface_defn_t *currif = NULL;
-    struct interfaces_file_t *defn;
     FILE *f;
     char *buf;
@@ -771 +788 @@
     enum { NONE, IFACE, MAPPING } currently_processing = NONE;
 
-    defn = xzalloc(sizeof(*defn));
+    if (!defn)
+        defn = xzalloc(sizeof(*defn));
+
+    debug_noise("reading %s file:\n", filename);
     f = xfopen_for_read(filename);
 
@@ -826 +846 @@
                 &addr_inet6,
 #endif
+                &addr_link,
                 NULL
             };
@@ -831 +852 @@
             char *address_family_name;
             char *method_name;
-            llist_t *iface_list;
 
             currif = xzalloc(sizeof(*currif));
@@ -856 +876 @@
             if (!currif->method)
                 bb_error_msg_and_die("unknown method \"%s\"", method_name);
-
+#if 0
+// Allegedly, Debian allows a duplicate definition:
+// iface eth0 inet static
+//     address 192.168.0.15
+//     netmask 255.255.0.0
+//     gateway 192.168.0.1
+//
+// iface eth0 inet static
+//     address 10.0.0.1
+//     netmask 255.255.255.0
+//
+// This adds *two* addresses to eth0 (probably requires use of "ip", not "ifconfig"
+//
+            llist_t *iface_list;
             for (iface_list = defn->ifaces; iface_list; iface_list = iface_list->link) {
                 struct interface_defn_t *tmp = (struct interface_defn_t *) iface_list->data;
@@ -865 +898 @@
                 }
             }
+#endif
             llist_add_to_end(&(defn->ifaces), (char*)currif);
 
@@ -882 +916 @@
             }
             currently_processing = NONE;
+        } else if (strcmp(first_word, "source") == 0) {
+            read_interfaces(next_word(&rest_of_line), defn);
         } else {
             switch (currently_processing) {
@@ -935 +971 @@
     }
     fclose(f);
+    debug_noise("\ndone reading %s\n\n", filename);
 
     return defn;
@@ -1138 +1175 @@
 static llist_t *find_iface_state(llist_t *state_list, const char *iface)
 {
-    unsigned iface_len = strlen(iface);
     llist_t *search = state_list;
 
     while (search) {
-        if ((strncmp(search->data, iface, iface_len) == 0)
-         && (search->data[iface_len] == '=')
+        char *after_iface = is_prefixed_with(search->data, iface);
+        if (after_iface
+         && *after_iface == '='
         ) {
             return search;
@@ -1200 +1237 @@
     }
 
-    debug_noise("reading %s file:\n", interfaces);
-    defn = read_interfaces(interfaces);
-    debug_noise("\ndone reading %s\n\n", interfaces);
+    defn = read_interfaces(interfaces, NULL);
 
     /* Create a list of interfaces to work on */
@@ -1220 +1255 @@
         bool okay = 0;
         int cmds_ret;
+        bool curr_failure = 0;
 
         iface = xstrdup(target_list->data);
@@ -1285 +1321 @@
                 cmds_ret = cmds(currif);
                 if (cmds_ret == -1) {
-                    bb_error_msg("don't seem to have all the variables for %s/%s",
+                    bb_error_msg("don't have all variables for %s/%s",
                             liface, currif->address_family->name);
-                    any_failures = 1;
+                    any_failures = curr_failure = 1;
                 } else if (cmds_ret == 0) {
-                    any_failures = 1;
+                    any_failures = curr_failure = 1;
                 }
 
@@ -1310 +1346 @@
             llist_t *iface_state = find_iface_state(state_list, iface);
 
-            if (cmds == iface_up && !any_failures) {
+            if (cmds == iface_up && !curr_failure) {
                 char *newiface = xasprintf("%s=%s", iface, liface);
                 if (!iface_state) {