X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fifupdown.c;h=d28c0b86771583cf7bb60f956e2805fa2d746f7b;hb=d7171c114028815df4e92f9c26875f1d60c6af2a;hp=a794bf76afc6f83a3303f99c9b44ad57dcb1f5cb;hpb=cd5c61cd3b9bcca6afd30d6117d2d2e1791a7375;p=oweals%2Fbusybox.git diff --git a/networking/ifupdown.c b/networking/ifupdown.c index a794bf76a..d28c0b867 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c @@ -17,11 +17,10 @@ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ +#include "libbb.h" +/* After libbb.h, since it needs sys/types.h on some systems */ #include #include -#include - -#include "libbb.h" #define MAX_OPT_DEPTH 10 #define EUNBALBRACK 10001 @@ -32,6 +31,8 @@ #define MAX_INTERFACE_LENGTH 10 #endif +#define UDHCPC_CMD_OPTIONS CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS + #define debug_noise(args...) /*fprintf(stderr, args)*/ /* Forward declaration */ @@ -41,8 +42,8 @@ typedef int execfn(char *command); struct method_t { const char *name; - int (*up)(struct interface_defn_t *ifd, execfn *e); - int (*down)(struct interface_defn_t *ifd, execfn *e); + int (*up)(struct interface_defn_t *ifd, execfn *e) FAST_FUNC; + int (*down)(struct interface_defn_t *ifd, execfn *e) FAST_FUNC; }; struct address_family_t { @@ -86,23 +87,29 @@ struct interfaces_file_t { struct mapping_defn_t *mappings; }; -#define OPTION_STR "anvf" USE_FEATURE_IFUPDOWN_MAPPING("m") "i:" + +#define OPTION_STR "anvf" IF_FEATURE_IFUPDOWN_MAPPING("m") "i:" enum { - OPT_do_all = 0x1, - OPT_no_act = 0x2, - OPT_verbose = 0x4, - OPT_force = 0x8, + OPT_do_all = 0x1, + OPT_no_act = 0x2, + OPT_verbose = 0x4, + OPT_force = 0x8, OPT_no_mappings = 0x10, }; -#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 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 **my_environ; -static const char *startup_PATH; +struct globals { + char **my_environ; + const char *startup_PATH; +}; +#define G (*(struct globals*)&bb_common_bufsiz1) +#define INIT_G() do { } while (0) + #if ENABLE_FEATURE_IFUPDOWN_IPV4 || ENABLE_FEATURE_IFUPDOWN_IPV6 @@ -125,7 +132,7 @@ static int strncmpz(const char *l, const char *r, size_t llen) int i = strncmp(l, r, llen); if (i == 0) - return -r[llen]; + return - (unsigned char)r[llen]; return i; } @@ -134,16 +141,17 @@ static char *get_var(const char *id, size_t idlen, struct interface_defn_t *ifd) int i; if (strncmpz(id, "iface", idlen) == 0) { - static char *label_buf; + // ubuntu's ifup doesn't do this: + //static char *label_buf; //char *result; - - free(label_buf); - label_buf = xstrdup(ifd->iface); - // Remove virtual iface suffix - why? - // ubuntu's ifup doesn't do this + //free(label_buf); + //label_buf = xstrdup(ifd->iface); + // Remove virtual iface suffix //result = strchrnul(label_buf, ':'); //*result = '\0'; - return label_buf; + //return label_buf; + + return ifd->iface; } if (strncmpz(id, "label", idlen) == 0) { return ifd->iface; @@ -250,6 +258,14 @@ static char *parse(const char *command, struct interface_defn_t *ifd) varvalue = get_var(command, nextpercent - command, ifd); if (varvalue) { +#if ENABLE_FEATURE_IFUPDOWN_IP + /* "hwaddress
": + * unlike ifconfig, ip doesnt want + * (usually "ether" keyword). Skip it. */ + if (strncmp(command, "hwaddress", 9) == 0) { + varvalue = skip_whitespace(skip_non_whitespace(varvalue)); + } +#endif addstr(&result, varvalue, strlen(varvalue)); } else { #if ENABLE_FEATURE_IFUPDOWN_IP @@ -316,7 +332,7 @@ static int execute(const char *command, struct interface_defn_t *ifd, execfn *ex #endif #if ENABLE_FEATURE_IFUPDOWN_IPV6 -static int loopback_up6(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC loopback_up6(struct interface_defn_t *ifd, execfn *exec) { #if ENABLE_FEATURE_IFUPDOWN_IP int result; @@ -328,7 +344,7 @@ static int loopback_up6(struct interface_defn_t *ifd, execfn *exec) #endif } -static int loopback_down6(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC loopback_down6(struct interface_defn_t *ifd, execfn *exec) { #if ENABLE_FEATURE_IFUPDOWN_IP return execute("ip link set %iface% down", ifd, exec); @@ -337,12 +353,12 @@ static int loopback_down6(struct interface_defn_t *ifd, execfn *exec) #endif } -static int static_up6(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec) { int result; #if ENABLE_FEATURE_IFUPDOWN_IP result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec); - result += execute("ip link set[[ mtu %mtu%]][[ address %hwaddress%]] %iface% up", 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%]]", ifd, exec); #else @@ -353,7 +369,7 @@ static int static_up6(struct interface_defn_t *ifd, execfn *exec) return ((result == 3) ? 3 : 0); } -static int static_down6(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC static_down6(struct interface_defn_t *ifd, execfn *exec) { #if ENABLE_FEATURE_IFUPDOWN_IP return execute("ip link set %iface% down", ifd, exec); @@ -363,7 +379,7 @@ static int static_down6(struct interface_defn_t *ifd, execfn *exec) } #if ENABLE_FEATURE_IFUPDOWN_IP -static int v4tunnel_up(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC v4tunnel_up(struct interface_defn_t *ifd, execfn *exec) { int result; result = execute("ip tunnel add %iface% mode sit remote " @@ -374,7 +390,7 @@ static int v4tunnel_up(struct interface_defn_t *ifd, execfn *exec) return ((result == 4) ? 4 : 0); } -static int v4tunnel_down(struct interface_defn_t * ifd, execfn * exec) +static int FAST_FUNC v4tunnel_down(struct interface_defn_t * ifd, execfn * exec) { return execute("ip tunnel del %iface%", ifd, exec); } @@ -396,7 +412,7 @@ static const struct address_family_t addr_inet6 = { #endif /* FEATURE_IFUPDOWN_IPV6 */ #if ENABLE_FEATURE_IFUPDOWN_IPV4 -static int loopback_up(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC loopback_up(struct interface_defn_t *ifd, execfn *exec) { #if ENABLE_FEATURE_IFUPDOWN_IP int result; @@ -408,7 +424,7 @@ static int loopback_up(struct interface_defn_t *ifd, execfn *exec) #endif } -static int loopback_down(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC loopback_down(struct interface_defn_t *ifd, execfn *exec) { #if ENABLE_FEATURE_IFUPDOWN_IP int result; @@ -420,13 +436,13 @@ static int loopback_down(struct interface_defn_t *ifd, execfn *exec) #endif } -static int static_up(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec) { int result; #if ENABLE_FEATURE_IFUPDOWN_IP result = execute("ip addr add %address%/%bnmask%[[ broadcast %broadcast%]] " "dev %iface%[[ peer %pointopoint%]][[ label %label%]]", ifd, exec); - result += execute("ip link set[[ mtu %mtu%]][[ address %hwaddress%]] %iface% up", 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); return ((result == 3) ? 3 : 0); #else @@ -442,22 +458,24 @@ static int static_up(struct interface_defn_t *ifd, execfn *exec) #endif } -static int static_down(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC static_down(struct interface_defn_t *ifd, execfn *exec) { int result; #if ENABLE_FEATURE_IFUPDOWN_IP result = execute("ip addr flush dev %iface%", ifd, exec); result += execute("ip link set %iface% down", ifd, exec); #else - result = execute("[[route del default gw %gateway% %iface%]]", ifd, exec); + /* result = execute("[[route del default gw %gateway% %iface%]]", ifd, exec); */ + /* Bringing the interface down deletes the routes in itself. + Otherwise this fails if we reference 'gateway' when using this from dhcp_down */ + result = 1; result += execute("ifconfig %iface% down", ifd, exec); #endif return ((result == 2) ? 2 : 0); } #if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP -struct dhcp_client_t -{ +struct dhcp_client_t { const char *name; const char *startcmd; const char *stopcmd; @@ -477,19 +495,24 @@ static const struct dhcp_client_t ext_dhcp_clients[] = { "pump -i %iface% -k", }, { "udhcpc", - "udhcpc -R -n -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s %script%]]", + "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %clientid%]]" + "[[ -s %script%]][[ %udhcpc_opts%]]", "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", }, }; #endif /* ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCPC */ -static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) -{ #if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP - int i; +static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec) +{ + unsigned i; #if ENABLE_FEATURE_IFUPDOWN_IP /* ip doesn't up iface when it configures it (unlike ifconfig) */ - if (!execute("ip link set %iface% up", ifd, exec)) + if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec)) + return 0; +#else + /* needed if we have hwaddress on dhcp iface */ + if (!execute("ifconfig %iface%[[ hw %hwaddress%]] up", ifd, exec)) return 0; #endif for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) { @@ -498,80 +521,119 @@ static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) } bb_error_msg("no dhcp clients found"); return 0; -#elif ENABLE_APP_UDHCPC +} +#elif ENABLE_UDHCPC +static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec) +{ #if ENABLE_FEATURE_IFUPDOWN_IP /* ip doesn't up iface when it configures it (unlike ifconfig) */ - if (!execute("ip link set %iface% up", ifd, exec)) + if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec)) + return 0; +#else + /* needed if we have hwaddress on dhcp iface */ + if (!execute("ifconfig %iface%[[ hw %hwaddress%]] up", ifd, exec)) return 0; #endif - return execute("udhcpc -R -n -p /var/run/udhcpc.%iface%.pid " - "-i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s %script%]]", + return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid " + "-i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s %script%]][[ %udhcpc_opts%]]", ifd, exec); +} #else +static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd UNUSED_PARAM, + execfn *exec UNUSED_PARAM) +{ return 0; /* no dhcp support */ -#endif } +#endif -static int dhcp_down(struct interface_defn_t *ifd, execfn *exec) -{ #if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP - int i; +static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec) +{ + int result = 0; + unsigned i; + for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) { - if (exists_execable(ext_dhcp_clients[i].name)) - return execute(ext_dhcp_clients[i].stopcmd, ifd, exec); + if (exists_execable(ext_dhcp_clients[i].name)) { + result = execute(ext_dhcp_clients[i].stopcmd, ifd, exec); + if (result) + break; + } } - bb_error_msg("no dhcp clients found, using static interface shutdown"); - return static_down(ifd, exec); -#elif ENABLE_APP_UDHCPC - return execute("kill " + + if (!result) + bb_error_msg("warning: no dhcp clients found and stopped"); + + /* Sleep a bit, otherwise static_down tries to bring down interface too soon, + and it may come back up because udhcpc is still shutting down */ + usleep(100000); + result += static_down(ifd, exec); + return ((result == 3) ? 3 : 0); +} +#elif ENABLE_UDHCPC +static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec) +{ + int result; + result = execute("kill " "`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); + /* Also bring the hardware interface down since + killing the dhcp client alone doesn't do it. + This enables consecutive ifup->ifdown->ifup */ + /* Sleep a bit, otherwise static_down tries to bring down interface too soon, + and it may come back up because udhcpc is still shutting down */ + usleep(100000); + result += static_down(ifd, exec); + return ((result == 3) ? 3 : 0); +} #else +static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd UNUSED_PARAM, + execfn *exec UNUSED_PARAM) +{ return 0; /* no dhcp support */ -#endif } +#endif -static int manual_up_down(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC manual_up_down(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM) { return 1; } -static int bootp_up(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC bootp_up(struct interface_defn_t *ifd, execfn *exec) { return execute("bootpc[[ --bootfile %bootfile%]] --dev %iface%" "[[ --server %server%]][[ --hwaddr %hwaddr%]]" " --returniffail --serverbcast", ifd, exec); } -static int ppp_up(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC ppp_up(struct interface_defn_t *ifd, execfn *exec) { return execute("pon[[ %provider%]]", ifd, exec); } -static int ppp_down(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC ppp_down(struct interface_defn_t *ifd, execfn *exec) { return execute("poff[[ %provider%]]", ifd, exec); } -static int wvdial_up(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC wvdial_up(struct interface_defn_t *ifd, execfn *exec) { return execute("start-stop-daemon --start -x wvdial " "-p /var/run/wvdial.%iface% -b -m --[[ %provider%]]", ifd, exec); } -static int wvdial_down(struct interface_defn_t *ifd, execfn *exec) +static int FAST_FUNC wvdial_down(struct interface_defn_t *ifd, execfn *exec) { return execute("start-stop-daemon --stop -x wvdial " "-p /var/run/wvdial.%iface% -s 2", ifd, 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, }, - { "bootp", bootp_up, static_down, }, - { "dhcp", dhcp_up, dhcp_down, }, - { "loopback", loopback_up, loopback_down, }, + { "manual" , manual_up_down, manual_up_down, }, + { "wvdial" , wvdial_up , wvdial_down , }, + { "ppp" , ppp_up , ppp_down , }, + { "static" , static_up , static_down , }, + { "bootp" , bootp_up , static_down , }, + { "dhcp" , dhcp_up , dhcp_down , }, + { "loopback", loopback_up , loopback_down , }, }; static const struct address_family_t addr_inet = { @@ -582,6 +644,9 @@ static const struct address_family_t addr_inet = { #endif /* if ENABLE_FEATURE_IFUPDOWN_IPV4 */ +/* Returns pointer to the next word, or NULL. + * In 1st case, advances *buf to the word after this one. + */ static char *next_word(char **buf) { unsigned length; @@ -590,8 +655,8 @@ static char *next_word(char **buf) /* Skip over leading whitespace */ word = skip_whitespace(*buf); - /* Stop on EOL/comments */ - if (*word == '#' || *word == '\0') + /* Stop on EOL */ + if (*word == '\0') return NULL; /* Find the length of this word (can't be 0) */ @@ -601,7 +666,7 @@ static char *next_word(char **buf) if (word[length] != '\0') word[length++] = '\0'; - *buf = word + length; + *buf = skip_whitespace(word + length); return word; } @@ -636,56 +701,65 @@ static const struct method_t *get_method(const struct address_family_t *af, char return NULL; } -static const llist_t *find_list_string(const llist_t *list, const char *string) -{ - if (string == NULL) - return NULL; - - while (list) { - if (strcmp(list->data, string) == 0) { - return list; - } - list = list->link; - } - return NULL; -} - static struct interfaces_file_t *read_interfaces(const char *filename) { + /* Let's try to be compatible. + * + * "man 5 interfaces" says: + * Lines starting with "#" are ignored. Note that end-of-line + * comments are NOT supported, comments must be on a line of their own. + * A line may be extended across multiple lines by making + * the last character a backslash. + * + * Seen elsewhere in example config file: + * A first non-blank "#" character makes the rest of the line + * be ignored. Blank lines are ignored. Lines may be indented freely. + * A "\" character at the very end of the line indicates the next line + * should be treated as a continuation of the current one. + */ #if ENABLE_FEATURE_IFUPDOWN_MAPPING struct mapping_defn_t *currmap = NULL; #endif struct interface_defn_t *currif = NULL; struct interfaces_file_t *defn; FILE *f; - char *firstword; char *buf; - + char *first_word; + char *rest_of_line; enum { NONE, IFACE, MAPPING } currently_processing = NONE; - defn = xzalloc(sizeof(struct interfaces_file_t)); - - f = xfopen(filename, "r"); - - while ((buf = xmalloc_getline(f)) != NULL) { - char *buf_ptr = buf; - - firstword = next_word(&buf_ptr); - if (firstword == NULL) { + defn = xzalloc(sizeof(*defn)); + f = xfopen_for_read(filename); + + while ((buf = xmalloc_fgetline(f)) != NULL) { +#if ENABLE_DESKTOP + /* Trailing "\" concatenates lines */ + char *p; + while ((p = last_char_is(buf, '\\')) != NULL) { + *p = '\0'; + rest_of_line = xmalloc_fgetline(f); + if (!rest_of_line) + break; + p = xasprintf("%s%s", buf, rest_of_line); free(buf); - continue; /* blank line */ + free(rest_of_line); + buf = p; + } +#endif + rest_of_line = buf; + first_word = next_word(&rest_of_line); + if (!first_word || *first_word == '#') { + free(buf); + continue; /* blank/comment line */ } - if (strcmp(firstword, "mapping") == 0) { + if (strcmp(first_word, "mapping") == 0) { #if ENABLE_FEATURE_IFUPDOWN_MAPPING currmap = xzalloc(sizeof(*currmap)); - while ((firstword = next_word(&buf_ptr)) != NULL) { - if (currmap->n_matches >= currmap->max_matches) { - currmap->max_matches = currmap->max_matches * 2 + 1; - currmap->match = xrealloc(currmap->match, sizeof(*currmap->match) * currmap->max_matches); - } - currmap->match[currmap->n_matches++] = xstrdup(firstword); + while ((first_word = next_word(&rest_of_line)) != NULL) { + currmap->match = xrealloc_vector(currmap->match, 4, currmap->n_matches); + currmap->match[currmap->n_matches++] = xstrdup(first_word); } /*currmap->max_mappings = 0; - done by xzalloc */ /*currmap->n_mappings = 0;*/ @@ -702,7 +776,7 @@ static struct interfaces_file_t *read_interfaces(const char *filename) debug_noise("Added mapping\n"); #endif currently_processing = MAPPING; - } else if (strcmp(firstword, "iface") == 0) { + } else if (strcmp(first_word, "iface") == 0) { static const struct address_family_t *const addr_fams[] = { #if ENABLE_FEATURE_IFUPDOWN_IPV4 &addr_inet, @@ -712,24 +786,23 @@ static struct interfaces_file_t *read_interfaces(const char *filename) #endif NULL }; - char *iface_name; char *address_family_name; char *method_name; llist_t *iface_list; currif = xzalloc(sizeof(*currif)); - iface_name = next_word(&buf_ptr); - address_family_name = next_word(&buf_ptr); - method_name = next_word(&buf_ptr); + iface_name = next_word(&rest_of_line); + address_family_name = next_word(&rest_of_line); + method_name = next_word(&rest_of_line); if (method_name == NULL) bb_error_msg_and_die("too few parameters for line \"%s\"", buf); /* ship any trailing whitespace */ - buf_ptr = skip_whitespace(buf_ptr); + rest_of_line = skip_whitespace(rest_of_line); - if (buf_ptr[0] != '\0' /* && buf_ptr[0] != '#' */) + if (rest_of_line[0] != '\0' /* && rest_of_line[0] != '#' */) bb_error_msg_and_die("too many parameters \"%s\"", buf); currif->iface = xstrdup(iface_name); @@ -754,57 +827,59 @@ static struct interfaces_file_t *read_interfaces(const char *filename) debug_noise("iface %s %s %s\n", currif->iface, address_family_name, method_name); currently_processing = IFACE; - } else if (strcmp(firstword, "auto") == 0) { - while ((firstword = next_word(&buf_ptr)) != NULL) { + } else if (strcmp(first_word, "auto") == 0) { + while ((first_word = next_word(&rest_of_line)) != NULL) { /* Check the interface isnt already listed */ - if (find_list_string(defn->autointerfaces, firstword)) { + if (llist_find_str(defn->autointerfaces, first_word)) { bb_perror_msg_and_die("interface declared auto twice \"%s\"", buf); } /* Add the interface to the list */ - llist_add_to_end(&(defn->autointerfaces), xstrdup(firstword)); - debug_noise("\nauto %s\n", firstword); + llist_add_to_end(&(defn->autointerfaces), xstrdup(first_word)); + debug_noise("\nauto %s\n", first_word); } currently_processing = NONE; } else { switch (currently_processing) { case IFACE: - if (buf_ptr[0] == '\0') + if (rest_of_line[0] == '\0') bb_error_msg_and_die("option with empty value \"%s\"", buf); - if (strcmp(firstword, "up") != 0 - && strcmp(firstword, "down") != 0 - && strcmp(firstword, "pre-up") != 0 - && strcmp(firstword, "post-down") != 0 + if (strcmp(first_word, "up") != 0 + && strcmp(first_word, "down") != 0 + && strcmp(first_word, "pre-up") != 0 + && strcmp(first_word, "post-down") != 0 ) { int i; for (i = 0; i < currif->n_options; i++) { - if (strcmp(currif->option[i].name, firstword) == 0) + if (strcmp(currif->option[i].name, first_word) == 0) bb_error_msg_and_die("duplicate option \"%s\"", buf); } } if (currif->n_options >= currif->max_options) { currif->max_options += 10; - currif->option = xrealloc(currif->option, sizeof(*currif->option) * currif->max_options); + currif->option = xrealloc(currif->option, + sizeof(*currif->option) * currif->max_options); } - debug_noise("\t%s=%s\n", firstword, buf_ptr); - currif->option[currif->n_options].name = xstrdup(firstword); - currif->option[currif->n_options].value = xstrdup(buf_ptr); + debug_noise("\t%s=%s\n", first_word, rest_of_line); + currif->option[currif->n_options].name = xstrdup(first_word); + currif->option[currif->n_options].value = xstrdup(rest_of_line); currif->n_options++; break; case MAPPING: #if ENABLE_FEATURE_IFUPDOWN_MAPPING - if (strcmp(firstword, "script") == 0) { + if (strcmp(first_word, "script") == 0) { if (currmap->script != NULL) bb_error_msg_and_die("duplicate script in mapping \"%s\"", buf); - currmap->script = xstrdup(next_word(&buf_ptr)); - } else if (strcmp(firstword, "map") == 0) { + 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(currmap->mapping, + sizeof(char *) * currmap->max_mappings); } - currmap->mapping[currmap->n_mappings] = xstrdup(next_word(&buf_ptr)); + currmap->mapping[currmap->n_mappings] = xstrdup(next_word(&rest_of_line)); currmap->n_mappings++; } else { bb_error_msg_and_die("misplaced option \"%s\"", buf); @@ -817,7 +892,8 @@ static struct interfaces_file_t *read_interfaces(const char *filename) } } free(buf); - } + } /* while (fgets) */ + if (ferror(f) != 0) { /* ferror does NOT set errno! */ bb_error_msg_and_die("%s: I/O error", filename); @@ -830,43 +906,40 @@ static struct interfaces_file_t *read_interfaces(const char *filename) static char *setlocalenv(const char *format, const char *name, const char *value) { char *result; - char *here; - char *there; + char *dst; + char *src; + char c; result = xasprintf(format, name, value); - for (here = there = result; *there != '=' && *there; there++) { - if (*there == '-') - *there = '_'; - if (isalpha(*there)) - *there = toupper(*there); - - if (isalnum(*there) || *there == '_') { - *here = *there; - here++; - } + for (dst = src = result; (c = *src) != '=' && c; src++) { + if (c == '-') + c = '_'; + if (c >= 'a' && c <= 'z') + c -= ('a' - 'A'); + if (isalnum(c) || c == '_') + *dst++ = c; } - memmove(here, there, strlen(there) + 1); + overlapping_strcpy(dst, src); return result; } static void set_environ(struct interface_defn_t *iface, const char *mode) { - char **environend; int i; - const int n_env_entries = iface->n_options + 5; - char **ppch; + char **pp; - if (my_environ != NULL) { - for (ppch = my_environ; *ppch; ppch++) { - free(*ppch); - *ppch = NULL; + if (G.my_environ != NULL) { + for (pp = G.my_environ; *pp; pp++) { + free(*pp); } - free(my_environ); + free(G.my_environ); } - my_environ = xzalloc(sizeof(char *) * (n_env_entries + 1 /* for final NULL */ )); - environend = my_environ; + + /* note: last element will stay NULL: */ + G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 6)); + pp = G.my_environ; for (i = 0; i < iface->n_options; i++) { if (strcmp(iface->option[i].name, "up") == 0 @@ -876,14 +949,15 @@ static void set_environ(struct interface_defn_t *iface, const char *mode) ) { continue; } - *(environend++) = setlocalenv("IF_%s=%s", iface->option[i].name, iface->option[i].value); + *pp++ = setlocalenv("IF_%s=%s", iface->option[i].name, iface->option[i].value); } - *(environend++) = setlocalenv("%s=%s", "IFACE", iface->iface); - *(environend++) = setlocalenv("%s=%s", "ADDRFAM", iface->address_family->name); - *(environend++) = setlocalenv("%s=%s", "METHOD", iface->method->name); - *(environend++) = setlocalenv("%s=%s", "MODE", mode); - *(environend++) = setlocalenv("%s=%s", "PATH", startup_PATH); + *pp++ = setlocalenv("%s=%s", "IFACE", iface->iface); + *pp++ = setlocalenv("%s=%s", "ADDRFAM", iface->address_family->name); + *pp++ = setlocalenv("%s=%s", "METHOD", iface->method->name); + *pp++ = setlocalenv("%s=%s", "MODE", mode); + if (G.startup_PATH) + *pp++ = setlocalenv("%s=%s", "PATH", G.startup_PATH); } static int doit(char *str) @@ -895,14 +969,14 @@ static int doit(char *str) pid_t child; int status; - fflush(NULL); - child = fork(); + fflush_all(); + child = vfork(); switch (child) { case -1: /* failure */ return 0; case 0: /* child */ - execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, NULL, my_environ); - exit(127); + execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, (char *) NULL, G.my_environ); + _exit(127); } safe_waitpid(child, &status, 0); if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { @@ -955,60 +1029,39 @@ static int iface_down(struct interface_defn_t *iface) } #if ENABLE_FEATURE_IFUPDOWN_MAPPING -static int popen2(FILE **in, FILE **out, char *command, ...) +static int popen2(FILE **in, FILE **out, char *command, char *param) { - va_list ap; - char *argv[11] = { command }; - int argc; - int infd[2], outfd[2]; + char *argv[3] = { command, param, NULL }; + struct fd_pair infd, outfd; pid_t pid; - argc = 1; - va_start(ap, command); - while ((argc < 10) && (argv[argc] = va_arg(ap, char *))) { - argc++; - } - argv[argc] = NULL; /* make sure */ - va_end(ap); - - if (pipe(infd) != 0) { - return 0; - } - - if (pipe(outfd) != 0) { - close(infd[0]); - close(infd[1]); - return 0; - } - - fflush(NULL); - switch (pid = fork()) { - case -1: /* failure */ - close(infd[0]); - close(infd[1]); - close(outfd[0]); - close(outfd[1]); - return 0; - case 0: /* child */ - dup2(infd[0], 0); - dup2(outfd[1], 1); - close(infd[0]); - close(infd[1]); - close(outfd[0]); - close(outfd[1]); + xpiped_pair(infd); + xpiped_pair(outfd); + + fflush_all(); + pid = vfork(); + + switch (pid) { + case -1: /* failure */ + bb_perror_msg_and_die("vfork"); + case 0: /* child */ + /* NB: close _first_, then move fds! */ + close(infd.wr); + close(outfd.rd); + xmove_fd(infd.rd, 0); + xmove_fd(outfd.wr, 1); BB_EXECVP(command, argv); - exit(127); - default: /* parent */ - *in = fdopen(infd[1], "w"); - *out = fdopen(outfd[0], "r"); - close(infd[0]); - close(outfd[1]); - return pid; + _exit(127); } - /* unreached */ + /* parent */ + close(infd.rd); + close(outfd.wr); + *in = xfdopen_for_write(infd.wr); + *out = xfdopen_for_read(outfd.rd); + return pid; } -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; @@ -1016,12 +1069,8 @@ static char *run_mapping(char *physical, struct mapping_defn_t * map) char *logical = xstrdup(physical); - /* Run the mapping script. */ - pid = popen2(&in, &out, map->script, physical, NULL); - - /* popen2() returns 0 on failure. */ - if (pid == 0) - return logical; + /* Run the mapping script. Never fails. */ + pid = popen2(&in, &out, map->script, physical); /* Write mappings to stdin of mapping script. */ for (i = 0; i < map->n_mappings; i++) { @@ -1034,9 +1083,9 @@ static char *run_mapping(char *physical, struct mapping_defn_t * map) /* If the mapping script exited successfully, try to * grab a line of output and use that as the name of the * logical interface. */ - char *new_logical = xmalloc(MAX_INTERFACE_LENGTH); + char *new_logical = xmalloc_fgetline(out); - if (fgets(new_logical, MAX_INTERFACE_LENGTH, out)) { + if (new_logical) { /* If we are able to read a line of output from the script, * remove any trailing whitespace and use this value * as the name of the logical interface. */ @@ -1047,10 +1096,6 @@ static char *run_mapping(char *physical, struct mapping_defn_t * map) free(logical); logical = new_logical; - } else { - /* If we are UNABLE to read a line of output, discard our - * freshly allocated memory. */ - free(new_logical); } } @@ -1062,12 +1107,13 @@ static char *run_mapping(char *physical, struct mapping_defn_t * map) static llist_t *find_iface_state(llist_t *state_list, const char *iface) { - unsigned short iface_len = strlen(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] == '=')) { + && (search->data[iface_len] == '=') + ) { return search; } search = search->link; @@ -1079,7 +1125,7 @@ static llist_t *find_iface_state(llist_t *state_list, const char *iface) static llist_t *read_iface_state(void) { llist_t *state_list = NULL; - FILE *state_fp = fopen(CONFIG_IFUPDOWN_IFSTATE_PATH, "r"); + FILE *state_fp = fopen_for_read(CONFIG_IFUPDOWN_IFSTATE_PATH); if (state_fp) { char *start, *end_ptr; @@ -1104,6 +1150,10 @@ int ifupdown_main(int argc, char **argv) const char *interfaces = "/etc/network/interfaces"; bool any_failures = 0; + INIT_G(); + + G.startup_PATH = getenv("PATH"); + cmds = iface_down; if (applet_name[2] == 'u') { /* ifup command */ @@ -1121,9 +1171,6 @@ int ifupdown_main(int argc, char **argv) defn = read_interfaces(interfaces); debug_noise("\ndone reading %s\n\n", interfaces); - startup_PATH = getenv("PATH"); - if (!startup_PATH) startup_PATH = ""; - /* Create a list of interfaces to work on */ if (DO_ALL) { target_list = defn->autointerfaces; @@ -1139,7 +1186,7 @@ int ifupdown_main(int argc, char **argv) char *liface; char *pch; bool okay = 0; - unsigned cmds_ret; + int cmds_ret; iface = xstrdup(target_list->data); target_list = target_list->link; @@ -1245,7 +1292,7 @@ int ifupdown_main(int argc, char **argv) } /* Actually write the new state */ - state_fp = xfopen(CONFIG_IFUPDOWN_IFSTATE_PATH, "w"); + state_fp = xfopen_for_write(CONFIG_IFUPDOWN_IFSTATE_PATH); state = state_list; while (state) { if (state->data) {