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

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

@@ -18 +18 @@
  */
 
+//usage:#define ifup_trivial_usage
+//usage:       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
+//usage:#define ifup_full_usage "\n\n"
+//usage:       "    -a  De/configure all interfaces automatically"
+//usage:     "\n    -i FILE Use FILE for interface definitions"
+//usage:     "\n    -n  Print out what would happen, but don't do it"
+//usage:    IF_FEATURE_IFUPDOWN_MAPPING(
+//usage:     "\n        (note: doesn't disable mappings)"
+//usage:     "\n    -m  Don't run any mappings"
+//usage:    )
+//usage:     "\n    -v  Print out what would happen before doing it"
+//usage:     "\n    -f  Force de/configuration"
+//usage:
+//usage:#define ifdown_trivial_usage
+//usage:       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
+//usage:#define ifdown_full_usage "\n\n"
+//usage:       "    -a  De/configure all interfaces automatically"
+//usage:     "\n    -i FILE Use FILE for interface definitions"
+//usage:     "\n    -n  Print out what would happen, but don't do it"
+//usage:    IF_FEATURE_IFUPDOWN_MAPPING(
+//usage:     "\n        (note: doesn't disable mappings)"
+//usage:     "\n    -m  Don't run any mappings"
+//usage:    )
+//usage:     "\n    -v  Print out what would happen before doing it"
+//usage:     "\n    -f  Force de/configuration"
+
 #include "libbb.h"
 /* After libbb.h, since it needs sys/types.h on some systems */
@@ -24 +50 @@
 
 #define MAX_OPT_DEPTH 10
-#define EUNBALBRACK 10001
-#define EUNDEFVAR   10002
-#define EUNBALPER   10000
 
 #if ENABLE_FEATURE_IFUPDOWN_MAPPING
@@ -62 +85 @@
     char *script;
 
-    int max_mappings;
     int n_mappings;
     char **mapping;
@@ -77 +99 @@
 
     char *iface;
-    int max_options;
     int n_options;
     struct variable_t *option;
@@ -107 +128 @@
     char **my_environ;
     const char *startup_PATH;
+    char *shell;
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define INIT_G() do { } while (0)
+
+
+static const char keywords_up_down[] ALIGN1 =
+    "up\0"
+    "down\0"
+    "pre-up\0"
+    "post-down\0"
+;
 
 
@@ -201 +231 @@
 {
     size_t old_pos[MAX_OPT_DEPTH] = { 0 };
-    int okay[MAX_OPT_DEPTH] = { 1 };
+    smallint okay[MAX_OPT_DEPTH] = { 1 };
     int opt_depth = 1;
     char *result = NULL;
@@ -212 +242 @@
             break;
         case '\\':
-            if (command[1]) {
-                addstr(&result, command + 1, 1);
-                command += 2;
-            } else {
-                addstr(&result, command, 1);
+            if (command[1])
                 command++;
-            }
+            addstr(&result, command, 1);
+            command++;
             break;
         case '[':
@@ -227 +254 @@
                 command += 2;
             } else {
-                addstr(&result, "[", 1);
+                addstr(&result, command, 1);
                 command++;
             }
@@ -239 +266 @@
                 command += 2;
             } else {
-                addstr(&result, "]", 1);
+                addstr(&result, command, 1);
                 command++;
             }
@@ -251 +278 @@
                 nextpercent = strchr(command, '%');
                 if (!nextpercent) {
-                    errno = EUNBALPER;
+                    /* Unterminated %var% */
                     free(result);
                     return NULL;
@@ -296 +323 @@
 
     if (opt_depth > 1) {
-        errno = EUNBALBRACK;
+        /* Unbalanced bracket */
         free(result);
         return NULL;
@@ -302 +329 @@
 
     if (!okay[0]) {
-        errno = EUNDEFVAR;
+        /* Undefined variable and we aren't in a bracket */
         free(result);
         return NULL;
@@ -369 +396 @@
     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%]]", ifd, exec);
+    result += execute("[[ip route add ::/0 via %gateway%]][[ prio %metric%]]", ifd, exec);
 # else
     result = execute("ifconfig %iface%[[ media %media%]][[ hw %hwaddress%]][[ mtu %mtu%]] up", ifd, exec);
     result += execute("ifconfig %iface% add %address%/%netmask%", ifd, exec);
-    result += execute("[[route -A inet6 add ::/0 gw %gateway%]]", ifd, exec);
+    result += execute("[[route -A inet6 add ::/0 gw %gateway%[[ metric %metric%]]]]", ifd, exec);
 # endif
     return ((result == 3) ? 3 : 0);
@@ -456 +483 @@
             "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%]]", ifd, exec);
+    result += execute("[[ip route add default via %gateway% dev %iface%[[ prio %metric%]]]]", ifd, exec);
     return ((result == 3) ? 3 : 0);
 # else
@@ -466 +493 @@
                 "[[ broadcast %broadcast%]][[ pointopoint %pointopoint%]] ",
                 ifd, exec);
-    result += execute("[[route add default gw %gateway% %iface%]]", ifd, exec);
+    result += execute("[[route add default gw %gateway%[[ metric %metric%]] %iface%]]", ifd, exec);
     return ((result == 3) ? 3 : 0);
 # endif
@@ -777 +804 @@
                 currmap->match[currmap->n_matches++] = xstrdup(first_word);
             }
-            /*currmap->max_mappings = 0; - done by xzalloc */
             /*currmap->n_mappings = 0;*/
             /*currmap->mapping = NULL;*/
@@ -862 +888 @@
                     bb_error_msg_and_die("option with empty value \"%s\"", buf);
 
-                if (strcmp(first_word, "up") != 0
-                 && strcmp(first_word, "down") != 0
-                 && strcmp(first_word, "pre-up") != 0
-                 && strcmp(first_word, "post-down") != 0
-                ) {
+                if (strcmp(first_word, "post-up") == 0)
+                    first_word += 5; /* "up" */
+                else if (strcmp(first_word, "pre-down") == 0)
+                    first_word += 4; /* "down" */
+
+                /* If not one of "up", "down",... words... */
+                if (index_in_strings(keywords_up_down, first_word) < 0) {
                     int i;
                     for (i = 0; i < currif->n_options; i++) {
@@ -873 +901 @@
                     }
                 }
-                if (currif->n_options >= currif->max_options) {
-                    currif->max_options += 10;
-                    currif->option = xrealloc(currif->option,
-                        sizeof(*currif->option) * currif->max_options);
-                }
                 debug_noise("\t%s=%s\n", first_word, rest_of_line);
+                currif->option = xrealloc_vector(currif->option, 4, currif->n_options);
                 currif->option[currif->n_options].name = xstrdup(first_word);
                 currif->option[currif->n_options].value = xstrdup(rest_of_line);
@@ -890 +914 @@
                     currmap->script = xstrdup(next_word(&rest_of_line));
                 } else if (strcmp(first_word, "map") == 0) {
-                    if (currmap->n_mappings >= currmap->max_mappings) {
-                        currmap->max_mappings = currmap->max_mappings * 2 + 1;
-                        currmap->mapping = xrealloc(currmap->mapping,
-                            sizeof(char *) * currmap->max_mappings);
-                    }
+                    currmap->mapping = xrealloc_vector(currmap->mapping, 2, currmap->n_mappings);
                     currmap->mapping[currmap->n_mappings] = xstrdup(next_word(&rest_of_line));
                     currmap->n_mappings++;
@@ -941 +961 @@
 }
 
-static void set_environ(struct interface_defn_t *iface, const char *mode)
+static void set_environ(struct interface_defn_t *iface, const char *mode, const char *opt)
 {
     int i;
@@ -954 +974 @@
 
     /* note: last element will stay NULL: */
-    G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 6));
+    G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 7));
     pp = G.my_environ;
 
     for (i = 0; i < iface->n_options; i++) {
-        if (strcmp(iface->option[i].name, "up") == 0
-         || strcmp(iface->option[i].name, "down") == 0
-         || strcmp(iface->option[i].name, "pre-up") == 0
-         || strcmp(iface->option[i].name, "post-down") == 0
-        ) {
+        if (index_in_strings(keywords_up_down, iface->option[i].name) >= 0) {
             continue;
         }
@@ -972 +988 @@
     *pp++ = setlocalenv("%s=%s", "METHOD", iface->method->name);
     *pp++ = setlocalenv("%s=%s", "MODE", mode);
+    *pp++ = setlocalenv("%s=%s", "PHASE", opt);
     if (G.startup_PATH)
         *pp++ = setlocalenv("%s=%s", "PATH", G.startup_PATH);
@@ -987 +1004 @@
         fflush_all();
         child = vfork();
-        switch (child) {
-        case -1: /* failure */
+        if (child < 0) /* failure */
             return 0;
-        case 0: /* child */
-            execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, (char *) NULL, G.my_environ);
+        if (child == 0) { /* child */
+            execle(G.shell, G.shell, "-c", str, (char *) NULL, G.my_environ);
             _exit(127);
         }
@@ -1027 +1043 @@
 {
     if (!iface->method->up(iface, check)) return -1;
-    set_environ(iface, "start");
+    set_environ(iface, "start", "pre-up");
     if (!execute_all(iface, "pre-up")) return 0;
     if (!iface->method->up(iface, doit)) return 0;
+    set_environ(iface, "start", "post-up");
     if (!execute_all(iface, "up")) return 0;
     return 1;
@@ -1036 +1053 @@
 static int iface_down(struct interface_defn_t *iface)
 {
-    if (!iface->method->down(iface,check)) return -1;
-    set_environ(iface, "stop");
+    if (!iface->method->down(iface, check)) return -1;
+    set_environ(iface, "stop", "pre-down");
     if (!execute_all(iface, "down")) return 0;
     if (!iface->method->down(iface, doit)) return 0;
+    set_environ(iface, "stop", "post-down");
     if (!execute_all(iface, "post-down")) return 0;
     return 1;
@@ -1166 +1184 @@
 
     G.startup_PATH = getenv("PATH");
+    G.shell = xstrdup(get_shell_name());
 
     cmds = iface_down;
@@ -1221 +1240 @@
                 if (iface_state) {
                     bb_error_msg("interface %s already configured", iface);
-                    continue;
+                    goto next;
                 }
             } else {
@@ -1227 +1246 @@
                 if (!iface_state) {
                     bb_error_msg("interface %s not configured", iface);
-                    continue;
+                    goto next;
                 }
             }
@@ -1291 +1310 @@
             llist_t *iface_state = find_iface_state(state_list, iface);
 
-            if (cmds == iface_up) {
-                char * const newiface = xasprintf("%s=%s", iface, liface);
-                if (iface_state == NULL) {
+            if (cmds == iface_up && !any_failures) {
+                char *newiface = xasprintf("%s=%s", iface, liface);
+                if (!iface_state) {
                     llist_add_to_end(&state_list, newiface);
                 } else {
@@ -1317 +1336 @@
             llist_free(state_list, free);
         }
+ next:
+        free(iface);
+        free(liface);
     }