+/* vi: set sw=4 ts=4: */
/*
* ifupdown for busybox
- * Based on ifupdown by Anthony Towns
+ * Copyright (c) 2002 Glenn McGrath
+ * Copyright (c) 2003-2004 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>
*
* Changes to upstream version
- * Remove checks for kernel version, assume kernel version 2.2.0 or better
+ * Remove checks for kernel version, assume kernel version 2.2.0 or better.
* Lines in the interfaces file cannot wrap.
- * The default state file is moved to /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.
+ * To adhere to the FHS, the default state file is /var/run/ifstate
+ * (defined via CONFIG_IFUPDOWN_IFSTATE_PATH) and can be overridden by build
+ * configuration.
*
- * 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.
*/
-#include <sys/stat.h>
+#include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
#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 "libbb.h"
-//#include "busybox.h"
-//#include "config.h"
+#define MAX_OPT_DEPTH 10
+#define EUNBALBRACK 10001
+#define EUNDEFVAR 10002
+#define EUNBALPER 10000
-#define IFUPDOWN_VERSION "0.6.4"
+#if ENABLE_FEATURE_IFUPDOWN_MAPPING
+#define MAX_INTERFACE_LENGTH 10
+#endif
-typedef struct interface_defn_s interface_defn_t;
+#define UDHCPC_CMD_OPTIONS CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS
-typedef int (execfn)(char *command);
-typedef int (command_set)(interface_defn_t *ifd, execfn *e);
+#define debug_noise(args...) /*fprintf(stderr, args)*/
-typedef struct method_s {
- char *name;
- command_set *up;
- command_set *down;
-} method_t;
+/* Forward declaration */
+struct interface_defn_t;
-typedef struct address_family_s {
- char *name;
+typedef int execfn(char *command);
+
+struct method_t {
+ const char *name;
+ int (*up)(struct interface_defn_t *ifd, execfn *e) FAST_FUNC;
+ int (*down)(struct interface_defn_t *ifd, execfn *e) FAST_FUNC;
+};
+
+struct address_family_t {
+ const char *name;
int n_methods;
- method_t *method;
-} address_family_t;
+ const 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;
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 {
+ const struct address_family_t *address_family;
+ const 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 {
- 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_t *ifaces;
- mapping_defn_t *mappings;
-} interfaces_file_t;
-#define MAX_OPT_DEPTH 10
-#define EUNBALBRACK 10001
-#define EUNDEFVAR 10002
-#define MAX_VARNAME 32
-#define EUNBALPER 10000
+#define OPTION_STR "anvf" IF_FEATURE_IFUPDOWN_MAPPING("m") "i:"
+enum {
+ OPT_do_all = 0x1,
+ OPT_no_act = 0x2,
+ OPT_verbose = 0x4,
+ OPT_force = 0x8,
+ OPT_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 int no_act = 0;
-static int verbose = 0;
-static char **environ = NULL;
-static void addstr(char **buf, size_t *len, size_t *pos, char *str, size_t str_length)
-{
- if (*pos + str_length >= *len) {
- char *newbuf;
+struct globals {
+ char **my_environ;
+ const char *startup_PATH;
+};
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define INIT_G() do { } while (0)
- newbuf = xrealloc(*buf, *len * 2 + str_length + 1);
- *buf = newbuf;
- *len = *len * 2 + str_length + 1;
- }
- while (str_length-- >= 1) {
- (*buf)[(*pos)++] = *str;
- str++;
- }
- (*buf)[*pos] = '\0';
+#if ENABLE_FEATURE_IFUPDOWN_IPV4 || ENABLE_FEATURE_IFUPDOWN_IPV6
+
+static void addstr(char **bufp, const char *str, size_t str_length)
+{
+ /* xasprintf trick will be smaller, but we are often
+ * called with str_length == 1 - don't want to have
+ * THAT much of malloc/freeing! */
+ char *buf = *bufp;
+ int len = (buf ? strlen(buf) : 0);
+ str_length++;
+ buf = xrealloc(buf, len + str_length);
+ /* copies at most str_length-1 chars! */
+ safe_strncpy(buf + len, str, str_length);
+ *bufp = buf;
}
-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]);
- } else {
- return(i);
- }
+ if (i == 0)
+ return - (unsigned char)r[llen];
+ return i;
}
-static char *get_var(char *id, size_t idlen, interface_defn_t *ifd)
+static char *get_var(const char *id, size_t idlen, struct interface_defn_t *ifd)
{
int i;
if (strncmpz(id, "iface", idlen) == 0) {
- 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);
- }
+ // ubuntu's ifup doesn't do this:
+ //static char *label_buf;
+ //char *result;
+ //free(label_buf);
+ //label_buf = xstrdup(ifd->iface);
+ // Remove virtual iface suffix
+ //result = strchrnul(label_buf, ':');
+ //*result = '\0';
+ //return label_buf;
+
+ return ifd->iface;
+ }
+ if (strncmpz(id, "label", idlen) == 0) {
+ return ifd->iface;
+ }
+ for (i = 0; i < ifd->n_options; i++) {
+ if (strncmpz(id, ifd->option[i].name, idlen) == 0) {
+ return ifd->option[i].value;
}
}
-
- return(NULL);
+ return NULL;
}
-static char *parse(char *command, interface_defn_t *ifd)
+#if ENABLE_FEATURE_IFUPDOWN_IP
+static int count_netmask_bits(const char *dotted_quad)
{
+// int result;
+// unsigned 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;
+// if ((a|b|c|d) >> 8)
+// return -1; /* one of numbers is >= 256 */
+// d |= (a << 24) | (b << 16) | (c << 8); /* IP */
+// d = ~d; /* 11110000 -> 00001111 */
+
+ /* Shorter version */
+ int result;
+ struct in_addr ip;
+ unsigned d;
+
+ if (inet_aton(dotted_quad, &ip) == 0)
+ return -1; /* malformed dotted IP */
+ d = ntohl(ip.s_addr); /* IP in host order */
+ d = ~d; /* 11110000 -> 00001111 */
+ if (d & (d+1)) /* check that it is in 00001111 form */
+ return -1; /* no it is not */
+ result = 32;
+ while (d) {
+ d >>= 1;
+ result--;
+ }
+ return result;
+}
+#endif
- char *result = NULL;
- size_t pos = 0, len = 0;
+static char *parse(const char *command, struct interface_defn_t *ifd)
+{
size_t old_pos[MAX_OPT_DEPTH] = { 0 };
int okay[MAX_OPT_DEPTH] = { 1 };
int opt_depth = 1;
+ char *result = NULL;
while (*command) {
switch (*command) {
-
default:
- addstr(&result, &len, &pos, command, 1);
+ addstr(&result, command, 1);
command++;
break;
case '\\':
if (command[1]) {
- addstr(&result, &len, &pos, command + 1, 1);
+ addstr(&result, command + 1, 1);
command += 2;
} else {
- addstr(&result, &len, &pos, command, 1);
+ addstr(&result, command, 1);
command++;
}
break;
case '[':
if (command[1] == '[' && opt_depth < MAX_OPT_DEPTH) {
- old_pos[opt_depth] = pos;
+ old_pos[opt_depth] = result ? strlen(result) : 0;
okay[opt_depth] = 1;
opt_depth++;
command += 2;
} else {
- addstr(&result, &len, &pos, "[", 1);
+ addstr(&result, "[", 1);
command++;
}
break;
if (command[1] == ']' && opt_depth > 1) {
opt_depth--;
if (!okay[opt_depth]) {
- pos = old_pos[opt_depth];
- result[pos] = '\0';
+ result[old_pos[opt_depth]] = '\0';
}
command += 2;
} else {
- addstr(&result, &len, &pos, "]", 1);
+ addstr(&result, "]", 1);
command++;
}
break;
case '%':
- {
- char *nextpercent;
- char *varvalue;
+ {
+ char *nextpercent;
+ char *varvalue;
- command++;
- nextpercent = strchr(command, '%');
- if (!nextpercent) {
- errno = EUNBALPER;
- free(result);
- return (NULL);
- }
+ 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) {
+#if ENABLE_FEATURE_IFUPDOWN_IP
+ /* "hwaddress <class> <address>":
+ * unlike ifconfig, ip doesnt want <class>
+ * (usually "ether" keyword). Skip it. */
+ if (strncmp(command, "hwaddress", 9) == 0) {
+ varvalue = skip_whitespace(skip_non_whitespace(varvalue));
+ }
+#endif
+ addstr(&result, varvalue, strlen(varvalue));
+ } else {
+#if ENABLE_FEATURE_IFUPDOWN_IP
+ /* Sigh... Add a special case for 'ip' to convert from
+ * dotted quad to bit count style netmasks. */
+ if (strncmp(command, "bnmask", 6) == 0) {
+ unsigned res;
+ varvalue = get_var("netmask", 7, ifd);
+ if (varvalue) {
+ res = count_netmask_bits(varvalue);
+ if (res > 0) {
+ const char *argument = utoa(res);
+ addstr(&result, argument, strlen(argument));
+ command = nextpercent + 1;
+ break;
+ }
+ }
+ }
+#endif
+ okay[opt_depth - 1] = 0;
+ }
- command = nextpercent + 1;
- }
+ 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, 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);
+ /* parse error? */
+ return 0;
}
-
- ret = (*exec) (out);
+ /* out == "": parsed ok but not all needed variables known, skip */
+ ret = out[0] ? (*exec)(out) : 1;
free(out);
- return(ret);
+ if (ret != 1) {
+ return 0;
+ }
+ return 1;
}
+#endif
-#ifdef CONFIG_FEATURE_IFUPDOWN_IPX
-static int static_up_ipx(interface_defn_t *ifd, execfn *exec)
+#if ENABLE_FEATURE_IFUPDOWN_IPV6
+static int FAST_FUNC loopback_up6(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ipx_interface add %iface% %frame% %netnum%", ifd, exec)) {
- return(0);
- }
- return(1);
+#if ENABLE_FEATURE_IFUPDOWN_IP
+ 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
+ return execute("ifconfig %iface% add ::1", ifd, exec);
+#endif
}
-static int static_down_ipx(interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC loopback_down6(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ipx_interface del %iface% %frame%", ifd, exec)) {
- return(0);
- }
- return(1);
+#if ENABLE_FEATURE_IFUPDOWN_IP
+ return execute("ip link set %iface% down", ifd, exec);
+#else
+ return execute("ifconfig %iface% del ::1", ifd, exec);
+#endif
}
-static int dynamic_up(interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ipx_interface add %iface% %frame%", ifd, exec)) {
- return(0);
- }
- return(1);
+ int result;
+#if ENABLE_FEATURE_IFUPDOWN_IP
+ result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec);
+ result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
+ /* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */
+ result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec);
+#else
+ 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 == 3) ? 3 : 0);
}
-static int dynamic_down(interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC static_down6(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ipx_interface del %iface% %frame%", ifd, exec)) {
- return(0);
- }
- return(1);
+#if ENABLE_FEATURE_IFUPDOWN_IP
+ return execute("ip link set %iface% down", ifd, exec);
+#else
+ return execute("ifconfig %iface% down", ifd, exec);
+#endif
}
-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 */
-
-#ifdef CONFIG_FEATURE_IFUPDOWN_IPV6
-static int loopback_up6(interface_defn_t *ifd, execfn *exec)
+#if ENABLE_FEATURE_IFUPDOWN_IP
+static int FAST_FUNC v4tunnel_up(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ifconfig %iface% add ::1", 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 loopback_down6(interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC v4tunnel_down(struct interface_defn_t * ifd, execfn * exec)
{
- if (!execute("ifconfig %iface% del ::1", ifd, exec)) {
- return(0);
- }
- return(1);
+ return execute("ip tunnel del %iface%", ifd, exec);
}
+#endif
+
+static const struct method_t methods6[] = {
+#if ENABLE_FEATURE_IFUPDOWN_IP
+ { "v4tunnel", v4tunnel_up, v4tunnel_down, },
+#endif
+ { "static", static_up6, static_down6, },
+ { "loopback", loopback_up6, loopback_down6, },
+};
-static int static_up6(interface_defn_t *ifd, execfn *exec)
+static const struct address_family_t addr_inet6 = {
+ "inet6",
+ ARRAY_SIZE(methods6),
+ methods6
+};
+#endif /* FEATURE_IFUPDOWN_IPV6 */
+
+#if ENABLE_FEATURE_IFUPDOWN_IPV4
+static int FAST_FUNC loopback_up(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);
+#if ENABLE_FEATURE_IFUPDOWN_IP
+ 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
+ return execute("ifconfig %iface% 127.0.0.1 up", ifd, exec);
+#endif
}
-static int static_down6(interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC loopback_down(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ifconfig %iface% down", ifd, exec)) {
- return(0);
- }
- return(1);
+#if ENABLE_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 == 2) ? 2 : 0);
+#else
+ return execute("ifconfig %iface% 127.0.0.1 down", ifd, exec);
+#endif
}
-static int v4tunnel_up(interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC static_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;
+#if ENABLE_FEATURE_IFUPDOWN_IP
+ result = execute("ip addr add %address%/%bnmask%[[ broadcast %broadcast%]] "
+ "dev %iface%[[ peer %pointopoint%]][[ label %label%]]", ifd, exec);
+ result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
+ result += execute("[[ip route add default via %gateway% dev %iface%]]", ifd, exec);
+ return ((result == 3) ? 3 : 0);
+#else
+ /* ifconfig said to set iface up before it processes hw %hwaddress%,
+ * which then of course fails. Thus we run two separate ifconfig */
+ result = execute("ifconfig %iface%[[ hw %hwaddress%]][[ media %media%]][[ mtu %mtu%]] up",
+ ifd, exec);
+ result += execute("ifconfig %iface% %address% netmask %netmask%"
+ "[[ broadcast %broadcast%]][[ pointopoint %pointopoint%]] ",
+ ifd, exec);
+ result += execute("[[route add default gw %gateway% %iface%]]", ifd, exec);
+ return ((result == 3) ? 3 : 0);
+#endif
}
-static int v4tunnel_down(interface_defn_t * ifd, execfn * exec)
+static int FAST_FUNC static_down(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ip tunnel del %iface%", ifd, exec)) {
- return(0);
- }
- return(1);
+ int result;
+#if ENABLE_FEATURE_IFUPDOWN_IP
+ result = execute("ip addr flush dev %iface%", ifd, exec);
+ result += execute("ip link set %iface% down", ifd, exec);
+#else
+ /* result = execute("[[route del default gw %gateway% %iface%]]", ifd, exec); */
+ /* Bringing the interface down deletes the routes in itself.
+ Otherwise this fails if we reference 'gateway' when using this from dhcp_down */
+ result = 1;
+ result += execute("ifconfig %iface% down", ifd, exec);
+#endif
+ return ((result == 2) ? 2 : 0);
}
-static method_t methods6[] = {
- { "v4tunnel", v4tunnel_up, v4tunnel_down, },
- { "static", static_up6, static_down6, },
- { "loopback", loopback_up6, loopback_down6, },
+#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+struct dhcp_client_t {
+ const char *name;
+ const char *startcmd;
+ const char *stopcmd;
};
-address_family_t addr_inet6 = {
- "inet6",
- sizeof(methods6) / sizeof(method_t),
- methods6
+static const struct dhcp_client_t ext_dhcp_clients[] = {
+ { "dhcpcd",
+ "dhcpcd[[ -h %hostname%]][[ -i %vendor%]][[ -I %clientid%]][[ -l %leasetime%]] %iface%",
+ "dhcpcd -k %iface%",
+ },
+ { "dhclient",
+ "dhclient -pf /var/run/dhclient.%iface%.pid %iface%",
+ "kill -9 `cat /var/run/dhclient.%iface%.pid` 2>/dev/null",
+ },
+ { "pump",
+ "pump -i %iface%[[ -h %hostname%]][[ -l %leasehours%]]",
+ "pump -i %iface% -k",
+ },
+ { "udhcpc",
+ "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %clientid%]]"
+ "[[ -s %script%]][[ %udhcpc_opts%]]",
+ "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
+ },
};
-#endif /* CONFIG_FEATURE_IFUPDOWN_IPV6 */
+#endif /* ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCPC */
-#ifdef CONFIG_FEATURE_IFUPDOWN_IPV4
-static int loopback_up(interface_defn_t *ifd, execfn *exec)
+#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ifconfig %iface% 127.0.0.1 up", ifd, exec)) {
- return(0);
+ unsigned i;
+#if ENABLE_FEATURE_IFUPDOWN_IP
+ /* ip doesn't up iface when it configures it (unlike ifconfig) */
+ if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec))
+ return 0;
+#else
+ /* needed if we have hwaddress on dhcp iface */
+ if (!execute("ifconfig %iface%[[ hw %hwaddress%]] up", ifd, exec))
+ return 0;
+#endif
+ for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
+ if (exists_execable(ext_dhcp_clients[i].name))
+ return execute(ext_dhcp_clients[i].startcmd, ifd, exec);
}
- return(1);
+ bb_error_msg("no dhcp clients found");
+ return 0;
}
-
-static int loopback_down(interface_defn_t *ifd, execfn *exec)
+#elif ENABLE_UDHCPC
+static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ifconfig %iface% 127.0.0.1 down", ifd, exec)) {
- return(0);
- }
- return(1);
+#if ENABLE_FEATURE_IFUPDOWN_IP
+ /* ip doesn't up iface when it configures it (unlike ifconfig) */
+ if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec))
+ return 0;
+#else
+ /* needed if we have hwaddress on dhcp iface */
+ if (!execute("ifconfig %iface%[[ hw %hwaddress%]] up", ifd, exec))
+ return 0;
+#endif
+ return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid "
+ "-i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s %script%]][[ %udhcpc_opts%]]",
+ ifd, exec);
}
-
-static int static_up(interface_defn_t *ifd, execfn *exec)
+#else
+static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd UNUSED_PARAM,
+ execfn *exec UNUSED_PARAM)
{
- 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);
+ return 0; /* no dhcp support */
}
+#endif
-static int static_down(interface_defn_t *ifd, execfn *exec)
+#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+static int FAST_FUNC dhcp_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 = 0;
+ unsigned i;
-static int execable(char *program)
-{
- struct stat buf;
- if (0 == stat(program, &buf)) {
- if (S_ISREG(buf.st_mode) && (S_IXUSR & buf.st_mode)) {
- return(1);
+ for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
+ if (exists_execable(ext_dhcp_clients[i].name)) {
+ result = execute(ext_dhcp_clients[i].stopcmd, ifd, exec);
+ if (result)
+ break;
}
}
- return(0);
-}
-static int dhcp_up(interface_defn_t *ifd, execfn *exec)
+ if (!result)
+ bb_error_msg("warning: no dhcp clients found and stopped");
+
+ /* Sleep a bit, otherwise static_down tries to bring down interface too soon,
+ and it may come back up because udhcpc is still shutting down */
+ usleep(100000);
+ result += static_down(ifd, exec);
+ return ((result == 3) ? 3 : 0);
+}
+#elif ENABLE_UDHCPC
+static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
{
- if (execable("/sbin/dhclient")) {
- if (!execute("dhclient -pf /var/run/dhclient.%iface%.pid %iface%", ifd, exec)) {
- return(0);
- }
- } 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;
- }
- } else if (execable("/sbin/dhcpcd")) {
- if (!execute("dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] [[-l %leasetime%]] %iface%", ifd, exec)) {
- return(0);
- }
- }
- return(1);
+ int result;
+ result = execute("kill "
+ "`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
+ /* Also bring the hardware interface down since
+ killing the dhcp client alone doesn't do it.
+ This enables consecutive ifup->ifdown->ifup */
+ /* Sleep a bit, otherwise static_down tries to bring down interface too soon,
+ and it may come back up because udhcpc is still shutting down */
+ usleep(100000);
+ result += static_down(ifd, exec);
+ return ((result == 3) ? 3 : 0);
}
-
-static int dhcp_down(interface_defn_t *ifd, execfn *exec)
+#else
+static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd UNUSED_PARAM,
+ execfn *exec UNUSED_PARAM)
{
- if (execable("/sbin/dhclient")) {
- if (!execute("kill -9 `cat /var/run/udhcpc.%iface%.pid`", ifd, exec)) {
- return(0);
- }
- } 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);
- }
- } else if (execable("/sbin/dhcpcd")) {
- if (!execute("dhcpcd -k %iface%", ifd, exec)) {
- return(0);
- }
- }
- if (!execute("ifconfig %iface% down", ifd, exec)) {
- return(0);
- }
- return(1);
+ return 0; /* no dhcp support */
}
+#endif
-static int bootp_up(interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC manual_up_down(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM)
{
- if (!execute("bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] [[--hwaddr %hwaddr%]] --returniffail --serverbcast", ifd, exec)) {
- return 0;
- }
return 1;
}
-static int bootp_down(interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC bootp_up(struct interface_defn_t *ifd, execfn *exec)
{
- if (!execute("ifconfig down %iface%", ifd, exec)) {
- return 0;
- }
- return 1;
+ return execute("bootpc[[ --bootfile %bootfile%]] --dev %iface%"
+ "[[ --server %server%]][[ --hwaddr %hwaddr%]]"
+ " --returniffail --serverbcast", ifd, exec);
}
-static int ppp_up(interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC 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_t *ifd, execfn *exec)
+static int FAST_FUNC 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_t *ifd, execfn *exec)
+static int FAST_FUNC 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("start-stop-daemon --start -x wvdial "
+ "-p /var/run/wvdial.%iface% -b -m --[[ %provider%]]", ifd, exec);
}
-static int wvdial_down(interface_defn_t *ifd, execfn *exec)
+static int FAST_FUNC 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("start-stop-daemon --stop -x wvdial "
+ "-p /var/run/wvdial.%iface% -s 2", ifd, exec);
}
-static method_t methods[] = {
- { "wvdial", wvdial_up, wvdial_down, },
- { "ppp", ppp_up, ppp_down, },
- { "static", static_up, static_down, },
- { "bootp", bootp_up, bootp_down, },
- { "dhcp", dhcp_up, dhcp_down, },
- { "loopback", loopback_up, loopback_down, },
+static const struct method_t methods[] = {
+ { "manual" , manual_up_down, manual_up_down, },
+ { "wvdial" , wvdial_up , wvdial_down , },
+ { "ppp" , ppp_up , ppp_down , },
+ { "static" , static_up , static_down , },
+ { "bootp" , bootp_up , static_down , },
+ { "dhcp" , dhcp_up , dhcp_down , },
+ { "loopback", loopback_up , loopback_down , },
};
-address_family_t addr_inet = {
+static const struct address_family_t addr_inet = {
"inet",
- sizeof(methods) / sizeof(method_t),
+ ARRAY_SIZE(methods),
methods
};
-#endif /* ifdef CONFIG_FEATURE_IFUPDOWN_IPV4 */
+#endif /* if ENABLE_FEATURE_IFUPDOWN_IPV4 */
-static char *next_word(char *buf, char *word, int maxlen)
+/* Returns pointer to the next word, or NULL.
+ * In 1st case, advances *buf to the word after this one.
+ */
+static char *next_word(char **buf)
{
- if (!buf)
- return NULL;
- if (!*buf)
+ unsigned length;
+ char *word;
+
+ /* Skip over leading whitespace */
+ word = skip_whitespace(*buf);
+
+ /* Stop on EOL */
+ if (*word == '\0')
return NULL;
- while (!isspace(*buf) && *buf) {
- if (maxlen-- > 1)
- *word++ = *buf;
- buf++;
- }
- if (maxlen > 0) {
- *word = '\0';
- }
+ /* Find the length of this word (can't be 0) */
+ length = strcspn(word, " \t\n");
- while (isspace(*buf) && *buf) {
- buf++;
- }
+ /* Unless we are already at NUL, store NUL and advance */
+ if (word[length] != '\0')
+ word[length++] = '\0';
+
+ *buf = skip_whitespace(word + length);
- return buf;
+ return word;
}
-static address_family_t *get_address_family(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;
+ if (!name)
+ return NULL;
+
for (i = 0; af[i]; i++) {
if (strcmp(af[i]->name, name) == 0) {
return af[i];
return NULL;
}
-static method_t *get_method(address_family_t *af, char *name)
+static const struct method_t *get_method(const struct address_family_t *af, char *name)
{
int i;
+ if (!name)
+ return NULL;
+ /* TODO: use index_in_str_array() */
for (i = 0; i < af->n_methods; i++) {
if (strcmp(af->method[i].name, name) == 0) {
return &af->method[i];
}
}
- 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);
+ 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;
+ /* Let's try to be compatible.
+ *
+ * "man 5 interfaces" says:
+ * Lines starting with "#" are ignored. Note that end-of-line
+ * comments are NOT supported, comments must be on a line of their own.
+ * A line may be extended across multiple lines by making
+ * the last character a backslash.
+ *
+ * Seen elsewhere in example config file:
+ * A first non-blank "#" character makes the rest of the line
+ * be ignored. Blank lines are ignored. Lines may be indented freely.
+ * A "\" character at the very end of the line indicates the next line
+ * should be treated as a continuation of the current one.
+ */
+#if ENABLE_FEATURE_IFUPDOWN_MAPPING
+ struct mapping_defn_t *currmap = NULL;
#endif
+ struct interface_defn_t *currif = NULL;
+ struct interfaces_file_t *defn;
FILE *f;
- char firstword[80];
- char *buf = NULL;
- char *rest;
-// int line;
-
+ char *buf;
+ char *first_word;
+ char *rest_of_line;
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;
- }
-
- while ((buf = get_line_from_file(f)) != NULL) {
- char *end;
-
- if (buf[0] == '#') {
- continue;
- }
- end = last_char_is(buf, '\n');
- if (end) {
- *end = '\0';
- }
- while ((end = last_char_is(buf, ' ')) != NULL) {
- *end = '\0';
+ defn = xzalloc(sizeof(*defn));
+ f = xfopen_for_read(filename);
+
+ while ((buf = xmalloc_fgetline(f)) != NULL) {
+#if ENABLE_DESKTOP
+ /* Trailing "\" concatenates lines */
+ char *p;
+ while ((p = last_char_is(buf, '\\')) != NULL) {
+ *p = '\0';
+ rest_of_line = xmalloc_fgetline(f);
+ if (!rest_of_line)
+ break;
+ p = xasprintf("%s%s", buf, rest_of_line);
+ free(buf);
+ free(rest_of_line);
+ buf = p;
}
- rest = next_word(buf, firstword, 80);
- if (rest == NULL) {
- continue; /* blank line */
+#endif
+ rest_of_line = buf;
+ first_word = next_word(&rest_of_line);
+ if (!first_word || *first_word == '#') {
+ free(buf);
+ continue; /* blank/comment line */
}
- if (strcmp(firstword, "mapping") == 0) {
-#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
- currmap = xmalloc(sizeof(mapping_defn_t));
- currmap->max_matches = 0;
- currmap->n_matches = 0;
- currmap->match = NULL;
-
- while ((rest = next_word(rest, firstword, 80))) {
- 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);
- }
+ if (strcmp(first_word, "mapping") == 0) {
+#if ENABLE_FEATURE_IFUPDOWN_MAPPING
+ currmap = xzalloc(sizeof(*currmap));
- currmap->match[currmap->n_matches++] = xstrdup(firstword);
+ while ((first_word = next_word(&rest_of_line)) != NULL) {
+ currmap->match = xrealloc_vector(currmap->match, 4, currmap->n_matches);
+ currmap->match[currmap->n_matches++] = xstrdup(first_word);
}
- currmap->max_mappings = 0;
- currmap->n_mappings = 0;
- currmap->mapping = NULL;
- currmap->script = NULL;
+ /*currmap->max_mappings = 0; - done by xzalloc */
+ /*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;
+ /*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[] = {
-#ifdef CONFIG_FEATURE_IFUPDOWN_IPV4
- &addr_inet,
-#endif
-#ifdef CONFIG_FEATURE_IFUPDOWN_IPV6
- &addr_inet6,
+ } else if (strcmp(first_word, "iface") == 0) {
+ static const struct address_family_t *const addr_fams[] = {
+#if ENABLE_FEATURE_IFUPDOWN_IPV4
+ &addr_inet,
#endif
-#ifdef CONFIG_FEATURE_IFUPDOWN_IPX
- &addr_ipx,
+#if ENABLE_FEATURE_IFUPDOWN_IPV6
+ &addr_inet6,
#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);
-
- if (rest == NULL) {
- error_msg("too few parameters for line \"%s\"", buf);
- return NULL;
- }
-
- if (rest[0] != '\0') {
- error_msg("too many parameters \"%s\"", buf);
- return NULL;
- }
-
- currif->iface = 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);
- return NULL;
- }
-
- currif->method = get_method(currif->address_family, method_name);
- if (!currif->method) {
- error_msg("unknown method \"%s\"", buf);
- 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);
- return NULL;
- }
- where = &(*where)->next;
- }
-
- *where = currif;
- currif->next = NULL;
+ NULL
+ };
+ char *iface_name;
+ char *address_family_name;
+ char *method_name;
+ llist_t *iface_list;
+
+ currif = xzalloc(sizeof(*currif));
+ iface_name = next_word(&rest_of_line);
+ address_family_name = next_word(&rest_of_line);
+ method_name = next_word(&rest_of_line);
+
+ if (method_name == NULL)
+ bb_error_msg_and_die("too few parameters for line \"%s\"", buf);
+
+ /* ship any trailing whitespace */
+ rest_of_line = skip_whitespace(rest_of_line);
+
+ if (rest_of_line[0] != '\0' /* && rest_of_line[0] != '#' */)
+ bb_error_msg_and_die("too many parameters \"%s\"", buf);
+
+ currif->iface = xstrdup(iface_name);
+
+ currif->address_family = get_address_family(addr_fams, address_family_name);
+ if (!currif->address_family)
+ bb_error_msg_and_die("unknown address type \"%s\"", address_family_name);
+
+ currif->method = get_method(currif->address_family, method_name);
+ if (!currif->method)
+ bb_error_msg_and_die("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_and_die("duplicate interface \"%s\"", tmp->iface);
}
}
- 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("interface declared auto twice \"%s\"", buf);
- return NULL;
- }
- }
+ llist_add_to_end(&(defn->ifaces), (char*)currif);
- if (defn->n_autointerfaces == defn->max_autointerfaces) {
- char **tmp;
+ debug_noise("iface %s %s %s\n", currif->iface, address_family_name, method_name);
+ currently_processing = IFACE;
+ } else if (strcmp(first_word, "auto") == 0) {
+ while ((first_word = next_word(&rest_of_line)) != 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 (llist_find_str(defn->autointerfaces, first_word)) {
+ 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 */
+ llist_add_to_end(&(defn->autointerfaces), xstrdup(first_word));
+ debug_noise("\nauto %s\n", first_word);
}
currently_processing = NONE;
} else {
switch (currently_processing) {
case IFACE:
- {
- int i;
-
- if (xstrlen(rest) == 0) {
- 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) {
+ if (rest_of_line[0] == '\0')
+ bb_error_msg_and_die("option with empty value \"%s\"", buf);
+
+ if (strcmp(first_word, "up") != 0
+ && strcmp(first_word, "down") != 0
+ && strcmp(first_word, "pre-up") != 0
+ && strcmp(first_word, "post-down") != 0
+ ) {
+ int i;
for (i = 0; i < currif->n_options; i++) {
- if (strcmp(currif->option[i].name, firstword) == 0) {
- error_msg("duplicate option \"%s\"", buf);
- return NULL;
- }
+ if (strcmp(currif->option[i].name, first_word) == 0)
+ bb_error_msg_and_die("duplicate option \"%s\"", buf);
}
}
- }
if (currif->n_options >= currif->max_options) {
- 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->max_options += 10;
+ currif->option = xrealloc(currif->option,
+ sizeof(*currif->option) * currif->max_options);
}
+ debug_noise("\t%s=%s\n", first_word, rest_of_line);
+ currif->option[currif->n_options].name = xstrdup(first_word);
+ currif->option[currif->n_options].value = xstrdup(rest_of_line);
currif->n_options++;
break;
case MAPPING:
-#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
- if (strcmp(firstword, "script") == 0) {
- if (currmap->script != NULL) {
- error_msg("duplicate script in mapping \"%s\"", buf);
- return NULL;
- } else {
- currmap->script = xstrdup(rest);
- }
- } else if (strcmp(firstword, "map") == 0) {
- if (currmap->max_mappings == currmap->n_mappings) {
+#if ENABLE_FEATURE_IFUPDOWN_MAPPING
+ if (strcmp(first_word, "script") == 0) {
+ if (currmap->script != NULL)
+ bb_error_msg_and_die("duplicate script in mapping \"%s\"", buf);
+ currmap->script = xstrdup(next_word(&rest_of_line));
+ } else if (strcmp(first_word, "map") == 0) {
+ if (currmap->n_mappings >= currmap->max_mappings) {
currmap->max_mappings = currmap->max_mappings * 2 + 1;
- currmap->mapping = xrealloc(currmap->mapping, sizeof(char *) * currmap->max_mappings);
+ currmap->mapping = xrealloc(currmap->mapping,
+ sizeof(char *) * currmap->max_mappings);
}
- currmap->mapping[currmap->n_mappings] = xstrdup(rest);
+ currmap->mapping[currmap->n_mappings] = xstrdup(next_word(&rest_of_line));
currmap->n_mappings++;
} else {
- error_msg("misplaced option \"%s\"", buf);
- return NULL;
+ bb_error_msg_and_die("misplaced option \"%s\"", buf);
}
#endif
break;
case NONE:
default:
- error_msg("misplaced option \"%s\"", buf);
- return NULL;
+ bb_error_msg_and_die("misplaced option \"%s\"", buf);
}
}
- }
+ free(buf);
+ } /* while (fgets) */
+
if (ferror(f) != 0) {
- perror_msg("%s", filename);
- return NULL;
+ /* ferror does NOT set errno! */
+ bb_error_msg_and_die("%s: I/O error", 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(const char *format, const char *name, const char *value)
{
char *result;
- char *here;
- char *there;
+ char *dst;
+ char *src;
+ char c;
- result = xmalloc(xstrlen(format) + xstrlen(name) + xstrlen(value) + 1);
+ result = xasprintf(format, name, value);
- sprintf(result, format, name, value);
-
- for (here = there = result; *there != '=' && *there; there++) {
- if (*there == '-')
- *there = '_';
- if (isalpha(*there))
- *there = toupper(*there);
-
- if (isalnum(*there) || *there == '_') {
- *here = *there;
- here++;
- }
+ for (dst = src = result; (c = *src) != '=' && c; src++) {
+ if (c == '-')
+ c = '_';
+ if (c >= 'a' && c <= 'z')
+ c -= ('a' - 'A');
+ if (isalnum(c) || c == '_')
+ *dst++ = c;
}
- memmove(here, there, xstrlen(there) + 1);
+ overlapping_strcpy(dst, src);
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;
+ char **pp;
- if (environ != NULL) {
- for (ppch = environ; *ppch; ppch++) {
- free(*ppch);
- *ppch = NULL;
+ if (G.my_environ != NULL) {
+ for (pp = G.my_environ; *pp; pp++) {
+ free(*pp);
}
- free(environ);
- environ = NULL;
+ free(G.my_environ);
}
- environ = xmalloc(sizeof(char *) * (n_env_entries + 1 /* for final NULL */ ));
- environend = environ;
- *environend = NULL;
+
+ /* note: last element will stay NULL: */
+ G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 6));
+ pp = G.my_environ;
for (i = 0; i < iface->n_options; i++) {
if (strcmp(iface->option[i].name, "up") == 0
- || 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;
+ *pp++ = setlocalenv("IF_%s=%s", iface->option[i].name, iface->option[i].value);
}
- *(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;
+ *pp++ = setlocalenv("%s=%s", "IFACE", iface->iface);
+ *pp++ = setlocalenv("%s=%s", "ADDRFAM", iface->address_family->name);
+ *pp++ = setlocalenv("%s=%s", "METHOD", iface->method->name);
+ *pp++ = setlocalenv("%s=%s", "MODE", mode);
+ if (G.startup_PATH)
+ *pp++ = setlocalenv("%s=%s", "PATH", G.startup_PATH);
}
static int doit(char *str)
{
- if (verbose || no_act) {
- error_msg("%s", 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 */
+ fflush_all();
+ child = vfork();
+ switch (child) {
+ case -1: /* failure */
return 0;
- case 0: /* child */
- execle("/bin/sh", "/bin/sh", "-c", str, NULL, environ);
- exit(127);
- default: /* parent */
+ case 0: /* child */
+ execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, (char *) NULL, G.my_environ);
+ _exit(127);
}
- waitpid(child, &status, 0);
+ safe_waitpid(child, &status, 0);
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
return 0;
}
}
- return (1);
+ 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 = xasprintf("run-parts /etc/network/if-%s.d", opt);
+ /* heh, we don't bother free'ing it */
+ return doit(buf);
}
-static int iface_up(interface_defn_t *iface)
+static int check(char *str)
{
- if (!iface->method->up(iface, check)) {
- return (-1);
- }
+ 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
-static int popen2(FILE **in, FILE **out, char *command, ...)
+#if ENABLE_FEATURE_IFUPDOWN_MAPPING
+static int popen2(FILE **in, FILE **out, char *command, char *param)
{
- va_list ap;
- char *argv[11] = { command };
- int argc;
- int infd[2], outfd[2];
+ char *argv[3] = { command, param, NULL };
+ struct fd_pair infd, outfd;
pid_t pid;
- argc = 1;
- va_start(ap, command);
- while ((argc < 10) && (argv[argc] = va_arg(ap, char *))) {
- argc++;
- }
- argv[argc] = NULL; /* make sure */
- va_end(ap);
-
- if (pipe(infd) != 0) {
- return 0;
- }
-
- if (pipe(outfd) != 0) {
- close(infd[0]);
- close(infd[1]);
- return 0;
- }
-
- fflush(NULL);
- switch (pid = fork()) {
- case -1: /* failure */
- close(infd[0]);
- close(infd[1]);
- close(outfd[0]);
- close(outfd[1]);
- return 0;
- case 0: /* child */
- dup2(infd[0], 0);
- dup2(outfd[1], 1);
- close(infd[0]);
- close(infd[1]);
- close(outfd[0]);
- close(outfd[1]);
- 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 */
+ xpiped_pair(infd);
+ xpiped_pair(outfd);
+
+ fflush_all();
+ pid = vfork();
+
+ switch (pid) {
+ case -1: /* failure */
+ bb_perror_msg_and_die("vfork");
+ case 0: /* child */
+ /* NB: close _first_, then move fds! */
+ close(infd.wr);
+ close(outfd.rd);
+ xmove_fd(infd.rd, 0);
+ xmove_fd(outfd.wr, 1);
+ BB_EXECVP(command, argv);
+ _exit(127);
+ }
+ /* parent */
+ close(infd.rd);
+ close(outfd.wr);
+ *in = xfdopen_for_write(infd.wr);
+ *out = xfdopen_for_read(outfd.rd);
+ return pid;
}
-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 = xstrdup(physical);
- pid = popen2(&in, &out, map->script, physical, NULL);
- if (pid == 0) {
- return 0;
- }
+ /* Run the mapping script. Never fails. */
+ pid = popen2(&in, &out, map->script, physical);
+
+ /* Write mappings to stdin of mapping script. */
for (i = 0; i < map->n_mappings; i++) {
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;
+ safe_waitpid(pid, &status, 0);
- 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 = xmalloc_fgetline(out);
+
+ if (new_logical) {
+ /* If we are able to read a line of output from the script,
+ * remove any trailing whitespace and use this value
+ * as the name of the logical interface. */
+ char *pch = new_logical + strlen(new_logical) - 1;
+
+ while (pch >= new_logical && isspace(*pch))
*(pch--) = '\0';
+
+ free(logical);
+ logical = new_logical;
}
}
+
fclose(out);
- return 1;
+ return logical;
}
-#endif /* CONFIG_FEATURE_IFUPDOWN_IPV6 */
+#endif /* 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;
-
- for (i = 0; i < n_ifaces; i++) {
- if (strncmp(iface, ifaces[i], xstrlen(iface)) == 0) {
- if (ifaces[i][xstrlen(iface)] == '=') {
- return i;
- }
+ unsigned iface_len = strlen(iface);
+ llist_t *search = state_list;
+
+ while (search) {
+ if ((strncmp(search->data, iface, iface_len) == 0)
+ && (search->data[iface_len] == '=')
+ ) {
+ return search;
}
+ search = search->link;
}
-
- return(-1);
+ return NULL;
}
-static void add_to_state(char ***ifaces, int *n_ifaces, int *max_ifaces, char *new_iface)
+/* read the previous state from the state file */
+static llist_t *read_iface_state(void)
{
- if (*max_ifaces == *n_ifaces) {
- *max_ifaces = (*max_ifaces * 2) + 1;
- *ifaces = xrealloc(*ifaces, sizeof(**ifaces) * *max_ifaces);
- }
+ llist_t *state_list = NULL;
+ FILE *state_fp = fopen_for_read(CONFIG_IFUPDOWN_IFSTATE_PATH);
- (*ifaces)[(*n_ifaces)++] = new_iface;
+ if (state_fp) {
+ char *start, *end_ptr;
+ while ((start = xmalloc_fgets(state_fp)) != NULL) {
+ /* We should only need to check for a single character */
+ end_ptr = start + strcspn(start, " \t\n");
+ *end_ptr = '\0';
+ llist_add_to(&state_list, start);
+ }
+ fclose(state_fp);
+ }
+ return state_list;
}
-extern int ifupdown_main(int argc, char **argv)
+
+int ifupdown_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ifupdown_main(int argc, char **argv)
{
- int (*cmds) (interface_defn_t *) = NULL;
- interfaces_file_t *defn;
- FILE *state_fp = NULL;
- char **target_iface = NULL;
- char **state = NULL; /* list of iface=liface */
- char *interfaces = "/etc/network/interfaces";
- char *statefile = "/var/run/ifstate";
-
-#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;
+ int (*cmds)(struct interface_defn_t *);
+ struct interfaces_file_t *defn;
+ llist_t *target_list = NULL;
+ const char *interfaces = "/etc/network/interfaces";
+ bool any_failures = 0;
+
+ INIT_G();
+
+ G.startup_PATH = getenv("PATH");
+ cmds = iface_down;
if (applet_name[2] == 'u') {
/* ifup command */
cmds = iface_up;
- } else {
- /* ifdown command */
- 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 = 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:
- show_usage();
- break;
- }
}
+ getopt32(argv, OPTION_STR, &interfaces);
if (argc - optind > 0) {
- if (do_all) {
- show_usage();
- }
+ if (DO_ALL) bb_show_usage();
} else {
- if (!do_all) {
- show_usage();
- }
- }
-
- defn = read_interfaces(interfaces);
- if (!defn) {
- error_msg_and_die("couldn't read interfaces file \"%s\"", interfaces);
+ if (!DO_ALL) bb_show_usage();
}
- 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 (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';
- add_to_state(&state, &n_state, &max_state, start);
- }
- }
+ debug_noise("reading %s file:\n", interfaces);
+ defn = read_interfaces(interfaces);
+ debug_noise("\ndone reading %s\n\n", interfaces);
- 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;
- }
+ /* Create a list of interfaces to work on */
+ if (DO_ALL) {
+ target_list = defn->autointerfaces;
} else {
- target_iface = argv + optind;
- n_target_ifaces = argc - optind;
+ llist_add_to_end(&target_list, argv[optind]);
}
-
- for (i = 0; i < n_target_ifaces; i++) {
- interface_defn_t *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;
+ bool okay = 0;
+ int cmds_ret;
- strncpy(iface, target_iface[i], sizeof(iface));
- iface[sizeof(iface) - 1] = '\0';
+ iface = xstrdup(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 = xstrdup(pch + 1);
} else {
- strncpy(liface, iface, sizeof(liface));
- liface[sizeof(liface) - 1] = '\0';
+ liface = xstrdup(iface);
}
- if (!force) {
- int already_up = lookfor_iface(state, n_state, iface);;
+
+ if (!FORCE) {
+ llist_t *state_list = read_iface_state();
+ 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;
}
+ llist_free(state_list, free);
}
-#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
- if ((cmds == iface_up) && run_mappings) {
- mapping_defn_t *currmap;
- for (currmap = defn->mappings; currmap; currmap = currmap->next) {
+#if ENABLE_FEATURE_IFUPDOWN_MAPPING
+ 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) {
- error_msg("Running mapping script %s on %s", currmap->script, liface);
+ if (VERBOSE) {
+ 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);
- if (cmds(currif) == -1) {
- printf
- ("Don't seem to be have all the variables for %s/%s.\n",
- liface, currif->address_family->name);
+ /* 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",
+ 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) {
+ bb_putchar('\n');
}
- if (!okay && !force) {
- error_msg("Ignoring unknown interface %s=%s.", iface, liface);
- } else {
- int already_up = lookfor_iface(state, n_state, iface);
+ if (!okay && !FORCE) {
+ bb_error_msg("ignoring unknown interface %s", liface);
+ any_failures = 1;
+ } else if (!NO_ACT) {
+ /* update the state file */
+ FILE *state_fp;
+ llist_t *state;
+ llist_t *state_list = read_iface_state();
+ 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);
- if (already_up == -1) {
- add_to_state(&state, &n_state, &max_state, newiface);
+ char * const newiface = xasprintf("%s=%s", iface, liface);
+ if (iface_state == NULL) {
+ llist_add_to_end(&state_list, newiface);
} else {
- free(state[already_up]);
- state[already_up] = newiface;
- }
- } else if (cmds == iface_down) {
- if (already_up != -1) {
- state[already_up] = state[--n_state];
+ free(iface_state->data);
+ iface_state->data = newiface;
}
- }
- }
- 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));
+ } else {
+ /* Remove an interface from state_list */
+ llist_unlink(&state_list, iface_state);
+ free(llist_pop(&iface_state));
}
- rewind(state_fp);
- for (j = 0; j < n_state; j++) {
- fputs(state[i], state_fp);
- fputc('\n', state_fp);
+ /* Actually write the new state */
+ state_fp = xfopen_for_write(CONFIG_IFUPDOWN_IFSTATE_PATH);
+ state = state_list;
+ while (state) {
+ if (state->data) {
+ fprintf(state_fp, "%s\n", state->data);
+ }
+ state = state->link;
}
- fflush(state_fp);
+ fclose(state_fp);
+ llist_free(state_list, free);
}
}
- if (state_fp != NULL) {
- fclose(state_fp);
- state_fp = NULL;
- }
-
- return 0;
+ return any_failures;
}