ifupdown: stop emitting annoying/misleading error messages.

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

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 6334cbc43fc73a094088931ac5dc50fe5ab3aa5a..c1dc1d35d32c20bd6cd263099a425f23bf6093fd 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;
 
@@ -134,7 +133,7 @@ static int count_netmask_bits(char *dotted_quad)
 }
 #endif
 
-static void addstr(char **buf, size_t *len, size_t *pos, char *str, size_t str_length)
+static void addstr(char **buf, size_t *len, size_t *pos, const char *str, size_t str_length)
 {
        if (*pos + str_length >= *len) {
                char *newbuf;
@@ -151,7 +150,7 @@ static void addstr(char **buf, size_t *len, size_t *pos, char *str, size_t str_l
        (*buf)[*pos] = '\0';
 }
 
-static int strncmpz(char *l, char *r, size_t llen)
+static int strncmpz(const char *l, const char *r, size_t llen)
 {
        int i = strncmp(l, r, llen);
 
@@ -162,7 +161,7 @@ static int strncmpz(char *l, char *r, size_t llen)
        }
 }
 
-static char *get_var(char *id, size_t idlen, struct interface_defn_t *ifd)
+static char *get_var(const char *id, size_t idlen, struct interface_defn_t *ifd)
 {
        int i;
 
@@ -189,7 +188,7 @@ static char *get_var(char *id, size_t idlen, struct interface_defn_t *ifd)
        return NULL;
 }
 
-static char *parse(char *command, struct interface_defn_t *ifd)
+static char *parse(const char *command, struct interface_defn_t *ifd)
 {
 
        char *result = NULL;
@@ -295,7 +294,7 @@ static char *parse(char *command, struct interface_defn_t *ifd)
 }
 
 /* execute() returns 1 for success and 0 for failure */
-static int execute(char *command, struct interface_defn_t *ifd, execfn *exec)
+static int execute(const char *command, struct interface_defn_t *ifd, execfn *exec)
 {
        char *out;
        int ret;
@@ -450,43 +449,65 @@ static int static_down(struct interface_defn_t *ifd, execfn *exec)
        return ((result == 2) ? 2 : 0);
 }
 
-static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
+#ifndef CONFIG_APP_UDHCPC
+struct dhcp_client_t
 {
-       if (execute("udhcpc -R -n -p /var/run/udhcpc.%iface%.pid -i %iface% "
-                       "[[-H %hostname%]] [[-c %clientid%]] [[-s %script%]]", ifd, exec))
-               return 1;
-
-       /* 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. */
+       const char *name;
+       const char *startcmd;
+       const char *stopcmd;
+};
 
-       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;
+static const struct dhcp_client_t ext_dhcp_clients[] = {
+       { "udhcpc",
+               "udhcpc -R -n -p /var/run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] [[-c %clientid%]] [[-s %script%]]",
+               "kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
+       },
+       { "pump",
+               "pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]",
+               "pump -i %iface% -k",
+       },
+       { "dhclient",
+               "dhclient -pf /var/run/dhclient.%iface%.pid %iface%",
+               "kill -9 `cat /var/run/dhclient.%iface%.pid` 2>/dev/null",
+       },
+       { "dhcpcd",
+               "dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] [[-l %leasetime%]] %iface%",
+               "dhcpcd -k %iface%",
+       },
+};
+#endif
 
+static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
+{
+#ifdef CONFIG_APP_UDHCPC
+       return execute("udhcpc -R -n -p /var/run/udhcpc.%iface%.pid "
+                       "-i %iface% [[-H %hostname%]] [[-c %clientid%]] [[-s %script%]]",
+                       ifd, exec);
+#else
+       int i, nclients = sizeof(ext_dhcp_clients) / sizeof(ext_dhcp_clients[0]);
+       for (i = 0; i < nclients; i++) {
+               if (exists_execable(ext_dhcp_clients[i].name))
+                       return execute(ext_dhcp_clients[i].startcmd, ifd, exec);
+       }
+       bb_error_msg("no dhcp clients found");
        return 0;
+#endif
 }
 
 static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
 {
-       if (execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
-                       ifd, exec)) return 1;
-
-       /* 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("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("dhcpcd -k %iface%", ifd, exec)) return 1;
-
+#ifdef CONFIG_APP_UDHCPC
+       return execute("kill -TERM "
+                      "`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
+#else
+       int i, nclients = sizeof(ext_dhcp_clients) / sizeof(ext_dhcp_clients[0]);
+       for (i = 0; i < nclients; i++) {
+               if (exists_execable(ext_dhcp_clients[i].name))
+                       return execute(ext_dhcp_clients[i].stopcmd, ifd, exec);
+       }
+       bb_error_msg("no dhcp clients found, using static interface shutdown");
        return static_down(ifd, exec);
+#endif
 }
 
 static int manual_up_down(struct interface_defn_t *ifd, execfn *exec)
@@ -881,10 +902,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;
 
@@ -1088,7 +1109,7 @@ int ifupdown_main(int argc, char **argv)
                cmds = iface_down;
        }
 
-       option_mask = getopt32(argc, argv, OPTION_STR, &interfaces);
+       getopt32(argc, argv, OPTION_STR, &interfaces);
        if (argc - optind > 0) {
                if (DO_ALL) bb_show_usage();
        } else