In Bug 78, shortkey points out:

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

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 5d74422537b22dd3f89ec14774a3f86919c8021a..1842be58bcac02c1a7233601796472dda49ec0ef 100644 (file)
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -27,6 +27,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+/* TODO: standardise execute() return codes to return 0 for success and 1 for failure */
+
 #include <sys/stat.h>
 #include <sys/utsname.h>
 #include <sys/wait.h>
@@ -347,6 +349,9 @@ static int execute(char *command, struct interface_defn_t *ifd, execfn *exec)
        ret = (*exec) (out);
 
        free(out);
+       if (ret != 1) {
+               return(0);
+       }
        return(1);
 }
 
@@ -390,7 +395,7 @@ static int loopback_up6(struct interface_defn_t *ifd, execfn *exec)
        int result;
        result =execute("ip addr add ::1 dev %iface%", ifd, exec);
        result += execute("ip link set %iface% up", ifd, exec);
-       return( result);
+       return ((result == 2) ? 2 : 0);
 #else
        return( execute("ifconfig %iface% add ::1", ifd, exec));
 #endif
@@ -417,7 +422,7 @@ static int static_up6(struct interface_defn_t *ifd, execfn *exec)
        result += execute("ifconfig %iface% add %address%/%netmask%", ifd, exec);
        result += execute("[[ route -A inet6 add ::/0 gw %gateway% ]]", ifd, exec);
 #endif
-       return( result);
+       return ((result == 3) ? 3 : 0);
 }
 
 static int static_down6(struct interface_defn_t *ifd, execfn *exec)
@@ -438,7 +443,7 @@ static int v4tunnel_up(struct interface_defn_t *ifd, execfn *exec)
        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);
-       return( result);
+       return ((result == 4) ? 4 : 0);
 }
 
 static int v4tunnel_down(struct interface_defn_t * ifd, execfn * exec)
@@ -469,7 +474,7 @@ static int loopback_up(struct interface_defn_t *ifd, execfn *exec)
        int result;
        result = execute("ip addr add 127.0.0.1/8 dev %iface%", ifd, exec);
        result += execute("ip link set %iface% up", ifd, exec);
-       return(result);
+       return ((result == 2) ? 2 : 0);
 #else
        return( execute("ifconfig %iface% 127.0.0.1 up", ifd, exec));
 #endif
@@ -481,7 +486,7 @@ static int loopback_down(struct interface_defn_t *ifd, execfn *exec)
        int result;
        result = execute("ip addr flush dev %iface%", ifd, exec);
        result += execute("ip link set %iface% down", ifd, exec);
-       return(result);
+       return ((result == 2) ? 2 : 0);
 #else
        return( execute("ifconfig %iface% 127.0.0.1 down", ifd, exec));
 #endif
@@ -495,14 +500,15 @@ static int static_up(struct interface_defn_t *ifd, execfn *exec)
                        "dev %iface% [[peer %pointopoint%]] [[label %label%]]", ifd, exec);
        result += execute("ip link set [[mtu %mtu%]] [[address %hwaddress%]] %iface% up", ifd, exec);
        result += execute("[[ ip route add default via %gateway% dev %iface% ]]", ifd, exec);
+       return ((result == 3) ? 3 : 0);
 #else
        result = execute("ifconfig %iface% %address% netmask %netmask% "
                                "[[broadcast %broadcast%]]      [[pointopoint %pointopoint%]] "
                                "[[media %media%]] [[mtu %mtu%]]        [[hw %hwaddress%]] up",
                                ifd, exec);
        result += execute("[[ route add default gw %gateway% %iface% ]]", ifd, exec);
+       return ((result == 2) ? 2 : 0);
 #endif
-       return(result);
 }
 
 static int static_down(struct interface_defn_t *ifd, execfn *exec)
@@ -515,7 +521,7 @@ static int static_down(struct interface_defn_t *ifd, execfn *exec)
        result = execute("[[ route del default gw %gateway% %iface% ]]", ifd, exec);
        result += execute("ifconfig %iface% down", ifd, exec);
 #endif
-       return(result);
+       return ((result == 2) ? 2 : 0);
 }
 
 static int execable(char *program)
@@ -545,28 +551,23 @@ static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
        return(0);
 }
 
-static int bootp_down(struct interface_defn_t *ifd, execfn *exec)
-{
-#ifdef CONFIG_FEATURE_IFUPDOWN_IP
-       return(execute("ip link set %iface% down", ifd, exec));
-#else
-       return(execute("ifconfig %iface% down", ifd, exec));
-#endif
-}
-
 static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
 {
        int result = 0;
        if (execable("/sbin/udhcpc")) {
-               execute("kill -9 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
+               /* 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 */
+               result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
+               result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
        } else if (execable("/sbin/pump")) {
                result = execute("pump -i %iface% -k", ifd, exec);
        } else if (execable("/sbin/dhclient")) {
-               execute("kill -9 `cat /var/run/dhclient.%iface%.pid` 2>/dev/null", ifd, exec);
+               result = execute("kill -9 `cat /var/run/dhclient.%iface%.pid` 2>/dev/null", ifd, exec);
        } else if (execable("/sbin/dhcpcd")) {
                result = execute("dhcpcd -k %iface%", ifd, exec);
        }
-       return (result || bootp_down(ifd, exec));
+       return (result || static_down(ifd, exec));
 }
 
 static int bootp_up(struct interface_defn_t *ifd, execfn *exec)
@@ -603,7 +604,7 @@ static struct method_t methods[] =
        { "wvdial", wvdial_up, wvdial_down, },
        { "ppp", ppp_up, ppp_down, },
        { "static", static_up, static_down, },
-       { "bootp", bootp_up, bootp_down, },
+       { "bootp", bootp_up, static_down, },
        { "dhcp", dhcp_up, dhcp_down, },
        { "loopback", loopback_up, loopback_down, },
 };
@@ -698,7 +699,7 @@ static const llist_t *find_list_string(const llist_t *list, const char *string)
        return(NULL);
 }
 
-static struct interfaces_file_t *read_interfaces(char *filename)
+static struct interfaces_file_t *read_interfaces(const char *filename)
 {
 #ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
        struct mapping_defn_t *currmap = NULL;
@@ -1033,9 +1034,10 @@ static int execute_all(struct interface_defn_t *ifd, execfn *exec, const char *o
        }
 
        bb_xasprintf(&buf, "run-parts /etc/network/if-%s.d", opt);
-       (*exec)(buf);
-
-       return (1);
+       if ((*exec)(buf) != 1) {
+               return 0;
+       }
+       return 1;
 }
 
 static int check(char *str) {
@@ -1116,7 +1118,7 @@ static int popen2(FILE **in, FILE **out, char *command, ...)
        /* unreached */
 }
 
-static char * run_mapping(char *physical, struct mapping_defn_t * map)
+static char *run_mapping(char *physical, struct mapping_defn_t * map)
 {
        FILE *in, *out;
        int i, status;
@@ -1190,7 +1192,7 @@ extern int ifupdown_main(int argc, char **argv)
        FILE *state_fp = NULL;
        llist_t *state_list = NULL;
        llist_t *target_list = NULL;
-       char *interfaces = "/etc/network/interfaces";
+       const char *interfaces = "/etc/network/interfaces";
        const char *statefile = "/var/run/ifstate";
 
 #ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
@@ -1198,6 +1200,7 @@ extern int ifupdown_main(int argc, char **argv)
 #endif
        int do_all = 0;
        int force = 0;
+       int any_failures = 0;
        int i;
 
        if (bb_applet_name[2] == 'u') {
@@ -1216,7 +1219,7 @@ extern int ifupdown_main(int argc, char **argv)
                {
                        switch (i) {
                                case 'i':       /* interfaces */
-                                       interfaces = bb_xstrdup(optarg);
+                                       interfaces = optarg;
                                        break;
                                case 'v':       /* verbose */
                                        verbose = 1;
@@ -1312,6 +1315,7 @@ extern int ifupdown_main(int argc, char **argv)
                char *liface;
                char *pch;
                int okay = 0;
+               int cmds_ret;
 
                iface = strdup(target_list->data);
                target_list = target_list->link;
@@ -1374,9 +1378,13 @@ extern int ifupdown_main(int argc, char **argv)
                                debug_noise("\nConfiguring interface %s (%s)\n", liface, currif->address_family->name);
 
                                /* Call the cmds function pointer, does either iface_up() or iface_down() */
-                               if (cmds(currif) == -1) {
+                               cmds_ret = cmds(currif);
+                               if (cmds_ret == -1) {
                                        bb_error_msg("Don't seem to have all the variables for %s/%s.",
                                                        liface, currif->address_family->name);
+                                       any_failures += 1;
+                               } else if (cmds_ret == 0) {
+                                       any_failures += 1;
                                }
 
                                currif->iface = oldiface;
@@ -1389,6 +1397,7 @@ extern int ifupdown_main(int argc, char **argv)
 
                if (!okay && !force) {
                        bb_error_msg("Ignoring unknown interface %s", liface);
+                       any_failures += 1;
                } else {
                        llist_t *iface_state = find_iface_state(state_list, iface);
 
@@ -1448,5 +1457,7 @@ extern int ifupdown_main(int argc, char **argv)
                state_fp = NULL;
        }
 
+       if (any_failures)
+               return 1;
        return 0;
 }