* 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 <sys/stat.h>
+#include "busybox.h"
#include <sys/utsname.h>
-#include <sys/wait.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
#include <fnmatch.h>
#include <getopt.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "busybox.h"
#define MAX_OPT_DEPTH 10
#define EUNBALBRACK 10001
#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;
{
char *name;
int n_methods;
- struct method_t *method;
+ const struct method_t *method;
};
struct mapping_defn_t
struct interface_defn_t
{
- struct address_family_t *address_family;
- struct method_t *method;
+ const struct address_family_t *address_family;
+ const struct method_t *method;
char *iface;
int max_options;
struct mapping_defn_t *mappings;
};
-static char no_act = 0;
-static char verbose = 0;
-static char **__myenviron = NULL;
+#define OPTION_STR "anvf" USE_FEATURE_IFUPDOWN_MAPPING("m") "i:"
+enum {
+ OPT_do_all = 0x1,
+ OPT_no_act = 0x2,
+ OPT_verbose = 0x4,
+ OPT_force = 0x8,
+ OPT_no_mappings = 0x10,
+};
+#define DO_ALL (option_mask32 & OPT_do_all)
+#define NO_ACT (option_mask32 & OPT_no_act)
+#define VERBOSE (option_mask32 & OPT_verbose)
+#define FORCE (option_mask32 & OPT_force)
+#define NO_MAPPINGS (option_mask32 & OPT_no_mappings)
+
+static char **__myenviron;
+
+static char *startup_PATH;
+
+#if ENABLE_FEATURE_IFUPDOWN_IPV4 || ENABLE_FEATURE_IFUPDOWN_IPV6
#ifdef CONFIG_FEATURE_IFUPDOWN_IP
unsigned int result;
result = (a & 0x55) + ((a >> 1) & 0x55);
result = (result & 0x33) + ((result >> 2) & 0x33);
- return((result & 0x0F) + ((result >> 4) & 0x0F));
+ return ((result & 0x0F) + ((result >> 4) & 0x0F));
}
static int count_netmask_bits(char *dotted_quad)
result += count_bits(b);
result += count_bits(c);
result += count_bits(d);
- return ((int)result);
+ 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)
+static void addstr(char **buf, size_t *len, size_t *pos, const char *str, size_t str_length)
{
if (*pos + str_length >= *len) {
char *newbuf;
(*buf)[*pos] = '\0';
}
-static int strncmpz(char *l, char *r, size_t llen)
+static int strncmpz(const char *l, const char *r, size_t llen)
{
int i = strncmp(l, r, llen);
if (i == 0) {
- return(-r[llen]);
+ return -r[llen];
} else {
- return(i);
+ return i;
}
}
-static char *get_var(char *id, size_t idlen, struct interface_defn_t *ifd)
+static char *get_var(const char *id, size_t idlen, struct interface_defn_t *ifd)
{
int i;
if (result) {
*result=0;
}
- return( label_buf);
+ return label_buf;
} else if (strncmpz(id, "label", idlen) == 0) {
- return (ifd->iface);
+ return ifd->iface;
} else {
for (i = 0; i < ifd->n_options; i++) {
if (strncmpz(id, ifd->option[i].name, idlen) == 0) {
- return (ifd->option[i].value);
+ return ifd->option[i].value;
}
}
}
- return(NULL);
+ return NULL;
}
-static char *parse(char *command, struct interface_defn_t *ifd)
+static char *parse(const char *command, struct interface_defn_t *ifd)
{
char *result = NULL;
while (*command) {
switch (*command) {
-
- default:
+ default:
+ addstr(&result, &len, &pos, command, 1);
+ command++;
+ break;
+ case '\\':
+ if (command[1]) {
+ addstr(&result, &len, &pos, command + 1, 1);
+ command += 2;
+ } else {
addstr(&result, &len, &pos, command, 1);
command++;
- break;
- case '\\':
- if (command[1]) {
- addstr(&result, &len, &pos, command + 1, 1);
- command += 2;
- } else {
- 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 < 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] == ']' && 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++;
+ 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 '%':
- {
- 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, strlen(varvalue));
- } else {
+ 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;
- }
+ /* 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;
+#endif
+ okay[opt_depth - 1] = 0;
}
- break;
+
+ command = nextpercent + 1;
+ }
+ break;
}
}
if (opt_depth > 1) {
errno = EUNBALBRACK;
free(result);
- return(NULL);
+ return NULL;
}
if (!okay[0]) {
errno = EUNDEFVAR;
free(result);
- return(NULL);
+ return NULL;
}
- return(result);
+ return result;
}
-static int execute(char *command, struct interface_defn_t *ifd, execfn *exec)
+/* execute() returns 1 for success and 0 for failure */
+static int execute(const char *command, struct interface_defn_t *ifd, execfn *exec)
{
char *out;
int ret;
out = parse(command, ifd);
if (!out) {
- return(0);
+ return 0;
}
- ret = (*exec) (out);
+ ret = (*exec)(out);
free(out);
if (ret != 1) {
- return(0);
+ return 0;
}
- return(1);
+ return 1;
}
#endif
{
#ifdef CONFIG_FEATURE_IFUPDOWN_IP
int result;
- result =execute("ip addr add ::1 dev %iface%", ifd, exec);
+ 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
- return( execute("ifconfig %iface% add ::1", ifd, exec));
+ return execute("ifconfig %iface% add ::1", ifd, exec);
#endif
}
static int loopback_down6(struct interface_defn_t *ifd, execfn *exec)
{
#ifdef CONFIG_FEATURE_IFUPDOWN_IP
- return(execute("ip link set %iface% down", ifd, exec));
+ return execute("ip link set %iface% down", ifd, exec);
#else
- return(execute("ifconfig %iface% del ::1", ifd, exec));
+ return execute("ifconfig %iface% del ::1", ifd, exec);
#endif
}
static int static_down6(struct interface_defn_t *ifd, execfn *exec)
{
#ifdef CONFIG_FEATURE_IFUPDOWN_IP
- return(execute("ip link set %iface% down", ifd, exec));
+ return execute("ip link set %iface% down", ifd, exec);
#else
- return(execute("ifconfig %iface% down", ifd, exec));
+ return execute("ifconfig %iface% down", ifd, exec);
#endif
}
{
int result;
result = execute("ip tunnel add %iface% mode sit remote "
- "%endpoint% [[local %local%]] [[ttl %ttl%]]", ifd, exec);
+ "%endpoint% [[local %local%]] [[ttl %ttl%]]", ifd, exec);
result += execute("ip link set %iface% up", ifd, exec);
result += execute("ip addr add %address%/%netmask% dev %iface%", ifd, exec);
result += execute("[[ ip route add ::/0 via %gateway% ]]", ifd, exec);
static int v4tunnel_down(struct interface_defn_t * ifd, execfn * exec)
{
- return( execute("ip tunnel del %iface%", ifd, exec));
+ return execute("ip tunnel del %iface%", ifd, exec);
}
#endif
-static struct method_t methods6[] = {
+static const struct method_t methods6[] = {
#ifdef CONFIG_FEATURE_IFUPDOWN_IP
{ "v4tunnel", v4tunnel_up, v4tunnel_down, },
#endif
{ "loopback", loopback_up6, loopback_down6, },
};
-static struct address_family_t addr_inet6 = {
+static const struct address_family_t addr_inet6 = {
"inet6",
sizeof(methods6) / sizeof(struct method_t),
methods6
result += execute("ip link set %iface% up", ifd, exec);
return ((result == 2) ? 2 : 0);
#else
- return( execute("ifconfig %iface% 127.0.0.1 up", ifd, exec));
+ return execute("ifconfig %iface% 127.0.0.1 up", ifd, exec);
#endif
}
result += execute("ip link set %iface% down", ifd, exec);
return ((result == 2) ? 2 : 0);
#else
- return( execute("ifconfig %iface% 127.0.0.1 down", ifd, exec));
+ return execute("ifconfig %iface% 127.0.0.1 down", ifd, exec);
#endif
}
return ((result == 3) ? 3 : 0);
#else
result = execute("ifconfig %iface% %address% netmask %netmask% "
- "[[broadcast %broadcast%]] [[pointopoint %pointopoint%]] "
- "[[media %media%]] [[mtu %mtu%]] [[hw %hwaddress%]] up",
- ifd, exec);
+ "[[broadcast %broadcast%]] [[pointopoint %pointopoint%]] "
+ "[[media %media%]] [[mtu %mtu%]] [[hw %hwaddress%]] up",
+ ifd, exec);
result += execute("[[ route add default gw %gateway% %iface% ]]", ifd, exec);
return ((result == 2) ? 2 : 0);
#endif
return ((result == 2) ? 2 : 0);
}
-static int execable(char *program)
+#ifndef CONFIG_APP_UDHCPC
+struct dhcp_client_t
{
- struct stat buf;
- if (0 == stat(program, &buf)) {
- if (S_ISREG(buf.st_mode) && (S_IXUSR & buf.st_mode)) {
- return(1);
- }
- }
- return(0);
-}
+ const char *name;
+ const char *startcmd;
+ const char *stopcmd;
+};
+
+static const struct dhcp_client_t ext_dhcp_clients[] = {
+ { "udhcpc",
+ "udhcpc -R -n -p /var/run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] [[-c %clientid%]] [[-s %script%]]",
+ "kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
+ },
+ { "pump",
+ "pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]",
+ "pump -i %iface% -k",
+ },
+ { "dhclient",
+ "dhclient -pf /var/run/dhclient.%iface%.pid %iface%",
+ "kill -9 `cat /var/run/dhclient.%iface%.pid` 2>/dev/null",
+ },
+ { "dhcpcd",
+ "dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] [[-l %leasetime%]] %iface%",
+ "dhcpcd -k %iface%",
+ },
+};
+#endif
static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
{
- 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")) {
- 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")) {
- return( execute("dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] "
- "[[-l %leasetime%]] %iface%", ifd, exec));
+#ifdef CONFIG_APP_UDHCPC
+ return execute("udhcpc -R -n -p /var/run/udhcpc.%iface%.pid "
+ "-i %iface% [[-H %hostname%]] [[-c %clientid%]] [[-s %script%]]",
+ ifd, exec);
+#else
+ int i, nclients = sizeof(ext_dhcp_clients) / sizeof(ext_dhcp_clients[0]);
+ for (i = 0; i < nclients; i++) {
+ if (exists_execable(ext_dhcp_clients[i].name))
+ return execute(ext_dhcp_clients[i].startcmd, ifd, exec);
}
- return(0);
+ bb_error_msg("no dhcp clients found");
+ return 0;
+#endif
}
static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
{
- 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")) {
- 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")) {
- result = execute("dhcpcd -k %iface%", ifd, exec);
+#ifdef CONFIG_APP_UDHCPC
+ return execute("kill -TERM "
+ "`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
+#else
+ int i, nclients = sizeof(ext_dhcp_clients) / sizeof(ext_dhcp_clients[0]);
+ for (i = 0; i < nclients; i++) {
+ if (exists_execable(ext_dhcp_clients[i].name))
+ return execute(ext_dhcp_clients[i].stopcmd, ifd, exec);
}
- return (result || static_down(ifd, exec));
+ bb_error_msg("no dhcp clients found, using static interface shutdown");
+ return static_down(ifd, exec);
+#endif
+}
+
+static int manual_up_down(struct interface_defn_t *ifd, execfn *exec)
+{
+ return 1;
}
static int bootp_up(struct interface_defn_t *ifd, execfn *exec)
{
- return( execute("bootpc [[--bootfile %bootfile%]] --dev %iface% "
- "[[--server %server%]] [[--hwaddr %hwaddr%]] "
- "--returniffail --serverbcast", ifd, exec));
+ return execute("bootpc [[--bootfile %bootfile%]] --dev %iface% "
+ "[[--server %server%]] [[--hwaddr %hwaddr%]] "
+ "--returniffail --serverbcast", ifd, exec);
}
static int ppp_up(struct interface_defn_t *ifd, execfn *exec)
{
- return( execute("pon [[%provider%]]", ifd, exec));
+ return execute("pon [[%provider%]]", ifd, exec);
}
static int ppp_down(struct interface_defn_t *ifd, execfn *exec)
{
- return( execute("poff [[%provider%]]", ifd, exec));
+ return execute("poff [[%provider%]]", ifd, exec);
}
static int wvdial_up(struct interface_defn_t *ifd, execfn *exec)
{
- return( execute("/sbin/start-stop-daemon --start -x /usr/bin/wvdial "
- "-p /var/run/wvdial.%iface% -b -m -- [[ %provider% ]]", ifd, exec));
+ 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(struct interface_defn_t *ifd, execfn *exec)
{
- return( execute("/sbin/start-stop-daemon --stop -x /usr/bin/wvdial "
- "-p /var/run/wvdial.%iface% -s 2", ifd, exec));
+ return execute("/sbin/start-stop-daemon --stop -x /usr/bin/wvdial "
+ "-p /var/run/wvdial.%iface% -s 2", ifd, exec);
}
-static struct method_t methods[] =
-{
+static const struct method_t methods[] = {
+ { "manual", manual_up_down, manual_up_down, },
{ "wvdial", wvdial_up, wvdial_down, },
{ "ppp", ppp_up, ppp_down, },
{ "static", static_up, static_down, },
{ "loopback", loopback_up, loopback_down, },
};
-static struct address_family_t addr_inet =
-{
+static const struct address_family_t addr_inet = {
"inet",
sizeof(methods) / sizeof(struct method_t),
methods
}
/* Skip over leading whitespace */
- word = *buf;
- while (isspace(*word)) {
- ++word;
- }
+ word = skip_whitespace(*buf);
/* Skip over comments */
if (*word == '#') {
- return(NULL);
+ return NULL;
}
/* Find the length of this word */
length = strcspn(word, " \t\n");
if (length == 0) {
- return(NULL);
+ return NULL;
}
*buf = word + length;
/*DBU:[dave@cray.com] if we are already at EOL dont't increment beyond it */
return word;
}
-static struct address_family_t *get_address_family(struct address_family_t *af[], char *name)
+static const struct address_family_t *get_address_family(const struct address_family_t *const af[], char *name)
{
int i;
return NULL;
}
-static struct method_t *get_method(struct address_family_t *af, char *name)
+static const struct method_t *get_method(const struct address_family_t *af, char *name)
{
int i;
return &af->method[i];
}
}
- return(NULL);
+ return NULL;
}
static const llist_t *find_list_string(const llist_t *list, const char *string)
{
while (list) {
if (strcmp(list->data, string) == 0) {
- return(list);
+ return list;
}
list = list->link;
}
- return(NULL);
+ return NULL;
}
static struct interfaces_file_t *read_interfaces(const char *filename)
enum { NONE, IFACE, MAPPING } currently_processing = NONE;
- defn = xmalloc(sizeof(struct interfaces_file_t));
- defn->autointerfaces = NULL;
- defn->mappings = NULL;
- defn->ifaces = NULL;
+ defn = xzalloc(sizeof(struct interfaces_file_t));
- f = bb_xfopen(filename, "r");
+ f = xfopen(filename, "r");
- while ((buf = bb_get_chomped_line_from_file(f)) != NULL) {
+ while ((buf = xmalloc_getline(f)) != NULL) {
char *buf_ptr = buf;
firstword = next_word(&buf_ptr);
if (strcmp(firstword, "mapping") == 0) {
#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
- currmap = xmalloc(sizeof(struct mapping_defn_t));
- currmap->max_matches = 0;
- currmap->n_matches = 0;
- currmap->match = NULL;
+ currmap = xzalloc(sizeof(struct mapping_defn_t));
while ((firstword = next_word(&buf_ptr)) != NULL) {
if (currmap->max_matches == currmap->n_matches) {
currmap->match = xrealloc(currmap->match, sizeof(currmap->match) * currmap->max_matches);
}
- currmap->match[currmap->n_matches++] = bb_xstrdup(firstword);
+ currmap->match[currmap->n_matches++] = xstrdup(firstword);
}
currmap->max_mappings = 0;
currmap->n_mappings = 0;
#endif
currently_processing = MAPPING;
} else if (strcmp(firstword, "iface") == 0) {
- {
- char *iface_name;
- char *address_family_name;
- char *method_name;
- struct address_family_t *addr_fams[] = {
+ static const struct address_family_t *const addr_fams[] = {
#ifdef CONFIG_FEATURE_IFUPDOWN_IPV4
- &addr_inet,
+ &addr_inet,
#endif
#ifdef CONFIG_FEATURE_IFUPDOWN_IPV6
- &addr_inet6,
+ &addr_inet6,
#endif
- NULL
- };
-
- 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);
+ NULL
+ };
+
+ char *iface_name;
+ char *address_family_name;
+ char *method_name;
+ llist_t *iface_list;
+
+ 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 (buf_ptr == NULL) {
+ bb_error_msg("too few parameters for line \"%s\"", buf);
+ return NULL;
+ }
- if (buf_ptr == NULL) {
- bb_error_msg("too few parameters for line \"%s\"", buf);
- return NULL;
- }
+ /* ship any trailing whitespace */
+ buf_ptr = skip_whitespace(buf_ptr);
- /* 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;
+ }
- 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) {
+ bb_error_msg("unknown address type \"%s\"", address_family_name);
+ return NULL;
+ }
- currif->address_family = get_address_family(addr_fams, address_family_name);
- if (!currif->address_family) {
- bb_error_msg("unknown address type \"%s\"", address_family_name);
- return NULL;
- }
+ currif->method = get_method(currif->address_family, method_name);
+ if (!currif->method) {
+ bb_error_msg("unknown method \"%s\"", method_name);
+ return NULL;
+ }
- currif->method = get_method(currif->address_family, method_name);
- if (!currif->method) {
- bb_error_msg("unknown method \"%s\"", method_name);
+ 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;
}
-
- currif->max_options = 0;
- currif->n_options = 0;
- currif->option = NULL;
-
- {
- 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;
- }
- }
-
- llist_add_to_end(&(defn->ifaces), (char*)currif);
- }
- debug_noise("iface %s %s %s\n", currif->iface, address_family_name, method_name);
}
+ 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 ((firstword = next_word(&buf_ptr)) != NULL) {
}
/* Add the interface to the list */
- llist_add_to_end(&(defn->autointerfaces), bb_xstrdup(firstword));
+ llist_add_to_end(&(defn->autointerfaces), xstrdup(firstword));
debug_noise("\nauto %s\n", firstword);
}
currently_processing = NONE;
} else {
switch (currently_processing) {
- case IFACE:
- {
- int i;
+ case IFACE:
+ {
+ int i;
- if (strlen(buf_ptr) == 0) {
- bb_error_msg("option with empty value \"%s\"", buf);
- return NULL;
- }
+ 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 (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) {
- struct 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 = bb_xstrdup(firstword);
- currif->option[currif->n_options].value = bb_xstrdup(buf_ptr);
- if (!currif->option[currif->n_options].name) {
- perror(filename);
- return NULL;
- }
- 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:
+ 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(buf_ptr);
+ if (!currif->option[currif->n_options].name) {
+ perror(filename);
+ return NULL;
+ }
+ 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);
+ if (strcmp(firstword, "script") == 0) {
+ if (currmap->script != NULL) {
+ bb_error_msg("duplicate script in mapping \"%s\"", buf);
return NULL;
+ } else {
+ currmap->script = xstrdup(next_word(&buf_ptr));
}
-#endif
- break;
- case NONE:
- default:
+ } 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] = 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;
}
}
free(buf);
char *here;
char *there;
- result = xmalloc(strlen(format) + strlen(name) + strlen(value) + 1);
-
- sprintf(result, format, name, value);
+ result = xasprintf(format, name, value);
for (here = there = result; *there != '=' && *there; there++) {
if (*there == '-')
*ppch = NULL;
}
free(__myenviron);
- __myenviron = NULL;
}
- __myenviron = xmalloc(sizeof(char *) * (n_env_entries + 1 /* for final NULL */ ));
+ __myenviron = xzalloc(sizeof(char *) * (n_env_entries + 1 /* for final NULL */ ));
environend = __myenviron;
- *environend = NULL;
for (i = 0; i < iface->n_options; i++) {
if (strcmp(iface->option[i].name, "up") == 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;
+ *(environend++) = setlocalenv("%s=%s", "PATH", startup_PATH);
}
static int doit(char *str)
{
- if (verbose || no_act) {
- printf("%s\n", str);
+ if (option_mask32 & (OPT_no_act|OPT_verbose)) {
+ puts(str);
}
- if (!no_act) {
+ if (!(option_mask32 & OPT_no_act)) {
pid_t child;
int status;
fflush(NULL);
switch (child = fork()) {
- case -1: /* failure */
- return 0;
- case 0: /* child */
- execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, NULL, __myenviron);
- 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) {
return 0;
}
}
- return (1);
+ return 1;
}
static int execute_all(struct interface_defn_t *ifd, const char *opt)
}
}
- buf = bb_xasprintf("run-parts /etc/network/if-%s.d", opt);
+ buf = xasprintf("run-parts /etc/network/if-%s.d", opt);
if (doit(buf) != 1) {
return 0;
}
fflush(NULL);
switch (pid = fork()) {
- case -1: /* failure */
- close(infd[0]);
- close(infd[1]);
- close(outfd[0]);
- close(outfd[1]);
- return 0;
- case 0: /* child */
- dup2(infd[0], 0);
- dup2(outfd[1], 1);
- close(infd[0]);
- close(infd[1]);
- close(outfd[0]);
- close(outfd[1]);
- 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 */
}
int i, status;
pid_t pid;
- char *logical = bb_xstrdup(physical);
+ char *logical = xstrdup(physical);
/* Run the mapping script. */
pid = popen2(&in, &out, map->script, physical, NULL);
free(logical);
logical = new_logical;
} else {
- /* If we are UNABLE to read a line of output, discard are
+ /* If we are UNABLE to read a line of output, discard our
* freshly allocated memory. */
free(new_logical);
}
while (search) {
if ((strncmp(search->data, iface, iface_len) == 0) &&
(search->data[iface_len] == '=')) {
- return(search);
+ return search;
}
search = search->link;
}
- return(NULL);
+ return NULL;
}
int ifupdown_main(int argc, char **argv)
{
- int (*cmds) (struct interface_defn_t *) = NULL;
+ static const char statefile[] = "/var/run/ifstate";
+
+ int (*cmds)(struct interface_defn_t *) = NULL;
struct interfaces_file_t *defn;
llist_t *state_list = NULL;
llist_t *target_list = NULL;
const char *interfaces = "/etc/network/interfaces";
- const char *statefile = "/var/run/ifstate";
-
-#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
- int run_mappings = 1;
-#endif
- int do_all = 0;
- int force = 0;
int any_failures = 0;
- int i;
- if (bb_applet_name[2] == 'u') {
+ if (applet_name[2] == 'u') {
/* ifup command */
cmds = iface_up;
} else {
cmds = iface_down;
}
-#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 = 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;
- }
- }
-
+ getopt32(argc, argv, OPTION_STR, &interfaces);
if (argc - optind > 0) {
- if (do_all) {
- bb_show_usage();
- }
- } else {
- if (!do_all) {
- bb_show_usage();
- }
- }
+ if (DO_ALL) bb_show_usage();
+ } else
+ if (!DO_ALL) bb_show_usage();
debug_noise("reading %s file:\n", interfaces);
defn = read_interfaces(interfaces);
exit(EXIT_FAILURE);
}
+ startup_PATH = getenv("PATH");
+ if (!startup_PATH) startup_PATH = "";
+
/* Create a list of interfaces to work on */
- if (do_all) {
+ if (DO_ALL) {
if (cmds == iface_up) {
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 = bb_xstrdup(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) {
- llist_add_to_end(&target_list, bb_xstrdup(list->data));
+ llist_add_to_end(&target_list, xstrdup(list->data));
list = list->link;
}
target_list = defn->autointerfaces;
-#endif
}
} else {
llist_add_to_end(&target_list, argv[optind]);
int okay = 0;
int cmds_ret;
- iface = bb_xstrdup(target_list->data);
+ iface = xstrdup(target_list->data);
target_list = target_list->link;
pch = strchr(iface, '=');
if (pch) {
*pch = '\0';
- liface = bb_xstrdup(pch + 1);
+ liface = xstrdup(pch + 1);
} else {
- liface = bb_xstrdup(iface);
+ liface = xstrdup(iface);
}
- if (!force) {
+ if (!FORCE) {
const llist_t *iface_state = find_iface_state(state_list, iface);
if (cmds == iface_up) {
}
#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
- if ((cmds == iface_up) && run_mappings) {
+ if ((cmds == iface_up) && !NO_MAPPINGS) {
struct mapping_defn_t *currmap;
for (currmap = defn->mappings; currmap; currmap = currmap->next) {
-
+ int i;
for (i = 0; i < currmap->n_matches; i++) {
if (fnmatch(currmap->match[i], liface, 0) != 0)
continue;
- if (verbose) {
+ if (VERBOSE) {
printf("Running mapping script %s on %s\n", currmap->script, liface);
}
liface = run_mapping(iface, currmap);
/* Call the cmds function pointer, does either iface_up() or iface_down() */
cmds_ret = cmds(currif);
if (cmds_ret == -1) {
- bb_error_msg("Don't seem to have all the variables for %s/%s.",
+ bb_error_msg("don't seem to have all the variables for %s/%s",
liface, currif->address_family->name);
any_failures += 1;
} else if (cmds_ret == 0) {
}
iface_list = iface_list->link;
}
- if (verbose) {
- printf("\n");
+ if (VERBOSE) {
+ puts("");
}
- if (!okay && !force) {
- bb_error_msg("Ignoring unknown interface %s", liface);
+ if (!okay && !FORCE) {
+ bb_error_msg("ignoring unknown interface %s", liface);
any_failures += 1;
} else {
llist_t *iface_state = find_iface_state(state_list, iface);
if (cmds == iface_up) {
- char *newiface = xmalloc(strlen(iface) + 1 + strlen(liface) + 1);
- sprintf(newiface, "%s=%s", iface, liface);
+ char *newiface = xasprintf("%s=%s", iface, liface);
if (iface_state == NULL) {
llist_add_to_end(&state_list, newiface);
} else {
}
} else {
/* Remove an interface from the linked list */
- if (iface_state) {
- llist_t *l = iface_state->link;
- free(iface_state->data);
- iface_state->data = NULL;
- iface_state->link = NULL;
- if (l) {
- iface_state->data = l->data;
- iface_state->link = l->link;
- }
- free(l);
- }
+ free(llist_pop(&iface_state));
}
}
}
/* Actually write the new state */
- if (!no_act) {
+ if (!NO_ACT) {
FILE *state_fp = NULL;
- state_fp = bb_xfopen(statefile, "w");
+ state_fp = xfopen(statefile, "w");
while (state_list) {
if (state_list->data) {
fputs(state_list->data, state_fp);
projects / oweals / busybox.git / blobdiff