#include <stdlib.h>
#include <string.h>
#include <getopt.h>
-#include <unistd.h>
#include <signal.h>
#include <stdarg.h>
#include <syslog.h>
#include "config.h"
#include "system.h"
#include "interface.h"
+#include "wireless.h"
+#include "proto.h"
unsigned int debug_mask = 0;
const char *main_path = DEFAULT_MAIN_PATH;
+const char *config_path = DEFAULT_CONFIG_PATH;
const char *resolv_conf = DEFAULT_RESOLV_CONF;
static char **global_argv;
static void
netifd_delete_process(struct netifd_process *proc)
{
- if (proc->uloop.pending)
- uloop_process_delete(&proc->uloop);
list_del(&proc->list);
ustream_free(&proc->log.stream);
close(proc->log.fd.fd);
char *data;
int len = 0;
- proc = container_of(s, struct netifd_process, log);
+ proc = container_of(s, struct netifd_process, log.stream);
log_prefix = proc->log_prefix;
if (!log_prefix)
log_prefix = "process";
netifd_log_message(L_NOTICE, "%s (%d): %s [...]\n",
log_prefix, proc->uloop.pid, data);
proc->log_overflow = true;
- }
+ } else
+ break;
+
ustream_consume(s, len);
} while (1);
}
goto error;
if (!pid) {
+ int i;
+
if (env) {
while (*env) {
putenv(*env);
}
}
if (proc->dir_fd >= 0)
- fchdir(proc->dir_fd);
-
- dup2(pfds[1], 0);
- dup2(pfds[1], 1);
- dup2(pfds[1], 2);
+ if (fchdir(proc->dir_fd)) {}
close(pfds[0]);
- close(pfds[1]);
+
+ for (i = 0; i <= 2; i++) {
+ if (pfds[1] == i)
+ continue;
+
+ dup2(pfds[1], i);
+ }
+
+ if (pfds[1] > 2)
+ close(pfds[1]);
execvp(argv[0], (char **) argv);
exit(127);
}
- if (pid < 0)
- goto error;
-
close(pfds[1]);
proc->uloop.cb = netifd_process_cb;
proc->uloop.pid = pid;
return;
kill(proc->uloop.pid, SIGKILL);
+ uloop_process_delete(&proc->uloop);
netifd_delete_process(proc);
}
execvp(global_argv[0], global_argv);
}
-static void netifd_do_reload(struct uloop_timeout *timeout)
+int netifd_reload(void)
{
- config_init_all();
-}
-
-static struct uloop_timeout main_timer;
-
-void netifd_reload(void)
-{
- main_timer.cb = netifd_do_reload;
- uloop_timeout_set(&main_timer, 100);
+ return config_init_all();
}
void netifd_restart(void)
{
- main_timer.cb = netifd_do_restart;
+ static struct uloop_timeout main_timer = {
+ .cb = netifd_do_restart
+ };
+
interface_set_down(NULL);
uloop_timeout_set(&main_timer, 1000);
}
" -d <mask>: Mask for debug messages\n"
" -s <path>: Path to the ubus socket\n"
" -p <path>: Path to netifd addons (default: %s)\n"
+ " -c <path>: Path to UCI configuration\n"
" -h <path>: Path to the hotplug script\n"
" -r <path>: Path to resolv.conf\n"
" -l <level>: Log output level (default: %d)\n"
global_argv = argv;
- while ((ch = getopt(argc, argv, "d:s:p:h:r:l:S")) != -1) {
+ while ((ch = getopt(argc, argv, "d:s:p:c:h:r:l:S")) != -1) {
switch(ch) {
case 'd':
debug_mask = strtoul(optarg, NULL, 0);
case 'p':
main_path = optarg;
break;
+ case 'c':
+ config_path = optarg;
+ break;
case 'h':
hotplug_cmd_path = optarg;
break;
return 1;
}
+ proto_shell_init();
+ wireless_init();
+
if (system_init()) {
fprintf(stderr, "Failed to initialize system control\n");
return 1;