+/* vi: set sw=4 ts=4: */
/*
* ifupdown for busybox
- * Based on ifupdown by Anthony Towns
+ * Copyright (c) 2002 Glenn McGrath <bug1@optushome.com.au>
+ * Copyright (c) 2003 Erik Andersen <andersen@codepoet.org>
+ *
+ * Based on ifupdown v 0.6.4 by Anthony Towns
* Copyright (c) 1999 Anthony Towns <aj@azure.humbug.org.au>
*
- * Remove checks for kernel version, assume kernel version 2.2.0 or better
+ * Changes to upstream version
+ * Remove checks for kernel version, assume kernel version 2.2.0 or better.
+ * 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
#include <unistd.h>
#include "libbb.h"
-//#include "busybox.h"
-//#include "config.h"
-#define IFUPDOWN_VERSION "0.6.4"
+#define MAX_OPT_DEPTH 10
+#define EUNBALBRACK 10001
+#define EUNDEFVAR 10002
+#define EUNBALPER 10000
-typedef struct interface_defn interface_defn;
+#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 *ifd, execfn *e);
+typedef int (command_set)(struct interface_defn_t *ifd, execfn *e);
+
+extern llist_t *llist_add_to_end(llist_t *list_head, char *data)
+{
+ llist_t *new_item, *tmp, *prev;
+
+ new_item = xmalloc(sizeof(llist_t));
+ new_item->data = data;
+ new_item->link = NULL;
+
+ prev = NULL;
+ tmp = list_head;
+ while(tmp) {
+ prev = tmp;
+ tmp = tmp->link;
+ }
+ if (prev) {
+ prev->link = new_item;
+ } else {
+ list_head = new_item;
+ }
+
+ return(list_head);
+}
-typedef struct method {
+struct method_t
+{
char *name;
command_set *up;
command_set *down;
-} method;
+};
-typedef struct address_family {
+struct address_family_t
+{
char *name;
int n_methods;
- method *method;
-} address_family;
+ struct method_t *method;
+};
-typedef struct mapping_defn {
- struct mapping_defn *next;
+struct mapping_defn_t
+{
+ struct mapping_defn_t *next;
int max_matches;
int n_matches;
int max_mappings;
int n_mappings;
char **mapping;
-} mapping_defn;
+};
-typedef struct variable {
+struct variable_t
+{
char *name;
char *value;
-} variable;
+};
-struct interface_defn {
- struct interface_defn *next;
+struct interface_defn_t
+{
+ struct interface_defn_t *prev;
+ struct interface_defn_t *next;
char *iface;
- address_family *address_family;
- method *method;
+ struct address_family_t *address_family;
+ struct method_t *method;
int automatic;
int max_options;
int n_options;
- variable *option;
+ struct variable_t *option;
};
-typedef struct interfaces_file {
- int max_autointerfaces;
- int n_autointerfaces;
- char **autointerfaces;
+struct interfaces_file_t
+{
+ llist_t *autointerfaces;
+ llist_t *ifaces;
+ struct mapping_defn_t *mappings;
+};
- interface_defn *ifaces;
- mapping_defn *mappings;
-} interfaces_file;
+static char no_act = 0;
+static char verbose = 0;
+static char **environ = NULL;
-#define MAX_OPT_DEPTH 10
-#define EUNBALBRACK 10001
-#define EUNDEFVAR 10002
-#define MAX_VARNAME 32
-#define EUNBALPER 10000
+#ifdef CONFIG_FEATURE_IFUPDOWN_IP
-static int no_act = 0;
-static int verbose = 0;
-static char **environ = NULL;
+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
static void addstr(char **buf, size_t *len, size_t *pos, char *str, size_t str_length)
{
}
}
-static char *get_var(char *id, size_t idlen, interface_defn *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++) {
return(NULL);
}
-static char *parse(char *command, interface_defn *ifd)
+static char *parse(char *command, struct interface_defn_t *ifd)
{
char *result = NULL;
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, bb_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, bb_strlen(argument));
+ command = nextpercent + 1;
+ break;
+ }
+ }
+#endif
+ okay[opt_depth - 1] = 0;
+ }
- command = nextpercent + 1;
- }
- break;
+ command = nextpercent + 1;
+ }
+ break;
}
}
return(result);
}
-static int execute(char *command, interface_defn *ifd, execfn *exec)
+static int execute(char *command, struct interface_defn_t *ifd, execfn *exec)
{
char *out;
int ret;
if (!out) {
return(0);
}
-
ret = (*exec) (out);
free(out);
- return(ret);
+ return(1);
}
#ifdef CONFIG_FEATURE_IFUPDOWN_IPX
-static int static_up_ipx(interface_defn *ifd, execfn *exec)
+static int static_up_ipx(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ipx_interface add %iface% %frame% %netnum%", ifd, exec)) {
- return(0);
- }
- return(1);
+ return(execute("ipx_interface add %iface% %frame% %netnum%", ifd, exec));
}
-static int static_down_ipx(interface_defn *ifd, execfn *exec)
+static int static_down_ipx(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ipx_interface del %iface% %frame%", ifd, exec)) {
- return(0);
- }
- return(1);
+ return(execute("ipx_interface del %iface% %frame%", ifd, exec));
}
-static int dynamic_up(interface_defn *ifd, execfn *exec)
+static int dynamic_up(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ipx_interface add %iface% %frame%", ifd, exec)) {
- return(0);
- }
- return(1);
+ return(execute("ipx_interface add %iface% %frame%", ifd, exec));
}
-static int dynamic_down(interface_defn *ifd, execfn *exec)
+static int dynamic_down(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ipx_interface del %iface% %frame%", ifd, exec)) {
- return(0);
- }
- return(1);
+ return(execute("ipx_interface del %iface% %frame%", ifd, exec));
}
-static method methods_ipx[] = {
+static struct method_t methods_ipx[] = {
{ "dynamic", dynamic_up, dynamic_down, },
{ "static", static_up_ipx, static_down_ipx, },
};
-address_family addr_ipx = {
+struct address_family_t addr_ipx = {
"ipx",
- sizeof(methods_ipx) / sizeof(struct method),
+ sizeof(methods_ipx) / sizeof(struct method_t),
methods_ipx
};
#endif /* IFUP_FEATURE_IPX */
#ifdef CONFIG_FEATURE_IFUPDOWN_IPV6
-static int loopback_up6(interface_defn *ifd, execfn *exec)
+static int loopback_up6(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ifconfig %iface% add ::1", ifd, exec)) {
- return(0);
- }
- return(1);
+#ifdef CONFIG_FEATURE_IFUPDOWN_IP
+ int result;
+ result =execute("ip addr add ::1 dev %iface% label %label%", ifd, exec);
+ result += execute("ip link set %iface% up", ifd, exec);
+ return( result);
+#else
+ return( execute("ifconfig %iface% add ::1", ifd, exec));
+#endif
}
-static int loopback_down6(interface_defn *ifd, execfn *exec)
+static int loopback_down6(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ifconfig %iface% del ::1", ifd, exec)) {
- return(0);
- }
- return(1);
+#ifdef CONFIG_FEATURE_IFUPDOWN_IP
+ return(execute("ip link set %iface% down", ifd, exec));
+#else
+ return(execute("ifconfig %iface% del ::1", ifd, exec));
+#endif
}
-static int static_up6(interface_defn *ifd, execfn *exec)
+static int static_up6(struct interface_defn_t *ifd, execfn *exec)
{
- 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);
- }
- return(1);
+ int result;
+#ifdef CONFIG_FEATURE_IFUPDOWN_IP
+ result = execute("ip addr add %address%/%netmask% dev %iface% label %label%", ifd, exec);
+ result += execute("ip link set %iface% up", ifd, exec);
+ result += execute("[[ ip route add ::/0 via %gateway% ]]", 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);
+ result += execute("[[ route -A inet6 add ::/0 gw %gateway% ]]", ifd, exec);
+#endif
+ return( result);
}
-static int static_down6(interface_defn *ifd, execfn *exec)
+static int static_down6(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ifconfig %iface% down", ifd, exec)) {
- return(0);
- }
- return(1);
+#ifdef CONFIG_FEATURE_IFUPDOWN_IP
+ return(execute("ip link set %iface% down", ifd, exec));
+#else
+ return(execute("ifconfig %iface% down", ifd, exec));
+#endif
}
-static int v4tunnel_up(interface_defn *ifd, execfn *exec)
+#ifdef CONFIG_FEATURE_IFUPDOWN_IP
+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 addr add %address%/%netmask% dev %iface% label %label%", ifd, exec);
+ result += execute("ip link set %iface% up", ifd, exec);
+ result += execute("[[ ip route add ::/0 via %gateway% ]]", ifd, exec);
+ return( result);
}
-static int v4tunnel_down(interface_defn * 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 methods6[] = {
+static struct method_t methods6[] = {
+#ifdef CONFIG_FEATURE_IFUPDOWN_IP
{ "v4tunnel", v4tunnel_up, v4tunnel_down, },
+#endif
{ "static", static_up6, static_down6, },
{ "loopback", loopback_up6, loopback_down6, },
};
-address_family addr_inet6 = {
+struct address_family_t addr_inet6 = {
"inet6",
- sizeof(methods6) / sizeof(struct method),
+ sizeof(methods6) / sizeof(struct method_t),
methods6
};
#endif /* CONFIG_FEATURE_IFUPDOWN_IPV6 */
#ifdef CONFIG_FEATURE_IFUPDOWN_IPV4
-static int loopback_up(interface_defn *ifd, execfn *exec)
+static int loopback_up(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ifconfig %iface% 127.0.0.1 up", ifd, exec)) {
- return(0);
- }
- return(1);
+#ifdef CONFIG_FEATURE_IFUPDOWN_IP
+ int result;
+ result = execute("ip addr add 127.0.0.1/8 dev %iface% label %label%", ifd, exec);
+ result += execute("ip link set %iface% up", ifd, exec);
+ return(result);
+#else
+ return( execute("ifconfig %iface% 127.0.0.1 up", ifd, exec));
+#endif
}
-static int loopback_down(interface_defn *ifd, execfn *exec)
+static int loopback_down(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ifconfig %iface% down", ifd, exec)) {
- return(0);
- }
- return(1);
+#ifdef CONFIG_FEATURE_IFUPDOWN_IP
+ int result;
+ result = execute("ip addr flush dev %iface%", ifd, exec);
+ result += execute("ip link set %iface% down", ifd, exec);
+ return(result);
+#else
+ return( execute("ifconfig %iface% 127.0.0.1 down", ifd, exec));
+#endif
}
-static int static_up(interface_defn *ifd, execfn *exec)
+static int static_up(struct interface_defn_t *ifd, execfn *exec)
{
- 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);
- }
- return(1);
+ int result;
+#ifdef CONFIG_FEATURE_IFUPDOWN_IP
+ result = execute("ip addr add %address%/%bnmask% [[broadcast %broadcast%]] "
+ "dev %iface% label %label%", ifd, exec);
+ result += execute("ip link set %iface% up", ifd, exec);
+ result += execute("[[ ip route add default via %gateway% dev %iface% ]]", ifd, exec);
+#else
+ result = execute("ifconfig %iface% %address% netmask %netmask% "
+ "[[broadcast %broadcast%]] [[pointopoint %pointopoint%]] "
+ "[[media %media%]] [[mtu %mtu%]] [[hw %hwaddress%]] up",
+ ifd, exec);
+ result += execute("[[ route add default gw %gateway% %iface% ]]", ifd, exec);
+#endif
+ return(result);
}
-static int static_down(interface_defn *ifd, execfn *exec)
+static int static_down(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("[[ route del default gw %gateway% %iface% ]]", ifd, exec)) {
- return(0);
- }
- if (!execute("ifconfig %iface% down", ifd, exec)) {
- return(0);
- }
- return(1);
+ int result;
+#ifdef CONFIG_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("ifconfig %iface% down", ifd, exec);
+#endif
+ return(result);
}
static int execable(char *program)
return(0);
}
-static int dhcp_up(interface_defn *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 *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")) {
+ execute("kill -9 `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")) {
+ execute("kill -9 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
} else if (execable("/sbin/dhcpcd")) {
- if (!execute("dhcpcd -k %iface%", ifd, exec)) {
- return(0);
- }
+ result = execute("dhcpcd -k %iface%", ifd, exec);
}
- if (!execute("ifconfig %iface% down", ifd, exec)) {
- return(0);
- }
- return(1);
+ return (result || execute("ifconfig %iface% down", ifd, exec));
}
-static int bootp_up(interface_defn *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 *ifd, execfn *exec)
+static int bootp_down(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ifconfig down %iface%", ifd, exec)) {
- return 0;
- }
- return 1;
+ return( execute("ifconfig down %iface%", ifd, exec));
}
-static int ppp_up(interface_defn *ifd, execfn *exec)
+static int ppp_up(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("pon [[%provider%]]", ifd, exec)) {
- return 0;
- }
- return 1;
+ return( execute("pon [[%provider%]]", ifd, exec));
}
-static int ppp_down(interface_defn *ifd, execfn *exec)
+static int ppp_down(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("poff [[%provider%]]", ifd, exec)) {
- return 0;
- }
- return 1;
+ return( execute("poff [[%provider%]]", ifd, exec));
}
-static int wvdial_up(interface_defn *ifd, execfn *exec)
+static int wvdial_up(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 --start -x /usr/bin/wvdial "
+ "-p /var/run/wvdial.%iface% -b -m -- [[ %provider% ]]", ifd, exec));
}
-static int wvdial_down(interface_defn *ifd, execfn *exec)
+static int wvdial_down(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute ("/sbin/start-stop-daemon --stop -x /usr/bin/wvdial -p /var/run/wvdial.%iface% -s 2", 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 method methods[] = {
+static struct method_t methods[] =
+{
{ "wvdial", wvdial_up, wvdial_down, },
{ "ppp", ppp_up, ppp_down, },
{ "static", static_up, static_down, },
{ "loopback", loopback_up, loopback_down, },
};
-address_family addr_inet = {
+struct address_family_t addr_inet =
+{
"inet",
- sizeof(methods) / sizeof(struct method),
+ 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 *get_address_family(address_family *af[], char *name)
+static struct address_family_t *get_address_family(struct address_family_t *af[], char *name)
{
int i;
return NULL;
}
-static method *get_method(address_family *af, char *name)
+static struct method_t *get_method(struct address_family_t *af, char *name)
{
int i;
return(NULL);
}
-static int duplicate_if(interface_defn *ifa, interface_defn *ifb)
+static int duplicate_if(struct interface_defn_t *ifa, struct interface_defn_t *ifb)
{
if (strcmp(ifa->iface, ifb->iface) != 0) {
return(0);
return(1);
}
-static int get_line(char **result, size_t * result_len, FILE * f, int *line)
+static const llist_t *find_list_string(const llist_t *list, const char *string)
{
- size_t pos;
-
- do {
- pos = 0;
- do {
- if (*result_len - pos < 10) {
- char *newstr = xrealloc(*result, *result_len * 2 + 80);
- *result = newstr;
- *result_len = *result_len * 2 + 80;
- }
-
- if (!fgets(*result + pos, *result_len - pos, f)) {
- if (ferror(f) == 0 && pos == 0)
- return 0;
- if (ferror(f) != 0)
- return 0;
- }
- pos += xstrlen(*result + pos);
- } while (pos == *result_len - 1 && (*result)[pos - 1] != '\n');
-
- if (pos != 0 && (*result)[pos - 1] == '\n') {
- (*result)[--pos] = '\0';
- }
-
- (*line)++;
- {
- int first = 0;
-
- while (isspace((*result)[first]) && (*result)[first]) {
- first++;
- }
-
- memmove(*result, *result + first, pos - first + 1);
- pos -= first;
+ while (list) {
+ if (strcmp(list->data, string) == 0) {
+ return(list);
}
- } while ((*result)[0] == '#');
-
- while ((*result)[pos - 1] == '\\') {
- (*result)[--pos] = '\0';
- do {
- if (*result_len - pos < 10) {
- char *newstr = xrealloc(*result, *result_len * 2 + 80);
- *result = newstr;
- *result_len = *result_len * 2 + 80;
- }
-
- if (!fgets(*result + pos, *result_len - pos, f)) {
- if (ferror(f) == 0 && pos == 0)
- return 0;
- if (ferror(f) != 0)
- return 0;
- }
- pos += xstrlen(*result + pos);
- } while (pos == *result_len - 1 && (*result)[pos - 1] != '\n');
-
- if (pos != 0 && (*result)[pos - 1] == '\n') {
- (*result)[--pos] = '\0';
- }
- (*line)++;
- }
-
- while (isspace((*result)[pos - 1])) { /* remove trailing whitespace */
- pos--;
+ list = list->link;
}
- (*result)[pos] = '\0';
-
- return 1;
+ return(NULL);
}
-static interfaces_file *read_interfaces(char *filename)
+static struct interfaces_file_t *read_interfaces(char *filename)
{
- interface_defn *currif = NULL;
- interfaces_file *defn;
- mapping_defn *currmap = NULL;
+#ifdef CONFIG_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[80];
- char *buf = NULL;
- char *rest;
- int line;
- size_t buf_len = 0;
+ char *firstword;
+ char *buf;
enum { NONE, IFACE, MAPPING } currently_processing = NONE;
- defn = xmalloc(sizeof(interfaces_file));
- defn->max_autointerfaces = defn->n_autointerfaces = 0;
+ defn = xmalloc(sizeof(struct interfaces_file_t));
defn->autointerfaces = NULL;
defn->mappings = NULL;
defn->ifaces = NULL;
- f = fopen(filename, "r");
- if (f == NULL) {
- return NULL;
- }
- line = 0;
- while (get_line(&buf, &buf_len, f, &line)) {
- rest = next_word(buf, firstword, 80);
- if (rest == NULL) {
+ f = bb_xfopen(filename, "r");
+
+ 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) {
- currmap = xmalloc(sizeof(mapping_defn));
+#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
+ currmap = xmalloc(sizeof(struct mapping_defn_t));
currmap->max_matches = 0;
currmap->n_matches = 0;
currmap->match = NULL;
- 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 **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 *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
NULL
};
- currif = xmalloc(sizeof(interface_defn));
-
- rest = next_word(rest, iface_name, 80);
- rest = next_word(rest, address_family_name, 80);
- rest = next_word(rest, method_name, 80);
+ currif = xmalloc(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("%s:%d: too few parameters for iface line", filename, line);
+ if (buf_ptr == NULL) {
+ bb_error_msg("too few parameters for line \"%s\"", buf);
return NULL;
}
- if (rest[0] != '\0') {
- error_msg("%s:%d: too many parameters for iface line", filename, line);
+ /* 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("%s:%d: unknown address type", filename, line);
+ bb_error_msg("unknown address type \"%s\"", buf);
return NULL;
}
currif->method = get_method(currif->address_family, method_name);
if (!currif->method) {
- error_msg("%s:%d: unknown method", filename, line);
+ bb_error_msg("unknown method \"%s\"", buf);
return NULL;
}
currif->n_options = 0;
currif->option = NULL;
-
{
- interface_defn **where = &defn->ifaces;
-
- while (*where != NULL) {
- if (duplicate_if(*where, currif)) {
- error_msg("%s:%d: duplicate interface", filename, line);
+ struct interface_defn_t *tmp;
+ llist_t *iface_list;
+ iface_list = defn->ifaces;
+ while (iface_list) {
+ tmp = (struct interface_defn_t *) iface_list->data;
+ if (duplicate_if(tmp, currif)) {
+ bb_error_msg("duplicate interface \"%s\"", tmp->iface);
return NULL;
}
- where = &(*where)->next;
+ iface_list = iface_list->link;
}
- *where = currif;
- currif->next = NULL;
+ defn->ifaces = 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))) {
- int i;
-
- for (i = 0; i < defn->n_autointerfaces; i++) {
- if (strcmp(firstword, defn->autointerfaces[i]) == 0) {
- perror_msg("%s:%d: interface declared auto twice", filename, line);
- return NULL;
- }
- }
-
- if (defn->n_autointerfaces == defn->max_autointerfaces) {
- char **tmp;
+ while ((firstword = next_word(&buf_ptr)) != NULL) {
- defn->max_autointerfaces *= 2;
- defn->max_autointerfaces++;
- tmp = xrealloc(defn->autointerfaces, sizeof(*tmp) * defn->max_autointerfaces);
- defn->autointerfaces = tmp;
+ /* Check the interface isnt already listed */
+ if (find_list_string(defn->autointerfaces, firstword)) {
+ bb_perror_msg_and_die("interface declared auto twice \"%s\"", buf);
}
- defn->autointerfaces[defn->n_autointerfaces] = xstrdup(firstword);
- defn->n_autointerfaces++;
+ /* Add the interface to the list */
+ defn->autointerfaces = llist_add_to_end(defn->autointerfaces, strdup(firstword));
+ debug_noise("\nauto %s\n", firstword);
}
currently_processing = NONE;
} else {
switch (currently_processing) {
- case IFACE:
- {
- int i;
+ case IFACE:
+ {
+ int i;
- if (xstrlen(rest) == 0) {
- error_msg("%s:%d: option with empty value", filename, line);
- 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) {
- error_msg("%s:%d: duplicate option", filename, line);
+ if (bb_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 *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:
- if (strcmp(firstword, "script") == 0) {
- if (currmap->script != NULL) {
- error_msg("%s:%d: duplicate script in mapping", filename, line);
+ 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;
}
- currmap->mapping[currmap->n_mappings] = xstrdup(rest);
- currmap->n_mappings++;
- } else {
- error_msg("%s:%d: misplaced option", filename, line);
+ 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;
+ }
+#endif
+ break;
+ case NONE:
+ default:
+ bb_error_msg("misplaced option \"%s\"", buf);
return NULL;
- }
- break;
- case NONE:
- default:
- error_msg("%s:%d: misplaced option", filename, line);
- return NULL;
}
}
+ free(buf);
}
if (ferror(f) != 0) {
- perror_msg("%s", filename);
- return NULL;
+ bb_perror_msg_and_die("%s", filename);
}
fclose(f);
- line = -1;
return defn;
}
-static int check(char *str)
-{
- return (str != NULL);
-}
-
static char *setlocalenv(char *format, char *name, char *value)
{
char *result;
char *here;
char *there;
- result = xmalloc(xstrlen(format) + xstrlen(name) + xstrlen(value) + 1);
+ result = xmalloc(bb_strlen(format) + bb_strlen(name) + bb_strlen(value) + 1);
sprintf(result, format, name, value);
here++;
}
}
- memmove(here, there, xstrlen(there) + 1);
+ memmove(here, there, bb_strlen(there) + 1);
return result;
}
-static void set_environ(interface_defn *iface, char *mode)
+static void set_environ(struct interface_defn_t *iface, char *mode)
{
char **environend;
int i;
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);
static int doit(char *str)
{
if (verbose || no_act) {
- error_msg("%s", str);
+ printf("%s\n", str);
}
if (!no_act) {
pid_t child;
fflush(NULL);
switch (child = fork()) {
- case -1: /* failure */
- return 0;
- case 0: /* child */
- execle("/bin/sh", "/bin/sh", "-c", str, NULL, environ);
- exit(127);
- default: /* parent */
+ case -1: /* failure */
+ return 0;
+ case 0: /* child */
+ execle("/bin/sh", "/bin/sh", "-c", str, NULL, environ);
+ exit(127);
}
waitpid(child, &status, 0);
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
return (1);
}
-static int execute_all(interface_defn *ifd, execfn *exec, const char *opt)
+static int execute_all(struct interface_defn_t *ifd, execfn *exec, const char *opt)
{
int i;
char *buf;
}
}
- buf = xmalloc(xstrlen(opt) + 19);
+ buf = xmalloc(bb_strlen(opt) + 19);
sprintf(buf, "/etc/network/if-%s.d", opt);
- run_parts(&buf, 0);
+ run_parts(&buf, 2);
free(buf);
return (1);
}
-static int iface_up(interface_defn *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)
+{
+ int result;
+ 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);
+ result = execute_all(iface, doit, "pre-up");
+ result += iface->method->up(iface, doit);
+ result += execute_all(iface, doit, "up");
+ return(result);
}
-static int iface_down(interface_defn *iface)
+static int iface_down(struct interface_defn_t *iface)
{
- if (!iface->method->down(iface, check)) {
- return (-1);
- }
+ int result;
+ 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);
+ result = execute_all(iface, doit, "down");
+ result += iface->method->down(iface, doit);
+ result += execute_all(iface, doit, "post-down");
+ return(result);
}
+#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
static int popen2(FILE **in, FILE **out, char *command, ...)
{
va_list ap;
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 * 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 + bb_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 are
+ * freshly allocated memory. */
+ free(new_logical);
}
}
+
fclose(out);
- return 1;
+ return logical;
}
+#endif /* CONFIG_FEATURE_IFUPDOWN_MAPPING */
-
-static int lookfor_iface(char **ifaces, int n_ifaces, char *iface)
+static llist_t *find_iface_state(llist_t *state_list, const char *iface)
{
- int i;
+ unsigned short iface_len = bb_strlen(iface);
+ llist_t *search = state_list;
- for (i = 0; i < n_ifaces; i++) {
- if (strncmp(iface, ifaces[i], xstrlen(iface)) == 0) {
- if (ifaces[i][xstrlen(iface)] == '=') {
- return i;
- }
+ while (search) {
+ if ((strncmp(search->data, iface, iface_len) == 0) &&
+ (search->data[iface_len] == '=')) {
+ return(search);
}
+ search = search->link;
}
-
- return(-1);
-}
-
-static void add_to_state(char ***ifaces, int *n_ifaces, int *max_ifaces, char *new_iface)
-{
- if (*max_ifaces == *n_ifaces) {
- *max_ifaces = (*max_ifaces * 2) + 1;
- *ifaces = xrealloc(*ifaces, sizeof(**ifaces) * *max_ifaces);
- }
-
- (*ifaces)[(*n_ifaces)++] = new_iface;
+ return(NULL);
}
extern int ifupdown_main(int argc, char **argv)
{
- int (*cmds) (interface_defn *) = NULL;
- interfaces_file *defn;
+ int (*cmds) (struct interface_defn_t *) = NULL;
+ struct interfaces_file_t *defn;
FILE *state_fp = NULL;
- char **target_iface = NULL;
- char **state = NULL; /* list of iface=liface */
+ llist_t *state_list = NULL;
+ llist_t *target_list = NULL;
char *interfaces = "/etc/network/interfaces";
- char *statefile = "/etc/network/ifstate";
+ const char *statefile = "/var/run/ifstate";
- int do_all = 0;
+#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
int run_mappings = 1;
+#endif
+ int do_all = 0;
int force = 0;
- int n_target_ifaces = 0;
- int n_state = 0;
- int max_state = 0;
int i;
- if (applet_name[2] == 'u') {
+ if (bb_applet_name[2] == 'u') {
/* ifup command */
cmds = iface_up;
} else {
cmds = iface_down;
}
- while ((i = getopt(argc, argv, "i:hvnamf")) != -1) {
- 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;
- case 'm': /* no-mappings */
- run_mappings = 0;
- break;
- case 'f': /* force */
- force = 1;
- break;
- default:
- show_usage();
- break;
+#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
+ while ((i = getopt(argc, argv, "i:hvnamf")) != -1)
+#else
+ while ((i = getopt(argc, argv, "i:hvnaf")) != -1)
+#endif
+ {
+ switch (i) {
+ case 'i': /* interfaces */
+ interfaces = bb_xstrdup(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;
+#endif
+ 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();
}
}
+ debug_noise("reading %s file:\n", interfaces);
defn = read_interfaces(interfaces);
- if (!defn) {
- error_msg_and_die("couldn't read interfaces file \"%s\"", interfaces);
- }
+ debug_noise("\ndone reading %s\n\n", interfaces);
- state_fp = fopen(statefile, no_act ? "r" : "a+");
- if (state_fp == NULL && !no_act) {
- perror_msg_and_die("failed to open statefile %s", statefile);
+ if (!defn) {
+ exit(EXIT_FAILURE);
}
- if (state_fp != NULL) {
- char buf[80];
- char *p;
-
- if (!no_act) {
- int flags;
- struct flock lock;
- const int state_fd = fileno(state_fp);
-
- flags = fcntl(state_fd, F_GETFD);
- if ((flags < 0) || (fcntl(state_fd, F_SETFD, flags | FD_CLOEXEC) < 0)) {
- perror_msg_and_die("failed to set FD_CLOEXEC on statefile %s", statefile);
- }
-
- lock.l_type = F_WRLCK;
- lock.l_whence = SEEK_SET;
- lock.l_start = 0;
- lock.l_len = 0;
-
- if (fcntl(state_fd, F_SETLKW, &lock) < 0) {
- perror_msg_and_die("failed to lock statefile %s", statefile);
- }
- }
-
- rewind(state_fp);
- while ((p = fgets(buf, sizeof buf, state_fp)) != NULL) {
- char *pch;
-
- pch = buf + xstrlen(buf) - 1;
- while (pch > buf && isspace(*pch)) {
- pch--;
- }
- *(pch + 1) = '\0';
-
- pch = buf;
- while (isspace(*pch)) {
- pch++;
- }
-
- add_to_state(&state, &n_state, &max_state, xstrdup(pch));
- }
+ if (no_act) {
+ state_fp = fopen(statefile, "r");
}
+ /* Create a list of interfaces to work on */
if (do_all) {
if (cmds == iface_up) {
- target_iface = defn->autointerfaces;
- n_target_ifaces = defn->n_autointerfaces;
- } else if (cmds == iface_down) {
- target_iface = state;
- n_target_ifaces = n_state;
- }
+ target_list = defn->autointerfaces;
+ } else {
+#if 0
+ /* iface_down */
+ llist_t *new_item;
+ const llist_t *list = state_list;
+ while (list) {
+ new_item = xmalloc(sizeof(llist_t));
+ new_item->data = strdup(list->data);
+ new_item->link = NULL;
+ list = target_list;
+ if (list == NULL)
+ target_list = new_item;
+ else {
+ while (list->link) {
+ list = list->link;
+ }
+ list = new_item;
+ }
+ list = list->link;
+ }
+ target_list = defn->autointerfaces;
+#else
+
+ /* iface_down */
+ const llist_t *list = state_list;
+ while (list) {
+ target_list = llist_add_to_end(target_list, strdup(list->data));
+ list = list->link;
+ }
+ target_list = defn->autointerfaces;
+#endif
+ }
} else {
- target_iface = argv + optind;
- n_target_ifaces = argc - optind;
+ target_list = llist_add_to_end(target_list, argv[optind]);
}
- for (i = 0; i < n_target_ifaces; i++) {
- interface_defn *currif;
- char iface[80];
- char liface[80];
+ /* Update the interfaces */
+ while (target_list) {
+ llist_t *iface_list;
+ struct interface_defn_t *currif;
+ char *iface;
+ char *liface;
char *pch;
int okay = 0;
- strncpy(iface, target_iface[i], sizeof(iface));
- iface[sizeof(iface) - 1] = '\0';
+ iface = strdup(target_list->data);
+ target_list = target_list->link;
- if ((pch = strchr(iface, '='))) {
+ pch = strchr(iface, '=');
+ if (pch) {
*pch = '\0';
- strncpy(liface, pch + 1, sizeof(liface));
- liface[sizeof(liface) - 1] = '\0';
+ liface = strdup(pch + 1);
} else {
- strncpy(liface, iface, sizeof(liface));
- liface[sizeof(liface) - 1] = '\0';
+ liface = strdup(iface);
}
+
if (!force) {
- int already_up = lookfor_iface(state, n_state, iface);;
+ const llist_t *iface_state = find_iface_state(state_list, iface);
if (cmds == iface_up) {
/* ifup */
- if (already_up != -1) {
- error_msg("interface %s already configured", iface);
+ if (iface_state) {
+ bb_error_msg("interface %s already configured", iface);
continue;
}
} else {
/* ifdown */
- if (already_up == -1) {
- error_msg("interface %s not configured", iface);
+ if (iface_state) {
+ bb_error_msg("interface %s not configured", iface);
continue;
}
- strncpy(liface, strchr(state[already_up], '=') + 1, 80);
- liface[79] = 0;
}
}
+
+#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
if ((cmds == iface_up) && run_mappings) {
- mapping_defn *currmap;
+ struct mapping_defn_t *currmap;
for (currmap = defn->mappings; currmap; currmap = currmap->next) {
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);
- switch (cmds(currif)) {
- case -1:
- printf
- ("Don't seem to be have all the variables for %s/%s.\n",
- liface, currif->address_family->name);
- break;
- case 0:
- /* this wasn't entirely successful, should it be added to
- * the state file?
- */
- case 1:
- /* successful */
+ /* Call the cmds function pointer, does either iface_up() or iface_down() */
+ if (cmds(currif) == -1) {
+ bb_error_msg("Don't seem to be have all the variables for %s/%s.",
+ liface, currif->address_family->name);
}
+
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);
} else {
- int already_up = lookfor_iface(state, n_state, iface);
+ llist_t *iface_state = find_iface_state(state_list, iface);
if (cmds == iface_up) {
- char *newiface = xmalloc(xstrlen(iface) + 1 + xstrlen(liface) + 1);
+ char *newiface = xmalloc(bb_strlen(iface) + 1 + bb_strlen(liface) + 1);
sprintf(newiface, "%s=%s", iface, liface);
- if (already_up == -1) {
- add_to_state(&state, &n_state, &max_state, newiface);
+ if (iface_state == NULL) {
+ state_list = llist_add_to_end(state_list, newiface);
} else {
- free(state[already_up]);
- state[already_up] = newiface;
+ free(iface_state->data);
+ iface_state->data = newiface;
}
} else if (cmds == iface_down) {
- if (already_up != -1) {
- state[already_up] = state[--n_state];
+ /* 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;
+ }
}
}
}
- if (state_fp != NULL && !no_act) {
- unsigned short j;
+ }
- if (ftruncate(fileno(state_fp), 0) < 0) {
- error_msg_and_die("failed to truncate statefile %s: %s", statefile, strerror(errno));
- }
+ /* Actually write the new state */
+ if (!no_act) {
+
+ if (state_fp)
+ fclose(state_fp);
+ state_fp = bb_xfopen(statefile, "a+");
+
+ if (ftruncate(fileno(state_fp), 0) < 0) {
+ bb_error_msg_and_die("failed to truncate statefile %s: %s", statefile, strerror(errno));
+ }
+
+ rewind(state_fp);
- rewind(state_fp);
- for (j = 0; j < n_state; j++) {
- fputs(state[i], state_fp);
+ while (state_list) {
+ if (state_list->data) {
+ fputs(state_list->data, state_fp);
fputc('\n', state_fp);
}
- fflush(state_fp);
+ state_list = state_list->link;
}
+ fflush(state_fp);
}
+ /* Cleanup */
if (state_fp != NULL) {
fclose(state_fp);
state_fp = NULL;
projects / oweals / busybox.git / blobdiff