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;
+static char *startup_PATH;
+
#if ENABLE_FEATURE_IFUPDOWN_IPV4 || ENABLE_FEATURE_IFUPDOWN_IPV6
#ifdef CONFIG_FEATURE_IFUPDOWN_IP
return ((result == 2) ? 2 : 0);
}
-static int execable(char *program)
+static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
{
- struct stat buf;
- if (0 == stat(program, &buf)) {
- if (S_ISREG(buf.st_mode) && (S_IXUSR & buf.st_mode)) {
- return(1);
- }
- }
- return(0);
+ if (execute("udhcpc -R -n -p /var/run/udhcpc.%iface%.pid -i %iface% "
+ "[[-H %hostname%]] [[-c %clientid%]] [[-s %script%]]", ifd, exec))
+ return 1;
+
+ /* 2006-09-30: The following are deprecated, and should eventually be
+ * removed. For non-busybox (i.e., other than udhcpc) clients, use
+ * 'iface foo inet manual' in /etc/network/interfaces, and supply
+ * start/stop commands explicitly via up/down. */
+
+ 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;
+
+ return 0;
}
-static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
+static int dhcp_down(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));
- }
- return(0);
+ if (execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
+ ifd, exec)) return 1;
+
+ /* 2006-09-30: The following are deprecated, and should eventually be
+ * removed. For non-busybox (i.e., other than udhcpc) clients, use
+ * 'iface foo inet manual' in /etc/network/interfaces, and supply
+ * start/stop commands explicitly via up/down. */
+
+ 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;
+
+ return static_down(ifd, exec);
}
-static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
+static int manual_up_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);
- }
- return (result || static_down(ifd, 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, },
*(environend++) = setlocalenv("%s=%s", "ADDRFAM", iface->address_family->name);
*(environend++) = setlocalenv("%s=%s", "METHOD", iface->method->name);
*(environend++) = setlocalenv("%s=%s", "MODE", mode);
- /* FIXME: we must not impose our own PATH, it is admin's job!
- Use PATH from parent env */
- *(environend++) = setlocalenv("%s=%s", "PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin");
+ *(environend++) = setlocalenv("%s=%s", "PATH", startup_PATH);
}
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;
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
exit(EXIT_FAILURE);
}
+ startup_PATH = getenv("PATH");
+ if (!startup_PATH) startup_PATH = "";
+
/* Create a list of interfaces to work on */
if (DO_ALL) {
if (cmds == iface_up) {
projects / oweals / busybox.git / blobdiff