struct mapping_defn_t *mappings;
};
-static unsigned option_mask;
#define OPTION_STR "anvf" USE_FEATURE_IFUPDOWN_MAPPING("m") "i:"
enum {
OPT_do_all = 0x1,
OPT_force = 0x8,
OPT_no_mappings = 0x10,
};
-#define DO_ALL (option_mask & OPT_do_all)
-#define NO_ACT (option_mask & OPT_no_act)
-#define VERBOSE (option_mask & OPT_verbose)
-#define FORCE (option_mask & OPT_force)
-#define NO_MAPPINGS (option_mask & OPT_no_mappings)
+#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;
}
#endif
-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);
}
}
-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;
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;
}
/* execute() returns 1 for success and 0 for failure */
-static int execute(char *command, struct interface_defn_t *ifd, execfn *exec)
+static int execute(const char *command, struct interface_defn_t *ifd, execfn *exec)
{
char *out;
int ret;
return ((result == 2) ? 2 : 0);
}
+#ifndef CONFIG_APP_UDHCPC
+struct dhcp_client_t
+{
+ 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 (execute("udhcpc -n -p /var/run/udhcpc.%iface%.pid -i "
- "%iface% [[-H %hostname%]] [[-c %clientid%]]", ifd, exec)) return 1;
- if (execute("pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]", ifd, exec)) return 1;
- if (execute("dhclient -pf /var/run/dhclient.%iface%.pid %iface%", ifd, exec)) return 1;
- if (execute("dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] "
- "[[-l %leasetime%]] %iface%", ifd, exec)) return 1;
+#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);
+ }
+ bb_error_msg("no dhcp clients found");
return 0;
+#endif
}
static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
{
- /* 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 */
- if (execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec)
- || execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec))
- return 1;
- if (execute("pump -i %iface% -k", ifd, exec)) return 1;
- if (execute("kill -9 `cat /var/run/dhclient.%iface%.pid` 2>/dev/null", ifd, exec)) return 1;
- if (execute("dhcpcd -k %iface%", ifd, exec)) return 1;
+#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);
+ }
+ 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)
}
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, },
}
/* Skip over leading whitespace */
- word = *buf;
- while (isspace(*word)) {
- ++word;
- }
+ word = skip_whitespace(*buf);
/* Skip over comments */
if (*word == '#') {
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);
}
/* ship any trailing whitespace */
- while (isspace(*buf_ptr)) {
- ++buf_ptr;
- }
+ buf_ptr = skip_whitespace(buf_ptr);
if (buf_ptr[0] != '\0') {
bb_error_msg("too many parameters \"%s\"", buf);
static int doit(char *str)
{
- if (option_mask & (OPT_no_act|OPT_verbose)) {
+ if (option_mask32 & (OPT_no_act|OPT_verbose)) {
puts(str);
}
- if (!(option_mask & OPT_no_act)) {
+ if (!(option_mask32 & OPT_no_act)) {
pid_t child;
int status;
llist_t *target_list = NULL;
const char *interfaces = "/etc/network/interfaces";
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;
}
- option_mask = bb_getopt_ulflags(argc, argv, OPTION_STR, &interfaces);
+ getopt32(argc, argv, OPTION_STR, &interfaces);
if (argc - optind > 0) {
if (DO_ALL) bb_show_usage();
} else
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;
projects / oweals / busybox.git / blobdiff