#include "system.h"
#include "interface.h"
#include "wireless.h"
+#include "proto.h"
+#include "extdev.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)
{
+ while (ustream_poll(&proc->log.stream));
list_del(&proc->list);
ustream_free(&proc->log.stream);
close(proc->log.fd.fd);
struct netifd_process *np;
np = container_of(proc, struct netifd_process, uloop);
- while (ustream_poll(&np->log.stream));
netifd_delete_process(np);
- return np->cb(np, ret);
+ np->cb(np, ret);
+ return;
}
int
exit(127);
}
- if (pid < 0)
- goto error;
-
close(pfds[1]);
proc->uloop.cb = netifd_process_cb;
proc->uloop.pid = pid;
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"
+ " (default: "DEFAULT_HOTPLUG_PATH")\n"
" -r <path>: Path to resolv.conf\n"
" -l <level>: Log output level (default: %d)\n"
" -S: Use stderr instead of syslog for log messages\n"
- " (default: "DEFAULT_HOTPLUG_PATH")\n"
"\n", progname, main_path, DEFAULT_LOG_LEVEL);
return 1;
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;
break;
case 'l':
log_level = atoi(optarg);
- if (log_level >= ARRAY_SIZE(log_class))
- log_level = ARRAY_SIZE(log_class) - 1;
+ if (log_level >= (int)ARRAY_SIZE(log_class))
+ log_level = (int)ARRAY_SIZE(log_class) - 1;
break;
#ifndef DUMMY_MODE
case 'S':
return 1;
}
+ proto_shell_init();
+ extdev_init();
wireless_init();
if (system_init()) {