non-busybox dhcp clients (was: PATCH: ifupdown.c, udhcpc, and standalone shell)
Gabriel L. Somlo
somlo at cmu.edu
Tue Oct 10 15:52:16 UTC 2006
Denis,
I just realized that my 'execable' patch was done before the migration
to kbuild, so here it goes again.
First three diffs add execable to libbb (execable.c, libbb.h, and
libbb/Kbuild)
Next diff modifies ifupdown.c to use udhcpc if built-in or find an
external client by searching the $PATH using execable.
Last diff is against debianutils/which.c and makes it much simpler and
more readable by calling execable to find things in $PATH.
Please apply. Thanks,
Gabriel
diff -NarU5 busybox.orig/libbb/execable.c busybox/libbb/execable.c
--- busybox.orig/libbb/execable.c 1969-12-31 19:00:00.000000000 -0500
+++ busybox/libbb/execable.c 2006-10-10 11:45:05.000000000 -0400
@@ -0,0 +1,64 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+#include "libbb.h"
+
+/* check if path points to an executable file;
+ * return 1 if found;
+ * return 0 otherwise;
+ */
+int execable_file(const char *name)
+{
+ struct stat s;
+ return (!access(name, X_OK) && !stat(name, &s) && S_ISREG(s.st_mode));
+}
+
+/* search $PATH for an executable file;
+ * return allocated string containing full path if found;
+ * return NULL otherwise;
+ */
+char *find_execable(const char *filename)
+{
+ char *path = xstrdup(getenv("PATH"));
+ char *p, *n, *r, *ret = NULL;
+
+ p = path;
+ while (p) {
+ n = strchr(p, ':');
+ if (n)
+ *n++ = '\0';
+ if (*p != '\0') { /* handle PATH=":foo::bar:" situation */
+ r = concat_path_file(p, filename);
+ if (execable_file(r)) {
+ ret = r;
+ break;
+ }
+ free(r);
+ }
+ p = n;
+ }
+ if (path)
+ free(path);
+ return ret;
+}
+
+/* search $PATH for an executable file;
+ * return 1 if found;
+ * return 0 otherwise;
+ */
+int exists_execable(const char *filename)
+{
+ char *ret = find_execable(filename);
+ if (ret) {
+ free(ret);
+ return 1;
+ }
+ return 0;
+}
+
diff -NarU5 busybox.orig/include/libbb.h busybox/include/libbb.h
--- busybox.orig/include/libbb.h 2006-10-10 11:44:21.000000000 -0400
+++ busybox/include/libbb.h 2006-10-10 11:45:05.000000000 -0400
@@ -421,10 +421,14 @@
char *concat_subpath_file(const char *path, const char *filename);
char *last_char_is(const char *s, int c);
char *fgets_str(FILE *file, const char *terminating_string);
+int execable_file(const char *name);
+char *find_execable(const char *filename);
+int exists_execable(const char *filename);
+
extern USE_DESKTOP(long long) int uncompress(int fd_in, int fd_out);
extern int inflate(int in, int out);
extern struct hostent *xgethostbyname(const char *name);
extern struct hostent *xgethostbyname2(const char *name, int af);
diff -NarU5 busybox.orig/libbb/Kbuild busybox/libbb/Kbuild
--- busybox.orig/libbb/Kbuild 2006-10-10 11:44:20.000000000 -0400
+++ busybox/libbb/Kbuild 2006-10-10 11:45:48.000000000 -0400
@@ -26,11 +26,11 @@
xgethostbyname.o xgethostbyname2.o xreadlink.o \
fclose_nonstdin.o fflush_stdout_and_exit.o \
getopt32.o default_error_retval.o wfopen_input.o speed_table.o \
perror_nomsg_and_die.o perror_nomsg.o skip_whitespace.o bb_askpass.o \
warn_ignoring_args.o concat_subpath_file.o vfork_daemon_rexec.o \
- bb_do_delay.o uuencode.o info_msg.o vinfo_msg.o
+ bb_do_delay.o uuencode.o info_msg.o vinfo_msg.o execable.o
# conditionally compiled objects:
lib-$(CONFIG_FEATURE_MOUNT_LOOP) += loop.o
lib-$(CONFIG_LOSETUP) += loop.o
lib-$(CONFIG_FEATURE_MTAB_SUPPORT) += mtab.o
diff -NarU5 busybox.orig/networking/ifupdown.c busybox/networking/ifupdown.c
--- busybox.orig/networking/ifupdown.c 2006-10-10 11:44:17.000000000 -0400
+++ busybox/networking/ifupdown.c 2006-10-10 11:45:05.000000000 -0400
@@ -131,11 +131,11 @@
result += count_bits(d);
return (int)result;
}
#endif
-static void addstr(char **buf, size_t *len, size_t *pos, char *str, size_t str_length)
+static void addstr(char **buf, size_t *len, size_t *pos, const char *str, size_t str_length)
{
if (*pos + str_length >= *len) {
char *newbuf;
newbuf = xrealloc(*buf, *len * 2 + str_length + 1);
@@ -148,22 +148,22 @@
str++;
}
(*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];
} else {
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 (strncmpz(id, "iface", idlen) == 0) {
char *result;
@@ -186,11 +186,11 @@
}
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;
size_t pos = 0, len = 0;
size_t old_pos[MAX_OPT_DEPTH] = { 0 };
@@ -292,11 +292,11 @@
return result;
}
/* 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;
out = parse(command, ifd);
@@ -447,47 +447,69 @@
result += execute("ifconfig %iface% down", ifd, exec);
#endif
return ((result == 2) ? 2 : 0);
}
-static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
+#ifndef CONFIG_APP_UDHCPC
+struct dhcp_client_t
{
- if (execute("udhcpc -R -n -p /var/run/udhcpc.%iface%.pid -i %iface% "
- "[[-H %hostname%]] [[-c %clientid%]] [[-s %script%]]", ifd, exec))
- return 1;
+ const char *name;
+ const char *startcmd;
+ const char *stopcmd;
+};
- /* 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;
+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)
+{
+#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)
{
- 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;
-
+#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;
diff -NarU5 busybox.orig/debianutils/which.c busybox/debianutils/which.c
--- busybox.orig/debianutils/which.c 2006-10-10 11:44:18.000000000 -0400
+++ busybox/debianutils/which.c 2006-10-10 11:46:09.000000000 -0400
@@ -1,83 +1,44 @@
/* vi: set sw=4 ts=4: */
/*
* Which implementation for busybox
*
* Copyright (C) 1999-2004 by Erik Andersen <andersen at codepoet.org>
+ * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
*
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*
* Based on which from debianutils
*/
#include "busybox.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-
-static int is_executable_file(char *a, struct stat *b)
-{
- return (!access(a,X_OK) && !stat(a, b) && S_ISREG(b->st_mode));
-}
int which_main(int argc, char **argv)
{
- int status;
- size_t i, count;
- char *path_list, *p;
+ int status = EXIT_SUCCESS;
- if (argc <= 1 || argv[1][0] == '-') {
+ if (argc <= 1 || **(argv + 1) == '-') {
bb_show_usage();
}
argc--;
- path_list = getenv("PATH");
- if (path_list != NULL) {
- count = 1;
- p = path_list;
- while ((p = strchr(p, ':')) != NULL) {
- *p++ = 0;
- count++;
- }
- } else {
- path_list = "/bin\0/sbin\0/usr/bin\0/usr/sbin\0/usr/local/bin";
- count = 5;
- }
-
- status = EXIT_SUCCESS;
while (argc-- > 0) {
- struct stat stat_b;
- char *buf;
+ char *p;
argv++;
- buf = argv[0];
- /* If filename is either absolute or contains slashes,
- * stat it */
- if (strchr(buf, '/')) {
- if (is_executable_file(buf, &stat_b)) {
- puts(buf);
- goto next;
- }
+ if (strchr(*argv, '/')) {
+ if (execable_file(*argv))
+ puts(*argv);
+ else
+ status = EXIT_FAILURE;
} else {
- /* File doesn't contain slashes */
- p = path_list;
- for (i = 0; i < count; i++) {
- /* Empty component in PATH is treated as . */
- buf = concat_path_file(p[0] ? p : ".", argv[0]);
- if (is_executable_file(buf, &stat_b)) {
- puts(buf);
- free(buf);
- goto next;
- }
- free(buf);
- p += strlen(p) + 1;
- }
+ if ((p = find_execable(*argv))) {
+ puts(p);
+ free(p);
+ } else
+ status = EXIT_FAILURE;
}
- status = EXIT_FAILURE;
- next: /* nothing */;
}
+
bb_fflush_stdout_and_exit(status);
}
More information about the busybox
mailing list