1303 files changed, 32187 insertions, 57138 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 0f0857c..1806a6c 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c @@ -1,6 +1,6 @@ /* vi: set sw=4 ts=4: */ /* - * ifupdown for busybox + * ifup/ifdown for busybox * Copyright (c) 2002 Glenn McGrath * Copyright (c) 2003-2004 Erik Andersen <andersen@codepoet.org> * @@ -17,23 +17,118 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//config:config IFUP +//config: bool "ifup" +//config: default y +//config: help +//config: Activate the specified interfaces. This applet makes use +//config: of either "ifconfig" and "route" or the "ip" command to actually +//config: configure network interfaces. Therefore, you will probably also want +//config: to enable either IFCONFIG and ROUTE, or enable +//config: FEATURE_IFUPDOWN_IP and the various IP options. Of +//config: course you could use non-busybox versions of these programs, so +//config: against my better judgement (since this will surely result in plenty +//config: of support questions on the mailing list), I do not force you to +//config: enable these additional options. It is up to you to supply either +//config: "ifconfig", "route" and "run-parts" or the "ip" command, either +//config: via busybox or via standalone utilities. +//config: +//config:config IFDOWN +//config: bool "ifdown" +//config: default y +//config: help +//config: Deactivate the specified interfaces. +//config: +//config:config IFUPDOWN_IFSTATE_PATH +//config: string "Absolute path to ifstate file" +//config: default "/var/run/ifstate" +//config: depends on IFUP || IFDOWN +//config: help +//config: ifupdown keeps state information in a file called ifstate. +//config: Typically it is located in /var/run/ifstate, however +//config: some distributions tend to put it in other places +//config: (debian, for example, uses /etc/network/run/ifstate). +//config: This config option defines location of ifstate. +//config: +//config:config FEATURE_IFUPDOWN_IP +//config: bool "Use ip tool (else ifconfig/route is used)" +//config: default y +//config: depends on IFUP || IFDOWN +//config: help +//config: Use the iproute "ip" command to implement "ifup" and "ifdown", rather +//config: than the default of using the older "ifconfig" and "route" utilities. +//config: +//config: If Y: you must install either the full-blown iproute2 package +//config: or enable "ip" applet in Busybox, or the "ifup" and "ifdown" applets +//config: will not work. +//config: +//config: If N: you must install either the full-blown ifconfig and route +//config: utilities, or enable these applets in Busybox. +//config: +//config:config FEATURE_IFUPDOWN_IPV4 +//config: bool "Support for IPv4" +//config: default y +//config: depends on IFUP || IFDOWN +//config: help +//config: If you want ifup/ifdown to talk IPv4, leave this on. +//config: +//config:config FEATURE_IFUPDOWN_IPV6 +//config: bool "Support for IPv6" +//config: default y +//config: depends on (IFUP || IFDOWN) && FEATURE_IPV6 +//config: help +//config: If you need support for IPv6, turn this option on. +//config: +//UNUSED: +////////:config FEATURE_IFUPDOWN_IPX +////////: bool "Support for IPX" +////////: default y +////////: depends on IFUP || IFDOWN +////////: help +////////: If this option is selected you can use busybox to work with IPX +////////: networks. +//config: +//config:config FEATURE_IFUPDOWN_MAPPING +//config: bool "Enable mapping support" +//config: default y +//config: depends on IFUP || IFDOWN +//config: help +//config: This enables support for the "mapping" stanza, unless you have +//config: a weird network setup you don't need it. +//config: +//config:config FEATURE_IFUPDOWN_EXTERNAL_DHCP +//config: bool "Support for external dhcp clients" +//config: default n +//config: depends on IFUP || IFDOWN +//config: help +//config: This enables support for the external dhcp clients. Clients are +//config: tried in the following order: dhcpcd, dhclient, pump and udhcpc. +//config: Otherwise, if udhcpc applet is enabled, it is used. +//config: Otherwise, ifup/ifdown will have no support for DHCP. + +//applet:IF_IFUP(APPLET_ODDNAME(ifup, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifup)) +//applet:IF_IFDOWN(APPLET_ODDNAME(ifdown, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifdown)) + +//kbuild:lib-$(CONFIG_IFUP) += ifupdown.o +//kbuild:lib-$(CONFIG_IFDOWN) += ifupdown.o + //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: " -a Configure all interfaces" +//usage: "\n -i FILE Use FILE instead of /etc/network/interfaces" //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: "\n -f Force 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: " -a Deconfigure all interfaces" //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( @@ -41,9 +136,10 @@ //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: "\n -f Force deconfiguration" #include "libbb.h" +#include "common_bufsiz.h" /* After libbb.h, since it needs sys/types.h on some systems */ #include <sys/utsname.h> #include <fnmatch.h> @@ -55,6 +151,7 @@ #endif #define UDHCPC_CMD_OPTIONS CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS +#define IFSTATE_FILE_PATH CONFIG_IFUPDOWN_IFSTATE_PATH #define debug_noise(args...) /*fprintf(stderr, args)*/ @@ -129,8 +226,8 @@ struct globals { const char *startup_PATH; char *shell; } FIX_ALIASING; -#define G (*(struct globals*)&bb_common_bufsiz1) -#define INIT_G() do { } while (0) +#define G (*(struct globals*)bb_common_bufsiz1) +#define INIT_G() do { setup_common_bufsiz(); } while (0) static const char keywords_up_down[] ALIGN1 = @@ -289,7 +386,7 @@ static char *parse(const char *command, struct interface_defn_t *ifd) /* "hwaddress <class> <address>": * unlike ifconfig, ip doesnt want <class> * (usually "ether" keyword). Skip it. */ - if (strncmp(command, "hwaddress", 9) == 0) { + if (is_prefixed_with(command, "hwaddress")) { varvalue = skip_whitespace(skip_non_whitespace(varvalue)); } # endif @@ -298,7 +395,7 @@ static char *parse(const char *command, struct interface_defn_t *ifd) # if ENABLE_FEATURE_IFUPDOWN_IP /* Sigh... Add a special case for 'ip' to convert from * dotted quad to bit count style netmasks. */ - if (strncmp(command, "bnmask", 6) == 0) { + if (is_prefixed_with(command, "bnmask")) { unsigned res; varvalue = get_var("netmask", 7, ifd); if (varvalue) { @@ -394,8 +491,8 @@ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec) # 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%]][[ addr %hwaddress%]] %iface% up", ifd, exec); - /* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */ - result += execute("[[ip route add ::/0 via %gateway%]][[ prio %metric%]]", ifd, exec); + /* Reportedly, IPv6 needs "dev %iface%", but IPv4 does not: */ + result += execute("[[ip route add ::/0 via %gateway% dev %iface%]][[ metric %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); @@ -421,7 +518,8 @@ static int FAST_FUNC v4tunnel_up(struct interface_defn_t *ifd, execfn *exec) "%endpoint%[[ local %local%]][[ ttl %ttl%]]", ifd, 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); + /* Reportedly, IPv6 needs "dev %iface%", but IPv4 does not: */ + result += execute("[[ip route add ::/0 via %gateway% dev %iface%]]", ifd, exec); return ((result == 4) ? 4 : 0); } @@ -482,7 +580,7 @@ static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec) result = execute("ip addr add %address%/%bnmask%[[ broadcast %broadcast%]] " "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%[[ prio %metric%]]]]", ifd, exec); + result += execute("[[ip route add default via %gateway% dev %iface%[[ metric %metric%]]]]", ifd, exec); return ((result == 3) ? 3 : 0); # else /* ifconfig said to set iface up before it processes hw %hwaddress%, @@ -490,7 +588,7 @@ static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec) result = execute("ifconfig %iface%[[ hw %hwaddress%]][[ media %media%]][[ mtu %mtu%]] up", ifd, exec); result += execute("ifconfig %iface% %address% netmask %netmask%" - "[[ broadcast %broadcast%]][[ pointopoint %pointopoint%]] ", + "[[ broadcast %broadcast%]][[ pointopoint %pointopoint%]]", ifd, exec); result += execute("[[route add default gw %gateway%[[ metric %metric%]] %iface%]]", ifd, exec); return ((result == 3) ? 3 : 0); @@ -501,7 +599,10 @@ 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); + /* Optional "label LBL" is necessary if interface is an alias (eth0:0), + * otherwise "ip addr flush dev eth0:0" flushes all addresses on eth0. + */ + result = execute("ip addr flush dev %iface%[[ label %label%]]", ifd, exec); result += execute("ip link set %iface% down", ifd, exec); # else /* result = execute("[[route del default gw %gateway% %iface%]]", ifd, exec); */ @@ -534,7 +635,7 @@ static const struct dhcp_client_t ext_dhcp_clients[] = { "pump -i %iface% -k", }, { "udhcpc", - "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %client%]]" + "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -x hostname:%hostname%]][[ -c %client%]]" "[[ -s %script%]][[ %udhcpc_opts%]]", "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", }, @@ -555,7 +656,7 @@ static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec) return 0; # endif for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) { - if (exists_execable(ext_dhcp_clients[i].name)) + if (executable_exists(ext_dhcp_clients[i].name)) return execute(ext_dhcp_clients[i].startcmd, ifd, exec); } bb_error_msg("no dhcp clients found"); @@ -574,7 +675,7 @@ static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec) return 0; # endif return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid " - "-i %iface%[[ -H %hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]", + "-i %iface%[[ -x hostname:%hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]", ifd, exec); } # else @@ -592,7 +693,7 @@ static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec) unsigned i; for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) { - if (exists_execable(ext_dhcp_clients[i].name)) { + if (executable_exists(ext_dhcp_clients[i].name)) { result = execute(ext_dhcp_clients[i].stopcmd, ifd, exec); if (result) break; @@ -685,6 +786,18 @@ static const struct address_family_t addr_inet = { #endif /* FEATURE_IFUPDOWN_IPV4 */ +static int FAST_FUNC link_up_down(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM) +{ + return 1; +} + +static const struct method_t link_methods[] = { + { "none", link_up_down, link_up_down } +}; + +static const struct address_family_t addr_link = { + "link", ARRAY_SIZE(link_methods), link_methods +}; /* Returns pointer to the next word, or NULL. * In 1st case, advances *buf to the word after this one. @@ -831,12 +944,12 @@ static struct interfaces_file_t *read_interfaces(const char *filename, struct in #if ENABLE_FEATURE_IFUPDOWN_IPV6 &addr_inet6, #endif + &addr_link, NULL }; char *iface_name; char *address_family_name; char *method_name; - llist_t *iface_list; currif = xzalloc(sizeof(*currif)); iface_name = next_word(&rest_of_line); @@ -861,7 +974,20 @@ static struct interfaces_file_t *read_interfaces(const char *filename, struct in currif->method = get_method(currif->address_family, method_name); if (!currif->method) bb_error_msg_and_die("unknown method \"%s\"", method_name); - +#if 0 +// Allegedly, Debian allows a duplicate definition: +// iface eth0 inet static +// address 192.168.0.15 +// netmask 255.255.0.0 +// gateway 192.168.0.1 +// +// iface eth0 inet static +// address 10.0.0.1 +// netmask 255.255.255.0 +// +// This adds *two* addresses to eth0 (probably requires use of "ip", not "ifconfig" +// + llist_t *iface_list; for (iface_list = defn->ifaces; iface_list; iface_list = iface_list->link) { struct interface_defn_t *tmp = (struct interface_defn_t *) iface_list->data; if ((strcmp(tmp->iface, currif->iface) == 0) @@ -870,6 +996,7 @@ static struct interfaces_file_t *read_interfaces(const char *filename, struct in bb_error_msg_and_die("duplicate interface \"%s\"", tmp->iface); } } +#endif llist_add_to_end(&(defn->ifaces), (char*)currif); debug_noise("iface %s %s %s\n", currif->iface, address_family_name, method_name); @@ -1038,6 +1165,11 @@ static int execute_all(struct interface_defn_t *ifd, const char *opt) } } + /* Tested on Debian Squeeze: "standard" ifup runs this without + * checking that directory exists. If it doesn't, run-parts + * complains, and this message _is_ annoyingly visible. + * Don't "fix" this (unless newer Debian does). + */ buf = xasprintf("run-parts /etc/network/if-%s.d", opt); /* heh, we don't bother free'ing it */ return doit(buf); @@ -1146,12 +1278,12 @@ 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 iface_len = strlen(iface); llist_t *search = state_list; while (search) { - if ((strncmp(search->data, iface, iface_len) == 0) - && (search->data[iface_len] == '=') + char *after_iface = is_prefixed_with(search->data, iface); + if (after_iface + && *after_iface == '=' ) { return search; } @@ -1164,7 +1296,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_for_read(CONFIG_IFUPDOWN_IFSTATE_PATH); + FILE *state_fp = fopen_for_read(IFSTATE_FILE_PATH); if (state_fp) { char *start, *end_ptr; @@ -1179,6 +1311,37 @@ static llist_t *read_iface_state(void) return state_list; } +/* read the previous state from the state file */ +static FILE *open_new_state_file(void) +{ + int fd, flags, cnt; + + cnt = 0; + flags = (O_WRONLY | O_CREAT | O_EXCL); + for (;;) { + fd = open(IFSTATE_FILE_PATH".new", flags, 0666); + if (fd >= 0) + break; + if (errno != EEXIST + || flags == (O_WRONLY | O_CREAT | O_TRUNC) + ) { + bb_perror_msg_and_die("can't open '%s'", + IFSTATE_FILE_PATH".new"); + } + /* Someone else created the .new file */ + if (cnt > 30 * 1000) { + /* Waited for 30*30/2 = 450 milliseconds, still EEXIST. + * Assuming a stale file, rewriting it. + */ + flags = (O_WRONLY | O_CREAT | O_TRUNC); + continue; + } + usleep(cnt); + cnt += 1000; + } + + return xfdopen_for_write(fd); +} int ifupdown_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ifupdown_main(int argc UNUSED_PARAM, char **argv) @@ -1194,10 +1357,13 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv) G.startup_PATH = getenv("PATH"); G.shell = xstrdup(get_shell_name()); - cmds = iface_down; - if (applet_name[2] == 'u') { + if (ENABLE_IFUP + && (!ENABLE_IFDOWN || applet_name[2] == 'u') + ) { /* ifup command */ cmds = iface_up; + } else { + cmds = iface_down; } getopt32(argv, OPTION_STR, &interfaces); @@ -1226,6 +1392,7 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv) char *pch; bool okay = 0; int cmds_ret; + bool curr_failure = 0; iface = xstrdup(target_list->data); target_list = target_list->link; @@ -1291,11 +1458,11 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv) /* Call the cmds function pointer, does either iface_up() or iface_down() */ cmds_ret = cmds(currif); if (cmds_ret == -1) { - bb_error_msg("don't seem to have all the variables for %s/%s", + bb_error_msg("don't have all variables for %s/%s", liface, currif->address_family->name); - any_failures = 1; + any_failures = curr_failure = 1; } else if (cmds_ret == 0) { - any_failures = 1; + any_failures = curr_failure = 1; } currif->iface = oldiface; @@ -1311,12 +1478,12 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv) any_failures = 1; } else if (!NO_ACT) { /* update the state file */ - FILE *state_fp; + FILE *new_state_fp = open_new_state_file(); llist_t *state; llist_t *state_list = read_iface_state(); llist_t *iface_state = find_iface_state(state_list, iface); - if (cmds == iface_up && !any_failures) { + if (cmds == iface_up && !curr_failure) { char *newiface = xasprintf("%s=%s", iface, liface); if (!iface_state) { llist_add_to_end(&state_list, newiface); @@ -1331,15 +1498,15 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv) } /* Actually write the new state */ - state_fp = xfopen_for_write(CONFIG_IFUPDOWN_IFSTATE_PATH); state = state_list; while (state) { if (state->data) { - fprintf(state_fp, "%s\n", state->data); + fprintf(new_state_fp, "%s\n", state->data); } state = state->link; } - fclose(state_fp); + fclose(new_state_fp); + xrename(IFSTATE_FILE_PATH".new", IFSTATE_FILE_PATH); llist_free(state_list, free); } next: |