wget: don't be careless with xstrdup'ing

[oweals/busybox.git] / networking / ifupdown.c

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index fae0684b59f27914b05cc7bae323b6ddb8fd4858..f572b487d265541893e6375bcc0dabf8b95066a1 100644 (file)
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -89,7 +89,6 @@ struct interfaces_file_t
        struct mapping_defn_t *mappings;
 };
 
-static unsigned option_mask;
 #define OPTION_STR "anvf" USE_FEATURE_IFUPDOWN_MAPPING("m") "i:"
 enum {
        OPT_do_all = 0x1,
@@ -98,11 +97,11 @@ enum {
        OPT_force = 0x8,
        OPT_no_mappings = 0x10,
 };
-#define DO_ALL (option_mask & OPT_do_all)
-#define NO_ACT (option_mask & OPT_no_act)
-#define VERBOSE (option_mask & OPT_verbose)
-#define FORCE (option_mask & OPT_force)
-#define NO_MAPPINGS (option_mask & OPT_no_mappings)
+#define DO_ALL (option_mask32 & OPT_do_all)
+#define NO_ACT (option_mask32 & OPT_no_act)
+#define VERBOSE (option_mask32 & OPT_verbose)
+#define FORCE (option_mask32 & OPT_force)
+#define NO_MAPPINGS (option_mask32 & OPT_no_mappings)
 
 static char **__myenviron;
 
@@ -452,45 +451,48 @@ static int static_down(struct interface_defn_t *ifd, execfn *exec)
 
 static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
 {
-       int i;
+       if (execute("udhcpc -R -n -p /var/run/udhcpc.%iface%.pid -i %iface% "
+                       "[[-H %hostname%]] [[-c %clientid%]] [[-s %script%]]", ifd, exec))
+               return 1;
 
-       for (i = 0; i < ifd->n_options; i++) {
-               if (strcmp(ifd->option[i].name, "dhcp-start-cmd") == 0) {
-                       return execute(ifd->option[i].value, ifd, exec);
-               }
-       }
+       /* 2006-09-30: The following are deprecated, and should eventually be
+        * removed. For non-busybox (i.e., other than udhcpc) clients, use
+        * 'iface foo inet manual' in /etc/network/interfaces, and supply
+        * start/stop commands explicitly via up/down. */
 
-       if (execute("udhcpc -n -p /var/run/udhcpc.%iface%.pid -i "
-                       "%iface% [[-H %hostname%]] [[-c %clientid%]]", ifd, exec)) return 1;
-       if (execute("pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]", ifd, exec)) return 1;
-       if (execute("dhclient -pf /var/run/dhclient.%iface%.pid %iface%", ifd, exec)) return 1;
+       if (execute("pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]",
+                       ifd, exec)) return 1;
+       if (execute("dhclient -pf /var/run/dhclient.%iface%.pid %iface%",
+                       ifd, exec)) return 1;
        if (execute("dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] "
                        "[[-l %leasetime%]] %iface%", ifd, exec)) return 1;
+
        return 0;
 }
 
 static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
 {
-       int i;
+       if (execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
+                       ifd, exec)) return 1;
 
-       for (i = 0; i < ifd->n_options; i++) {
-               if (strcmp(ifd->option[i].name, "dhcp-stop-cmd") == 0) {
-                       return execute(ifd->option[i].value, ifd, exec);
-               }
-       }
+       /* 2006-09-30: The following are deprecated, and should eventually be
+        * removed. For non-busybox (i.e., other than udhcpc) clients, use
+        * 'iface foo inet manual' in /etc/network/interfaces, and supply
+        * start/stop commands explicitly via up/down. */
 
-       /* SIGUSR2 forces udhcpc to release the current lease and go inactive,
-        * and SIGTERM causes udhcpc to exit.  Signals are queued and processed
-        * sequentially so we don't need to sleep */
-       if (execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec)
-        || execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec))
-               return 1;
        if (execute("pump -i %iface% -k", ifd, exec)) return 1;
-       if (execute("kill -9 `cat /var/run/dhclient.%iface%.pid` 2>/dev/null", ifd, exec)) return 1;
+       if (execute("kill -9 `cat /var/run/dhclient.%iface%.pid` 2>/dev/null",
+                       ifd, exec)) return 1;
        if (execute("dhcpcd -k %iface%", ifd, exec)) return 1;
+
        return static_down(ifd, exec);
 }
 
+static int manual_up_down(struct interface_defn_t *ifd, execfn *exec)
+{
+       return 1;
+}
+
 static int bootp_up(struct interface_defn_t *ifd, execfn *exec)
 {
        return execute("bootpc [[--bootfile %bootfile%]] --dev %iface% "
@@ -521,6 +523,7 @@ static int wvdial_down(struct interface_defn_t *ifd, execfn *exec)
 }
 
 static const struct method_t methods[] = {
+       { "manual", manual_up_down, manual_up_down, },
        { "wvdial", wvdial_up, wvdial_down, },
        { "ppp", ppp_up, ppp_down, },
        { "static", static_up, static_down, },
@@ -877,10 +880,10 @@ static void set_environ(struct interface_defn_t *iface, const char *mode)
 
 static int doit(char *str)
 {
-       if (option_mask & (OPT_no_act|OPT_verbose)) {
+       if (option_mask32 & (OPT_no_act|OPT_verbose)) {
                puts(str);
        }
-       if (!(option_mask & OPT_no_act)) {
+       if (!(option_mask32 & OPT_no_act)) {
                pid_t child;
                int status;
 
@@ -1076,7 +1079,7 @@ int ifupdown_main(int argc, char **argv)
        int any_failures = 0;
        int i;
 
-       if (bb_applet_name[2] == 'u') {
+       if (applet_name[2] == 'u') {
                /* ifup command */
                cmds = iface_up;
        } else {
@@ -1084,7 +1087,7 @@ int ifupdown_main(int argc, char **argv)
                cmds = iface_down;
        }
 
-       option_mask = bb_getopt_ulflags(argc, argv, OPTION_STR, &interfaces);
+       getopt32(argc, argv, OPTION_STR, &interfaces);
        if (argc - optind > 0) {
                if (DO_ALL) bb_show_usage();
        } else