X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fifupdown.c;h=6a200bb2668c1b53598c269ab4e15c34a396bc72;hb=5929edc1fac4340f99ed84e92bf3a2bedd4177c2;hp=665e527cc50a46769e3a2314c94c13dc58d773a3;hpb=d66370cd7329d7d1022644c0a8213147adf8e016;p=oweals%2Fbusybox.git diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 665e527cc..6a200bb26 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c @@ -1,6 +1,8 @@ +/* vi: set sw=4 ts=4: */ /* * ifupdown for busybox - * Copyright (c) 2002 Glenn McGrath + * Copyright (c) 2002 Glenn McGrath + * Copyright (c) 2003-2004 Erik Andersen * * Based on ifupdown v 0.6.4 by Anthony Towns * Copyright (c) 1999 Anthony Towns @@ -10,21 +12,11 @@ * Lines in the interfaces file cannot wrap. * To adhere to the FHS, the default state file is /var/run/ifstate. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ +/* TODO: standardise execute() return codes to return 0 for success and 1 for failure */ + #include #include #include @@ -40,32 +32,45 @@ #include #include -#include "libbb.h" +#include "busybox.h" #define MAX_OPT_DEPTH 10 #define EUNBALBRACK 10001 #define EUNDEFVAR 10002 #define EUNBALPER 10000 -typedef struct interface_defn_s interface_defn_t; +#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING +#define MAX_INTERFACE_LENGTH 10 +#endif + +#if 0 +#define debug_noise(fmt, args...) printf(fmt, ## args) +#else +#define debug_noise(fmt, args...) +#endif + +/* Forward declaration */ +struct interface_defn_t; typedef int (execfn)(char *command); -typedef int (command_set)(interface_defn_t *ifd, execfn *e); -typedef struct method_s { +struct method_t +{ char *name; - command_set *up; - command_set *down; -} method_t; + int (*up)(struct interface_defn_t *ifd, execfn *e); + int (*down)(struct interface_defn_t *ifd, execfn *e); +}; -typedef struct address_family_s { +struct address_family_t +{ char *name; int n_methods; - method_t *method; -} address_family_t; + struct method_t *method; +}; -typedef struct mapping_defn_s { - struct mapping_defn_s *next; +struct mapping_defn_t +{ + struct mapping_defn_t *next; int max_matches; int n_matches; @@ -76,37 +81,61 @@ typedef struct mapping_defn_s { int max_mappings; int n_mappings; char **mapping; -} mapping_defn_t; +}; -typedef struct variable_s { +struct variable_t +{ char *name; char *value; -} variable_t; +}; -struct interface_defn_s { - struct interface_defn_s *next; +struct interface_defn_t +{ + struct address_family_t *address_family; + struct method_t *method; char *iface; - address_family_t *address_family; - method_t *method; - - int automatic; - int max_options; int n_options; - variable_t *option; + struct variable_t *option; }; -typedef struct interfaces_file_s { +struct interfaces_file_t +{ llist_t *autointerfaces; - interface_defn_t *ifaces; - mapping_defn_t *mappings; -} interfaces_file_t; + llist_t *ifaces; + struct mapping_defn_t *mappings; +}; static char no_act = 0; static char verbose = 0; -static char **environ = NULL; +static char **__myenviron = NULL; + +#ifdef CONFIG_FEATURE_IFUPDOWN_IP + +static unsigned int count_bits(unsigned int a) +{ + unsigned int result; + result = (a & 0x55) + ((a >> 1) & 0x55); + result = (result & 0x33) + ((result >> 2) & 0x33); + return((result & 0x0F) + ((result >> 4) & 0x0F)); +} +static int count_netmask_bits(char *dotted_quad) +{ + unsigned int result, a, b, c, d; + /* Found a netmask... Check if it is dotted quad */ + if (sscanf(dotted_quad, "%u.%u.%u.%u", &a, &b, &c, &d) != 4) + return -1; + result = count_bits(a); + result += count_bits(b); + result += count_bits(c); + result += count_bits(d); + return ((int)result); +} +#endif + +#if ENABLE_FEATURE_IFUPDOWN_IPV4 || ENABLE_FEATURE_IFUPDOWN_IPV6 static void addstr(char **buf, size_t *len, size_t *pos, char *str, size_t str_length) { if (*pos + str_length >= *len) { @@ -135,11 +164,21 @@ static int strncmpz(char *l, char *r, size_t llen) } } -static char *get_var(char *id, size_t idlen, interface_defn_t *ifd) +static char *get_var(char *id, size_t idlen, struct interface_defn_t *ifd) { int i; if (strncmpz(id, "iface", idlen) == 0) { + char *result; + static char label_buf[20]; + strncpy(label_buf, ifd->iface, 19); + label_buf[19]=0; + result = strchr(label_buf, ':'); + if (result) { + *result=0; + } + return( label_buf); + } else if (strncmpz(id, "label", idlen) == 0) { return (ifd->iface); } else { for (i = 0; i < ifd->n_options; i++) { @@ -152,7 +191,7 @@ static char *get_var(char *id, size_t idlen, interface_defn_t *ifd) return(NULL); } -static char *parse(char *command, interface_defn_t *ifd) +static char *parse(char *command, struct interface_defn_t *ifd) { char *result = NULL; @@ -164,67 +203,82 @@ static char *parse(char *command, interface_defn_t *ifd) while (*command) { switch (*command) { - default: - addstr(&result, &len, &pos, command, 1); - command++; - break; - case '\\': - if (command[1]) { - addstr(&result, &len, &pos, command + 1, 1); - command += 2; - } else { + default: addstr(&result, &len, &pos, command, 1); command++; - } - break; - case '[': - if (command[1] == '[' && opt_depth < MAX_OPT_DEPTH) { - old_pos[opt_depth] = pos; - okay[opt_depth] = 1; - opt_depth++; - command += 2; - } else { - addstr(&result, &len, &pos, "[", 1); - command++; - } - break; - case ']': - if (command[1] == ']' && opt_depth > 1) { - opt_depth--; - if (!okay[opt_depth]) { - pos = old_pos[opt_depth]; - result[pos] = '\0'; + break; + case '\\': + if (command[1]) { + addstr(&result, &len, &pos, command + 1, 1); + command += 2; + } else { + addstr(&result, &len, &pos, command, 1); + command++; } - command += 2; - } else { - addstr(&result, &len, &pos, "]", 1); - command++; - } - break; - case '%': - { - char *nextpercent; - char *varvalue; - - command++; - nextpercent = strchr(command, '%'); - if (!nextpercent) { - errno = EUNBALPER; - free(result); - return (NULL); - } + break; + case '[': + if (command[1] == '[' && opt_depth < MAX_OPT_DEPTH) { + old_pos[opt_depth] = pos; + okay[opt_depth] = 1; + opt_depth++; + command += 2; + } else { + addstr(&result, &len, &pos, "[", 1); + command++; + } + break; + case ']': + if (command[1] == ']' && opt_depth > 1) { + opt_depth--; + if (!okay[opt_depth]) { + pos = old_pos[opt_depth]; + result[pos] = '\0'; + } + command += 2; + } else { + addstr(&result, &len, &pos, "]", 1); + command++; + } + break; + case '%': + { + char *nextpercent; + char *varvalue; + + command++; + nextpercent = strchr(command, '%'); + if (!nextpercent) { + errno = EUNBALPER; + free(result); + return (NULL); + } - varvalue = get_var(command, nextpercent - command, ifd); + varvalue = get_var(command, nextpercent - command, ifd); - if (varvalue) { - addstr(&result, &len, &pos, varvalue, xstrlen(varvalue)); - } else { - okay[opt_depth - 1] = 0; - } + if (varvalue) { + addstr(&result, &len, &pos, varvalue, strlen(varvalue)); + } else { +#ifdef CONFIG_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) { + int res; + varvalue = get_var("netmask", 7, ifd); + if (varvalue && (res=count_netmask_bits(varvalue)) > 0) { + char argument[255]; + sprintf(argument, "%d", res); + addstr(&result, &len, &pos, argument, strlen(argument)); + command = nextpercent + 1; + break; + } + } +#endif + okay[opt_depth - 1] = 0; + } - command = nextpercent + 1; - } - break; + command = nextpercent + 1; + } + break; } } @@ -243,7 +297,7 @@ static char *parse(char *command, interface_defn_t *ifd) return(result); } -static int execute(char *command, interface_defn_t *ifd, execfn *exec) +static int execute(char *command, struct interface_defn_t *ifd, execfn *exec) { char *out; int ret; @@ -252,149 +306,81 @@ static int execute(char *command, interface_defn_t *ifd, execfn *exec) if (!out) { return(0); } - ret = (*exec) (out); free(out); - return(ret); -} - -#ifdef CONFIG_FEATURE_IFUPDOWN_IPX -static int static_up_ipx(interface_defn_t *ifd, execfn *exec) -{ - if (!execute("ipx_interface add %iface% %frame% %netnum%", ifd, exec)) { - return(0); - } - return(1); -} - -static int static_down_ipx(interface_defn_t *ifd, execfn *exec) -{ - if (!execute("ipx_interface del %iface% %frame%", ifd, exec)) { - return(0); - } - return(1); -} - -static int dynamic_up(interface_defn_t *ifd, execfn *exec) -{ - if (!execute("ipx_interface add %iface% %frame%", ifd, exec)) { - return(0); - } - return(1); -} - -static int dynamic_down(interface_defn_t *ifd, execfn *exec) -{ - if (!execute("ipx_interface del %iface% %frame%", ifd, exec)) { + if (ret != 1) { return(0); } return(1); } - -static method_t methods_ipx[] = { - { "dynamic", dynamic_up, dynamic_down, }, - { "static", static_up_ipx, static_down_ipx, }, -}; - -address_family_t addr_ipx = { - "ipx", - sizeof(methods_ipx) / sizeof(method_t), - methods_ipx -}; -#endif /* IFUP_FEATURE_IPX */ +#endif #ifdef CONFIG_FEATURE_IFUPDOWN_IPV6 -static int loopback_up6(interface_defn_t *ifd, execfn *exec) +static int loopback_up6(struct interface_defn_t *ifd, execfn *exec) { #ifdef CONFIG_FEATURE_IFUPDOWN_IP - if (!execute("ip link set %iface% up", ifd, exec)) - return(0); - if (!execute("ip addr add ::1 dev %iface%", ifd, exec)) - return(0); + int result; + result =execute("ip addr add ::1 dev %iface%", ifd, exec); + result += execute("ip link set %iface% up", ifd, exec); + return ((result == 2) ? 2 : 0); #else - if (!execute("ifconfig %iface% add ::1", ifd, exec)) - return(0); + return( execute("ifconfig %iface% add ::1", ifd, exec)); #endif - return(1); } -static int loopback_down6(interface_defn_t *ifd, execfn *exec) +static int loopback_down6(struct interface_defn_t *ifd, execfn *exec) { #ifdef CONFIG_FEATURE_IFUPDOWN_IP - if (!execute("ip link set %iface% down", ifd, exec)) - return(0); + return(execute("ip link set %iface% down", ifd, exec)); #else - if (!execute("ifconfig %iface% del ::1", ifd, exec)) - return(0); + return(execute("ifconfig %iface% del ::1", ifd, exec)); #endif - return(1); } -static int static_up6(interface_defn_t *ifd, execfn *exec) +static int static_up6(struct interface_defn_t *ifd, execfn *exec) { + int result; #ifdef CONFIG_FEATURE_IFUPDOWN_IP - if (!execute("ip link set %iface% up", ifd, exec)) - return(0); - if (!execute("ip addr add %address%/%netmask% dev %iface%", ifd, exec)) - return(0); - if (!execute("[[ ip route add ::/0 via %gateway% ]]", ifd, exec)) - return(0); + 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 route add ::/0 via %gateway% ]]", ifd, exec); #else - if (!execute("ifconfig %iface% [[media %media%]] [[hw %hwaddress%]] [[mtu %mtu%]] up", ifd, exec)) { - return(0); - } - if (!execute("ifconfig %iface% add %address%/%netmask%", ifd, exec)) { - return(0); - } - if (!execute("[[ route -A inet6 add ::/0 gw %gateway% ]]", ifd, exec)) { - return(0); - } + result = execute("ifconfig %iface% [[media %media%]] [[hw %hwaddress%]] [[mtu %mtu%]] up", ifd, exec); + result += execute("ifconfig %iface% add %address%/%netmask%", ifd, exec); + result += execute("[[ route -A inet6 add ::/0 gw %gateway% ]]", ifd, exec); #endif - return(1); + return ((result == 3) ? 3 : 0); } -static int static_down6(interface_defn_t *ifd, execfn *exec) +static int static_down6(struct interface_defn_t *ifd, execfn *exec) { #ifdef CONFIG_FEATURE_IFUPDOWN_IP - if (!execute("ip link set %iface% down", ifd, exec)) - return(0); + return(execute("ip link set %iface% down", ifd, exec)); #else - if (!execute("ifconfig %iface% down", ifd, exec)) { - return(0); - } + return(execute("ifconfig %iface% down", ifd, exec)); #endif - return(1); } #ifdef CONFIG_FEATURE_IFUPDOWN_IP -static int v4tunnel_up(interface_defn_t *ifd, execfn *exec) +static int v4tunnel_up(struct interface_defn_t *ifd, execfn *exec) { - if (!execute("ip tunnel add %iface% mode sit remote %endpoint% [[local %local%]] [[ttl %ttl%]]", ifd, exec)) { - return(0); - } - if (!execute("ip link set %iface% up", ifd, exec)) { - return(0); - } - if (!execute("ip addr add %address%/%netmask% dev %iface%", ifd, exec)) { - return(0); - } - if (!execute("[[ ip route add ::/0 via %gateway% ]]", ifd, exec)) { - return(0); - } - return(1); + int result; + result = execute("ip tunnel add %iface% mode sit remote " + "%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); + return ((result == 4) ? 4 : 0); } -static int v4tunnel_down(interface_defn_t * ifd, execfn * exec) +static int v4tunnel_down(struct interface_defn_t * ifd, execfn * exec) { - if (!execute("ip tunnel del %iface%", ifd, exec)) { - return(0); - } - return(1); + return( execute("ip tunnel del %iface%", ifd, exec)); } #endif -static method_t methods6[] = { +static struct method_t methods6[] = { #ifdef CONFIG_FEATURE_IFUPDOWN_IP { "v4tunnel", v4tunnel_up, v4tunnel_down, }, #endif @@ -402,83 +388,68 @@ static method_t methods6[] = { { "loopback", loopback_up6, loopback_down6, }, }; -address_family_t addr_inet6 = { +static struct address_family_t addr_inet6 = { "inet6", - sizeof(methods6) / sizeof(method_t), + sizeof(methods6) / sizeof(struct method_t), methods6 }; #endif /* CONFIG_FEATURE_IFUPDOWN_IPV6 */ #ifdef CONFIG_FEATURE_IFUPDOWN_IPV4 -static int loopback_up(interface_defn_t *ifd, execfn *exec) +static int loopback_up(struct interface_defn_t *ifd, execfn *exec) { #ifdef CONFIG_FEATURE_IFUPDOWN_IP - if (!execute("ip link set %iface% up", ifd, exec)) - return(0); - if (!execute("ip addr add 127.0.0.1 dev %iface%", ifd, exec)) - return(0); + 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 == 2) ? 2 : 0); #else - if (!execute("ifconfig %iface% 127.0.0.1 up", ifd, exec)) { - return(0); - } + return( execute("ifconfig %iface% 127.0.0.1 up", ifd, exec)); #endif - return(1); } -static int loopback_down(interface_defn_t *ifd, execfn *exec) +static int loopback_down(struct interface_defn_t *ifd, execfn *exec) { #ifdef CONFIG_FEATURE_IFUPDOWN_IP - if (!execute("ip -f inet addr flush dev %iface%", ifd, exec)) - return(0); - if (!execute("ip link set %iface% down", ifd, exec)) - return(0); + int result; + result = execute("ip addr flush dev %iface%", ifd, exec); + result += execute("ip link set %iface% down", ifd, exec); + return ((result == 2) ? 2 : 0); #else - if (!execute("ifconfig %iface% 127.0.0.1 down", ifd, exec)) { - return(0); - } + return( execute("ifconfig %iface% 127.0.0.1 down", ifd, exec)); #endif - return(1); } -static int static_up(interface_defn_t *ifd, execfn *exec) +static int static_up(struct interface_defn_t *ifd, execfn *exec) { + int result; #ifdef CONFIG_FEATURE_IFUPDOWN_IP - if (!execute("ip link set %iface% up", ifd, exec)) - return(0); - if (!execute("ip addr add %address%/%netmask% dev %iface%", ifd, exec)) - return(0); - if (!execute("[[ ip route add default via %gateway% dev %iface% ]]", ifd, exec)) - return(0); + 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 route add default via %gateway% dev %iface% ]]", ifd, exec); + return ((result == 3) ? 3 : 0); #else - if (!execute("ifconfig %iface% %address% netmask %netmask% [[broadcast %broadcast%]] [[pointopoint %pointopoint%]] [[media %media%]] [[mtu %mtu%]] [[hw %hwaddress%]] up", - ifd, exec)) { - return(0); - } - if (!execute("[[ route add default gw %gateway% %iface% ]]", ifd, exec)) { - return(0); - } + 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(1); } -static int static_down(interface_defn_t *ifd, execfn *exec) +static int static_down(struct interface_defn_t *ifd, execfn *exec) { + int result; #ifdef CONFIG_FEATURE_IFUPDOWN_IP - if (!execute("[[ ip route del default via %gateway% dev %iface% ]]", ifd, exec)) - return(0); - if (!execute("ip -f inet addr flush dev %iface%", ifd, exec)) - return(0); - if (!execute("ip link set %iface% down", ifd, exec)) - return(0); + result = execute("ip addr flush dev %iface%", ifd, exec); + result += execute("ip link set %iface% down", ifd, exec); #else - if (!execute("[[ route del default gw %gateway% %iface% ]]", ifd, exec)) { - return(0); - } - if (!execute("ifconfig %iface% down", ifd, exec)) { - return(0); - } + result = execute("[[ route del default gw %gateway% %iface% ]]", ifd, exec); + result += execute("ifconfig %iface% down", ifd, exec); #endif - return(1); + return ((result == 2) ? 2 : 0); } static int execable(char *program) @@ -492,142 +463,125 @@ static int execable(char *program) return(0); } -static int dhcp_up(interface_defn_t *ifd, execfn *exec) +static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) { - if (execable("/sbin/dhclient")) { - if (!execute("dhclient -pf /var/run/dhclient.%iface%.pid %iface%", ifd, exec)) { - return(0); - } + if (execable("/sbin/udhcpc")) { + return( execute("udhcpc -n -p /var/run/udhcpc.%iface%.pid -i " + "%iface% [[-H %hostname%]] [[-c %clientid%]]", ifd, exec)); } else if (execable("/sbin/pump")) { - if (!execute("pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]", ifd, exec)) { - return(0); - } - } else if (execable("/sbin/udhcpc")) { - if (!execute("udhcpc -n -p /var/run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] [[-c %clientid%]]", ifd, exec)) { - return 0; - } + return( execute("pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]", ifd, exec)); + } else if (execable("/sbin/dhclient")) { + return( execute("dhclient -pf /var/run/dhclient.%iface%.pid %iface%", ifd, exec)); } else if (execable("/sbin/dhcpcd")) { - if (!execute("dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] [[-l %leasetime%]] %iface%", ifd, exec)) { - return(0); - } + return( execute("dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] " + "[[-l %leasetime%]] %iface%", ifd, exec)); } - return(1); + return(0); } -static int dhcp_down(interface_defn_t *ifd, execfn *exec) +static int dhcp_down(struct interface_defn_t *ifd, execfn *exec) { - if (execable("/sbin/dhclient")) { - if (!execute("kill -9 `cat /var/run/udhcpc.%iface%.pid`", ifd, exec)) { - return(0); - } + int result = 0; + if (execable("/sbin/udhcpc")) { + /* 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")) { - if (!execute("pump -i %iface% -k", ifd, exec)) { - return(0); - } - } else if (execable("/sbin/udhcpc")) { - if (!execute("kill -9 `cat /var/run/udhcpc.%iface%.pid`", ifd, exec)) { - return(0); - } + result = execute("pump -i %iface% -k", ifd, exec); + } else if (execable("/sbin/dhclient")) { + result = execute("kill -9 `cat /var/run/dhclient.%iface%.pid` 2>/dev/null", ifd, exec); } else if (execable("/sbin/dhcpcd")) { - if (!execute("dhcpcd -k %iface%", ifd, exec)) { - return(0); - } - } - if (!execute("ifconfig %iface% down", ifd, exec)) { - return(0); + result = execute("dhcpcd -k %iface%", ifd, exec); } - return(1); + return (result || static_down(ifd, exec)); } -static int bootp_up(interface_defn_t *ifd, execfn *exec) +static int bootp_up(struct interface_defn_t *ifd, execfn *exec) { - if (!execute("bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] [[--hwaddr %hwaddr%]] --returniffail --serverbcast", ifd, exec)) { - return 0; - } - return 1; + return( execute("bootpc [[--bootfile %bootfile%]] --dev %iface% " + "[[--server %server%]] [[--hwaddr %hwaddr%]] " + "--returniffail --serverbcast", ifd, exec)); } -static int bootp_down(interface_defn_t *ifd, execfn *exec) +static int ppp_up(struct interface_defn_t *ifd, execfn *exec) { - if (!execute("ifconfig down %iface%", ifd, exec)) { - return 0; - } - return 1; + return( execute("pon [[%provider%]]", ifd, exec)); } -static int ppp_up(interface_defn_t *ifd, execfn *exec) +static int ppp_down(struct interface_defn_t *ifd, execfn *exec) { - if (!execute("pon [[%provider%]]", ifd, exec)) { - return 0; - } - return 1; + return( execute("poff [[%provider%]]", ifd, exec)); } -static int ppp_down(interface_defn_t *ifd, execfn *exec) +static int wvdial_up(struct interface_defn_t *ifd, execfn *exec) { - if (!execute("poff [[%provider%]]", ifd, exec)) { - return 0; - } - return 1; + return( execute("/sbin/start-stop-daemon --start -x /usr/bin/wvdial " + "-p /var/run/wvdial.%iface% -b -m -- [[ %provider% ]]", ifd, exec)); } -static int wvdial_up(interface_defn_t *ifd, execfn *exec) +static int wvdial_down(struct interface_defn_t *ifd, execfn *exec) { - if (!execute("/sbin/start-stop-daemon --start -x /usr/bin/wvdial -p /var/run/wvdial.%iface% -b -m -- [[ %provider% ]]", ifd, exec)) { - return 0; - } - return 1; + return( execute("/sbin/start-stop-daemon --stop -x /usr/bin/wvdial " + "-p /var/run/wvdial.%iface% -s 2", ifd, exec)); } -static int wvdial_down(interface_defn_t *ifd, execfn *exec) +static struct method_t methods[] = { - if (!execute ("/sbin/start-stop-daemon --stop -x /usr/bin/wvdial -p /var/run/wvdial.%iface% -s 2", ifd, exec)) { - return 0; - } - return 1; -} - -static 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, }, }; -address_family_t addr_inet = { +static struct address_family_t addr_inet = +{ "inet", - sizeof(methods) / sizeof(method_t), + sizeof(methods) / sizeof(struct method_t), methods }; #endif /* ifdef CONFIG_FEATURE_IFUPDOWN_IPV4 */ -static char *next_word(char *buf, char *word, int maxlen) +static char *next_word(char **buf) { - if (!buf) - return NULL; - if (!*buf) + unsigned short length; + char *word; + + if ((buf == NULL) || (*buf == NULL) || (**buf == '\0')) { return NULL; + } - while (!isspace(*buf) && *buf) { - if (maxlen-- > 1) - *word++ = *buf; - buf++; + /* Skip over leading whitespace */ + word = *buf; + while (isspace(*word)) { + ++word; } - if (maxlen > 0) { - *word = '\0'; + + /* Skip over comments */ + if (*word == '#') { + return(NULL); } - while (isspace(*buf) && *buf) { - buf++; + /* Find the length of this word */ + length = strcspn(word, " \t\n"); + if (length == 0) { + return(NULL); + } + *buf = word + length; + /*DBU:[dave@cray.com] if we are already at EOL dont't increment beyond it */ + if (**buf) { + **buf = '\0'; + (*buf)++; } - return buf; + return word; } -static address_family_t *get_address_family(address_family_t *af[], char *name) +static struct address_family_t *get_address_family(struct address_family_t *af[], char *name) { int i; @@ -639,7 +593,7 @@ static address_family_t *get_address_family(address_family_t *af[], char *name) return NULL; } -static method_t *get_method(address_family_t *af, char *name) +static struct method_t *get_method(struct address_family_t *af, char *name) { int i; @@ -651,17 +605,6 @@ static method_t *get_method(address_family_t *af, char *name) return(NULL); } -static int duplicate_if(interface_defn_t *ifa, interface_defn_t *ifb) -{ - if (strcmp(ifa->iface, ifb->iface) != 0) { - return(0); - } - if (ifa->address_family != ifb->address_family) { - return(0); - } - return(1); -} - static const llist_t *find_list_string(const llist_t *list, const char *string) { while (list) { @@ -673,254 +616,227 @@ static const llist_t *find_list_string(const llist_t *list, const char *string) return(NULL); } -static interfaces_file_t *read_interfaces(char *filename) +static struct interfaces_file_t *read_interfaces(const char *filename) { - interface_defn_t *currif = NULL; - interfaces_file_t *defn; #ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING - mapping_defn_t *currmap = NULL; + struct mapping_defn_t *currmap = NULL; #endif + struct interface_defn_t *currif = NULL; + struct interfaces_file_t *defn; FILE *f; - char firstword[80]; - char *buf = NULL; - char *rest; -// int line; + char *firstword; + char *buf; enum { NONE, IFACE, MAPPING } currently_processing = NONE; - defn = xmalloc(sizeof(interfaces_file_t)); -// defn->max_autointerfaces = defn->n_autointerfaces = 0; - defn->autointerfaces = NULL; - defn->mappings = NULL; - defn->ifaces = NULL; - f = fopen(filename, "r"); - if (f == NULL) { - return NULL; - } + defn = xzalloc(sizeof(struct interfaces_file_t)); - while ((buf = get_line_from_file(f)) != NULL) { - char *end; + f = bb_xfopen(filename, "r"); - if (buf[0] == '#') { - continue; - } - end = last_char_is(buf, '\n'); - if (end) { - *end = '\0'; - } - while ((end = last_char_is(buf, ' ')) != NULL) { - *end = '\0'; - } - rest = next_word(buf, firstword, 80); - if (rest == NULL) { + while ((buf = bb_get_chomped_line_from_file(f)) != NULL) { + char *buf_ptr = buf; + + firstword = next_word(&buf_ptr); + if (firstword == NULL) { + free(buf); continue; /* blank line */ } if (strcmp(firstword, "mapping") == 0) { #ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING - currmap = xmalloc(sizeof(mapping_defn_t)); - currmap->max_matches = 0; - currmap->n_matches = 0; - currmap->match = NULL; + currmap = xzalloc(sizeof(struct mapping_defn_t)); - while ((rest = next_word(rest, firstword, 80))) { + while ((firstword = next_word(&buf_ptr)) != NULL) { if (currmap->max_matches == currmap->n_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); + currmap->match[currmap->n_matches++] = bb_xstrdup(firstword); } currmap->max_mappings = 0; currmap->n_mappings = 0; currmap->mapping = NULL; currmap->script = NULL; { - mapping_defn_t **where = &defn->mappings; + struct mapping_defn_t **where = &defn->mappings; while (*where != NULL) { where = &(*where)->next; } *where = currmap; currmap->next = NULL; } + debug_noise("Added mapping\n"); #endif currently_processing = MAPPING; } else if (strcmp(firstword, "iface") == 0) { { - char iface_name[80]; - char address_family_name[80]; - char method_name[80]; - address_family_t *addr_fams[] = { + char *iface_name; + char *address_family_name; + char *method_name; + struct address_family_t *addr_fams[] = { #ifdef CONFIG_FEATURE_IFUPDOWN_IPV4 &addr_inet, #endif #ifdef CONFIG_FEATURE_IFUPDOWN_IPV6 &addr_inet6, -#endif -#ifdef CONFIG_FEATURE_IFUPDOWN_IPX - &addr_ipx, #endif NULL }; - currif = xmalloc(sizeof(interface_defn_t)); - - rest = next_word(rest, iface_name, 80); - rest = next_word(rest, address_family_name, 80); - rest = next_word(rest, method_name, 80); + currif = xzalloc(sizeof(struct interface_defn_t)); + iface_name = next_word(&buf_ptr); + address_family_name = next_word(&buf_ptr); + method_name = next_word(&buf_ptr); - if (rest == NULL) { - error_msg("too few parameters for line \"%s\"", buf); + if (buf_ptr == NULL) { + bb_error_msg("too few parameters for line \"%s\"", buf); return NULL; } - if (rest[0] != '\0') { - error_msg("too many parameters \"%s\"", buf); + /* ship any trailing whitespace */ + while (isspace(*buf_ptr)) { + ++buf_ptr; + } + + if (buf_ptr[0] != '\0') { + bb_error_msg("too many parameters \"%s\"", buf); return NULL; } - currif->iface = xstrdup(iface_name); + currif->iface = bb_xstrdup(iface_name); currif->address_family = get_address_family(addr_fams, address_family_name); if (!currif->address_family) { - error_msg("unknown address type \"%s\"", buf); + bb_error_msg("unknown address type \"%s\"", address_family_name); return NULL; } currif->method = get_method(currif->address_family, method_name); if (!currif->method) { - error_msg("unknown method \"%s\"", buf); + bb_error_msg("unknown method \"%s\"", method_name); return NULL; } - currif->automatic = 1; - currif->max_options = 0; - currif->n_options = 0; - currif->option = NULL; - { - interface_defn_t **where = &defn->ifaces; - - while (*where != NULL) { - if (duplicate_if(*where, currif)) { - error_msg("duplicate interface \"%s\"", buf); + 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) && + (tmp->address_family == currif->address_family)) { + bb_error_msg("duplicate interface \"%s\"", tmp->iface); return NULL; } - where = &(*where)->next; } - *where = currif; - currif->next = NULL; + llist_add_to_end(&(defn->ifaces), (char*)currif); } + debug_noise("iface %s %s %s\n", currif->iface, address_family_name, method_name); } currently_processing = IFACE; } else if (strcmp(firstword, "auto") == 0) { - while ((rest = next_word(rest, firstword, 80))) { + while ((firstword = next_word(&buf_ptr)) != NULL) { /* Check the interface isnt already listed */ if (find_list_string(defn->autointerfaces, firstword)) { - perror_msg_and_die("interface declared auto twice \"%s\"", buf); + bb_perror_msg_and_die("interface declared auto twice \"%s\"", buf); } /* Add the interface to the list */ - defn->autointerfaces = llist_add_to(defn->autointerfaces, strdup(firstword)); + llist_add_to_end(&(defn->autointerfaces), bb_xstrdup(firstword)); + debug_noise("\nauto %s\n", firstword); } currently_processing = NONE; } else { switch (currently_processing) { - case IFACE: - { - int i; - - if (xstrlen(rest) == 0) { - error_msg("option with empty value \"%s\"", buf); - return NULL; - } + case IFACE: + { + int i; - if (strcmp(firstword, "up") != 0 - && strcmp(firstword, "down") != 0 - && strcmp(firstword, "pre-up") != 0 - && strcmp(firstword, "post-down") != 0) { - for (i = 0; i < currif->n_options; i++) { - if (strcmp(currif->option[i].name, firstword) == 0) { - error_msg("duplicate option \"%s\"", buf); + if (strlen(buf_ptr) == 0) { + bb_error_msg("option with empty value \"%s\"", buf); return NULL; } + + if (strcmp(firstword, "up") != 0 + && strcmp(firstword, "down") != 0 + && strcmp(firstword, "pre-up") != 0 + && strcmp(firstword, "post-down") != 0) { + for (i = 0; i < currif->n_options; i++) { + if (strcmp(currif->option[i].name, firstword) == 0) { + bb_error_msg("duplicate option \"%s\"", buf); + return NULL; + } + } + } } - } - } - if (currif->n_options >= currif->max_options) { - variable_t *opt; + if (currif->n_options >= currif->max_options) { + struct variable_t *opt; - currif->max_options = currif->max_options + 10; - opt = xrealloc(currif->option, sizeof(*opt) * currif->max_options); - currif->option = opt; - } - currif->option[currif->n_options].name = xstrdup(firstword); - currif->option[currif->n_options].value = xstrdup(rest); - if (!currif->option[currif->n_options].name) { - perror(filename); - return NULL; - } - if (!currif->option[currif->n_options].value) { - perror(filename); - return NULL; - } - currif->n_options++; - break; - case MAPPING: -#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING - if (strcmp(firstword, "script") == 0) { - if (currmap->script != NULL) { - error_msg("duplicate script in mapping \"%s\"", buf); + currif->max_options = currif->max_options + 10; + opt = xrealloc(currif->option, sizeof(*opt) * currif->max_options); + currif->option = opt; + } + currif->option[currif->n_options].name = bb_xstrdup(firstword); + currif->option[currif->n_options].value = bb_xstrdup(buf_ptr); + if (!currif->option[currif->n_options].name) { + perror(filename); return NULL; - } else { - currmap->script = xstrdup(rest); } - } else if (strcmp(firstword, "map") == 0) { - if (currmap->max_mappings == currmap->n_mappings) { - currmap->max_mappings = currmap->max_mappings * 2 + 1; - currmap->mapping = xrealloc(currmap->mapping, sizeof(char *) * currmap->max_mappings); + if (!currif->option[currif->n_options].value) { + perror(filename); + return NULL; + } + debug_noise("\t%s=%s\n", currif->option[currif->n_options].name, + currif->option[currif->n_options].value); + currif->n_options++; + break; + case MAPPING: +#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING + if (strcmp(firstword, "script") == 0) { + if (currmap->script != NULL) { + bb_error_msg("duplicate script in mapping \"%s\"", buf); + return NULL; + } else { + currmap->script = bb_xstrdup(next_word(&buf_ptr)); + } + } else if (strcmp(firstword, "map") == 0) { + if (currmap->max_mappings == currmap->n_mappings) { + currmap->max_mappings = currmap->max_mappings * 2 + 1; + currmap->mapping = xrealloc(currmap->mapping, sizeof(char *) * currmap->max_mappings); + } + currmap->mapping[currmap->n_mappings] = bb_xstrdup(next_word(&buf_ptr)); + currmap->n_mappings++; + } else { + bb_error_msg("misplaced option \"%s\"", buf); + return NULL; } - currmap->mapping[currmap->n_mappings] = xstrdup(rest); - currmap->n_mappings++; - } else { - error_msg("misplaced option \"%s\"", buf); - return NULL; - } #endif - break; - case NONE: - default: - error_msg("misplaced option \"%s\"", buf); - return NULL; + break; + case NONE: + default: + bb_error_msg("misplaced option \"%s\"", buf); + return NULL; } } + free(buf); } if (ferror(f) != 0) { - perror_msg("%s", filename); - return NULL; + bb_perror_msg_and_die("%s", filename); } fclose(f); return defn; } -static int check(char *str) -{ - return (str != NULL); -} - -static char *setlocalenv(char *format, char *name, char *value) +static char *setlocalenv(char *format, const char *name, const char *value) { char *result; char *here; char *there; - result = xmalloc(xstrlen(format) + xstrlen(name) + xstrlen(value) + 1); - - sprintf(result, format, name, value); + result = bb_xasprintf(format, name, value); for (here = there = result; *there != '=' && *there; there++) { if (*there == '-') @@ -933,57 +849,49 @@ static char *setlocalenv(char *format, char *name, char *value) here++; } } - memmove(here, there, xstrlen(there) + 1); + memmove(here, there, strlen(there) + 1); return result; } -static void set_environ(interface_defn_t *iface, char *mode) +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; - if (environ != NULL) { - for (ppch = environ; *ppch; ppch++) { + if (__myenviron != NULL) { + for (ppch = __myenviron; *ppch; ppch++) { free(*ppch); *ppch = NULL; } - free(environ); - environ = NULL; + free(__myenviron); } - environ = xmalloc(sizeof(char *) * (n_env_entries + 1 /* for final NULL */ )); - environend = environ; - *environend = NULL; + __myenviron = xzalloc(sizeof(char *) * (n_env_entries + 1 /* for final NULL */ )); + environend = __myenviron; for (i = 0; i < iface->n_options; i++) { if (strcmp(iface->option[i].name, "up") == 0 - || strcmp(iface->option[i].name, "down") == 0 - || strcmp(iface->option[i].name, "pre-up") == 0 - || strcmp(iface->option[i].name, "post-down") == 0) { + || strcmp(iface->option[i].name, "down") == 0 + || strcmp(iface->option[i].name, "pre-up") == 0 + || strcmp(iface->option[i].name, "post-down") == 0) { continue; } *(environend++) = setlocalenv("IF_%s=%s", iface->option[i].name, iface->option[i].value); - *environend = NULL; } *(environend++) = setlocalenv("%s=%s", "IFACE", iface->iface); - *environend = NULL; *(environend++) = setlocalenv("%s=%s", "ADDRFAM", iface->address_family->name); - *environend = NULL; *(environend++) = setlocalenv("%s=%s", "METHOD", iface->method->name); - *environend = NULL; *(environend++) = setlocalenv("%s=%s", "MODE", mode); - *environend = NULL; *(environend++) = setlocalenv("%s=%s", "PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"); - *environend = NULL; } static int doit(char *str) { if (verbose || no_act) { - error_msg("%s", str); + printf("%s\n", str); } if (!no_act) { pid_t child; @@ -991,11 +899,11 @@ static int doit(char *str) fflush(NULL); switch (child = fork()) { - case -1: /* failure */ - return 0; - case 0: /* child */ - execle("/bin/sh", "/bin/sh", "-c", str, NULL, environ); - exit(127); + case -1: /* failure */ + return 0; + case 0: /* child */ + execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, NULL, __myenviron); + exit(127); } waitpid(child, &status, 0); if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { @@ -1005,62 +913,47 @@ static int doit(char *str) return (1); } -static int execute_all(interface_defn_t *ifd, execfn *exec, const char *opt) +static int execute_all(struct interface_defn_t *ifd, const char *opt) { int i; char *buf; - for (i = 0; i < ifd->n_options; i++) { if (strcmp(ifd->option[i].name, opt) == 0) { - if (!(*exec) (ifd->option[i].value)) { + if (!doit(ifd->option[i].value)) { return 0; } } } - buf = xmalloc(xstrlen(opt) + 19); - sprintf(buf, "/etc/network/if-%s.d", opt); - run_parts(&buf, 0); - free(buf); - return (1); + buf = bb_xasprintf("run-parts /etc/network/if-%s.d", opt); + if (doit(buf) != 1) { + return 0; + } + return 1; } -static int iface_up(interface_defn_t *iface) -{ - if (!iface->method->up(iface, check)) { - return (-1); - } +static int check(char *str) { + return str != NULL; +} +static int iface_up(struct interface_defn_t *iface) +{ + if (!iface->method->up(iface,check)) return -1; set_environ(iface, "start"); - if (!execute_all(iface, doit, "pre-up")) { - return (0); - } - if (!iface->method->up(iface, doit)) { - return (0); - } - if (!execute_all(iface, doit, "up")) { - return (0); - } - - return (1); + if (!execute_all(iface, "pre-up")) return 0; + if (!iface->method->up(iface, doit)) return 0; + if (!execute_all(iface, "up")) return 0; + return 1; } -static int iface_down(interface_defn_t *iface) +static int iface_down(struct interface_defn_t *iface) { - if (!iface->method->down(iface, check)) { - return (-1); - } + if (!iface->method->down(iface,check)) return -1; set_environ(iface, "stop"); - if (!execute_all(iface, doit, "down")) { - return (0); - } - if (!iface->method->down(iface, doit)) { - return (0); - } - if (!execute_all(iface, doit, "post-down")) { - return (0); - } - return (1); + if (!execute_all(iface, "down")) return 0; + if (!iface->method->down(iface, doit)) return 0; + if (!execute_all(iface, "post-down")) return 0; + return 1; } #ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING @@ -1092,69 +985,91 @@ static int popen2(FILE **in, FILE **out, char *command, ...) 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]); - 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; + 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]); + 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; } /* unreached */ } -static int run_mapping(char *physical, char *logical, int len, mapping_defn_t * map) +static char *run_mapping(char *physical, struct mapping_defn_t * map) { FILE *in, *out; int i, status; pid_t pid; + char *logical = bb_xstrdup(physical); + /* Run the mapping script. */ pid = popen2(&in, &out, map->script, physical, NULL); - if (pid == 0) { - return 0; - } + + /* popen2() returns 0 on failure. */ + if (pid == 0) + return logical; + + /* Write mappings to stdin of mapping script. */ for (i = 0; i < map->n_mappings; i++) { fprintf(in, "%s\n", map->mapping[i]); } fclose(in); waitpid(pid, &status, 0); - if (WIFEXITED(status) && WEXITSTATUS(status) == 0) { - if (fgets(logical, len, out)) { - char *pch = logical + xstrlen(logical) - 1; - while (pch >= logical && isspace(*pch)) + if (WIFEXITED(status) && WEXITSTATUS(status) == 0) { + /* 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 = (char *)xmalloc(MAX_INTERFACE_LENGTH); + + if (fgets(new_logical, MAX_INTERFACE_LENGTH, out)) { + /* 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. */ + char *pch = new_logical + strlen(new_logical) - 1; + + while (pch >= new_logical && isspace(*pch)) *(pch--) = '\0'; + + free(logical); + logical = new_logical; + } else { + /* If we are UNABLE to read a line of output, discard our + * freshly allocated memory. */ + free(new_logical); } } + fclose(out); - return 1; + return logical; } -#endif /* CONFIG_FEATURE_IFUPDOWN_IPV6 */ +#endif /* CONFIG_FEATURE_IFUPDOWN_MAPPING */ static llist_t *find_iface_state(llist_t *state_list, const char *iface) { - unsigned short iface_len = xstrlen(iface); + unsigned short 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; @@ -1162,14 +1077,13 @@ static llist_t *find_iface_state(llist_t *state_list, const char *iface) return(NULL); } -extern int ifupdown_main(int argc, char **argv) +int ifupdown_main(int argc, char **argv) { - int (*cmds) (interface_defn_t *) = NULL; - interfaces_file_t *defn; - FILE *state_fp = NULL; + int (*cmds) (struct interface_defn_t *) = NULL; + struct interfaces_file_t *defn; 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 @@ -1177,9 +1091,10 @@ extern int ifupdown_main(int argc, char **argv) #endif int do_all = 0; int force = 0; + int any_failures = 0; int i; - if (applet_name[2] == 'u') { + if (bb_applet_name[2] == 'u') { /* ifup command */ cmds = iface_up; } else { @@ -1188,103 +1103,93 @@ extern int ifupdown_main(int argc, char **argv) } #ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING - while ((i = getopt(argc, argv, "i:hvnamf")) != -1) { + while ((i = getopt(argc, argv, "i:hvnamf")) != -1) #else - while ((i = getopt(argc, argv, "i:hvnaf")) != -1) { + while ((i = getopt(argc, argv, "i:hvnaf")) != -1) #endif - switch (i) { - case 'i': /* interfaces */ - interfaces = xstrdup(optarg); - break; - case 'v': /* verbose */ - verbose = 1; - break; - case 'a': /* all */ - do_all = 1; - break; - case 'n': /* no-act */ - no_act = 1; - break; + { + switch (i) { + case 'i': /* interfaces */ + interfaces = optarg; + break; + case 'v': /* verbose */ + verbose = 1; + break; + case 'a': /* all */ + do_all = 1; + break; + case 'n': /* no-act */ + no_act = 1; + break; #ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING - case 'm': /* no-mappings */ - run_mappings = 0; - break; + case 'm': /* no-mappings */ + run_mappings = 0; + break; #endif - case 'f': /* force */ - force = 1; - break; - default: - show_usage(); - break; + case 'f': /* force */ + force = 1; + break; + default: + bb_show_usage(); + break; + } } - } if (argc - optind > 0) { if (do_all) { - show_usage(); + bb_show_usage(); } } else { if (!do_all) { - show_usage(); + bb_show_usage(); } - } - - defn = read_interfaces(interfaces); - if (!defn) { - error_msg_and_die("couldn't read interfaces file \"%s\"", interfaces); } - if (no_act) { - state_fp = fopen(statefile, "r"); - } else { - state_fp = xfopen(statefile, "a+"); - } + debug_noise("reading %s file:\n", interfaces); + defn = read_interfaces(interfaces); + debug_noise("\ndone reading %s\n\n", interfaces); - /* Read the previous state from the state file */ - if (state_fp != NULL) { - char *start; - while ((start = get_line_from_file(state_fp)) != NULL) { - char *end_ptr; - /* We should only need to check for a single character */ - end_ptr = start + strcspn(start, " \t\n"); - *end_ptr = '\0'; - state_list = llist_add_to(state_list, start); - } + if (!defn) { + exit(EXIT_FAILURE); } /* Create a list of interfaces to work on */ if (do_all) { if (cmds == iface_up) { target_list = defn->autointerfaces; - } else if (cmds == iface_down) { + } else { + /* iface_down */ const llist_t *list = state_list; while (list) { - target_list = llist_add_to(target_list, strdup(list->data)); + llist_add_to_end(&target_list, bb_xstrdup(list->data)); list = list->link; } + target_list = defn->autointerfaces; } } else { - target_list = llist_add_to(target_list, argv[optind]); + llist_add_to_end(&target_list, argv[optind]); } /* Update the interfaces */ while (target_list) { - interface_defn_t *currif; + llist_t *iface_list; + struct interface_defn_t *currif; char *iface; char *liface; char *pch; int okay = 0; + int cmds_ret; - iface = strdup(target_list->data); + iface = bb_xstrdup(target_list->data); target_list = target_list->link; pch = strchr(iface, '='); if (pch) { *pch = '\0'; - liface = strdup(pch + 1); + liface = bb_xstrdup(pch + 1); } else { - liface = strdup(iface); + liface = bb_xstrdup(iface); } if (!force) { @@ -1293,23 +1198,21 @@ extern int ifupdown_main(int argc, char **argv) if (cmds == iface_up) { /* ifup */ if (iface_state) { - error_msg("interface %s already configured", iface); + bb_error_msg("interface %s already configured", iface); continue; } } else { /* ifdown */ - if (iface_state == NULL) { - error_msg("interface %s not configured", iface); + if (iface_state) { + bb_error_msg("interface %s not configured", iface); continue; } - pch = strchr(iface_state->data, '='); - liface = strdup(pch + 1); } } #ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING if ((cmds == iface_up) && run_mappings) { - mapping_defn_t *currmap; + struct mapping_defn_t *currmap; for (currmap = defn->mappings; currmap; currmap = currmap->next) { @@ -1317,77 +1220,71 @@ extern int ifupdown_main(int argc, char **argv) if (fnmatch(currmap->match[i], liface, 0) != 0) continue; if (verbose) { - error_msg("Running mapping script %s on %s", currmap->script, liface); + printf("Running mapping script %s on %s\n", currmap->script, liface); } - run_mapping(iface, liface, sizeof(liface), currmap); + liface = run_mapping(iface, currmap); break; } } } #endif - for (currif = defn->ifaces; currif; currif = currif->next) { + + iface_list = defn->ifaces; + while (iface_list) { + currif = (struct interface_defn_t *) iface_list->data; if (strcmp(liface, currif->iface) == 0) { char *oldiface = currif->iface; okay = 1; currif->iface = iface; - if (verbose) { - error_msg("Configuring interface %s=%s (%s)", iface, liface, currif->address_family->name); - } + 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) { - printf - ("Don't seem to be have all the variables for %s/%s.\n", - liface, currif->address_family->name); + 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; } + iface_list = iface_list->link; + } + if (verbose) { + printf("\n"); } if (!okay && !force) { - error_msg("Ignoring unknown interface %s=%s.", iface, liface); + bb_error_msg("Ignoring unknown interface %s", liface); + any_failures += 1; } else { llist_t *iface_state = find_iface_state(state_list, iface); if (cmds == iface_up) { - char *newiface = xmalloc(xstrlen(iface) + 1 + xstrlen(liface) + 1); - sprintf(newiface, "%s=%s", iface, liface); + char *newiface = bb_xasprintf("%s=%s", iface, liface); if (iface_state == NULL) { - state_list = llist_add_to(state_list, newiface); + llist_add_to_end(&state_list, newiface); } else { free(iface_state->data); iface_state->data = newiface; } - } else if (cmds == iface_down) { + } else { /* Remove an interface from the linked list */ - if (iface_state) { - /* This needs to be done better */ - free(iface_state->data); - free(iface_state->link); - if (iface_state->link) { - iface_state->data = iface_state->link->data; - iface_state->link = iface_state->link->link; - } else { - iface_state->data = NULL; - iface_state->link = NULL; - } - } + free(llist_pop(&iface_state)); } } } /* Actually write the new state */ - if (state_fp != NULL && !no_act) { - if (ftruncate(fileno(state_fp), 0) < 0) { - error_msg_and_die("failed to truncate statefile %s: %s", statefile, strerror(errno)); - } - - rewind(state_fp); + if (!no_act) { + FILE *state_fp = NULL; + state_fp = bb_xfopen(statefile, "w"); while (state_list) { if (state_list->data) { fputs(state_list->data, state_fp); @@ -1395,14 +1292,10 @@ extern int ifupdown_main(int argc, char **argv) } state_list = state_list->link; } - fflush(state_fp); - } - - /* Cleanup */ - if (state_fp != NULL) { fclose(state_fp); - state_fp = NULL; } + if (any_failures) + return 1; return 0; }