projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
interface: apply device config passed through interface config
[project/netifd.git]
/
main.c
diff --git
a/main.c
b/main.c
index
5bfd87a
..
bbae97b
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-15,7
+15,6
@@
#include <stdlib.h>
#include <string.h>
#include <getopt.h>
#include <stdlib.h>
#include <string.h>
#include <getopt.h>
-#include <unistd.h>
#include <signal.h>
#include <stdarg.h>
#include <syslog.h>
#include <signal.h>
#include <stdarg.h>
#include <syslog.h>
@@
-25,9
+24,12
@@
#include "config.h"
#include "system.h"
#include "interface.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;
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;
const char *resolv_conf = DEFAULT_RESOLV_CONF;
static char **global_argv;
@@
-54,8
+56,6
@@
static bool use_syslog = true;
static void
netifd_delete_process(struct netifd_process *proc)
{
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);
list_del(&proc->list);
ustream_free(&proc->log.stream);
close(proc->log.fd.fd);
@@
-85,7
+85,7
@@
netifd_process_log_read_cb(struct ustream *s, int bytes)
char *data;
int len = 0;
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";
log_prefix = proc->log_prefix;
if (!log_prefix)
log_prefix = "process";
@@
-113,15
+113,13
@@
netifd_process_log_read_cb(struct ustream *s, int bytes)
netifd_log_message(L_NOTICE, "%s (%d): %s [...]\n",
log_prefix, proc->uloop.pid, data);
proc->log_overflow = true;
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);
}
ustream_consume(s, len);
} while (1);
}
-static void netifd_process_log_state_cb(struct ustream *s)
-{
-}
-
static void
netifd_process_cb(struct uloop_process *proc, int ret)
{
static void
netifd_process_cb(struct uloop_process *proc, int ret)
{
@@
-148,6
+146,8
@@
netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
goto error;
if (!pid) {
goto error;
if (!pid) {
+ int i;
+
if (env) {
while (*env) {
putenv(*env);
if (env) {
while (*env) {
putenv(*env);
@@
-155,14
+155,19
@@
netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
}
}
if (proc->dir_fd >= 0)
}
}
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[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);
execvp(argv[0], (char **) argv);
exit(127);
@@
-180,7
+185,6
@@
netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
system_fd_set_cloexec(pfds[0]);
proc->log.stream.string_data = true;
proc->log.stream.notify_read = netifd_process_log_read_cb;
system_fd_set_cloexec(pfds[0]);
proc->log.stream.string_data = true;
proc->log.stream.notify_read = netifd_process_log_read_cb;
- proc->log.stream.notify_state = netifd_process_log_state_cb;
ustream_fd_init(&proc->log, pfds[0]);
return 0;
ustream_fd_init(&proc->log, pfds[0]);
return 0;
@@
-198,6
+202,7
@@
netifd_kill_process(struct netifd_process *proc)
return;
kill(proc->uloop.pid, SIGKILL);
return;
kill(proc->uloop.pid, SIGKILL);
+ uloop_process_delete(&proc->uloop);
netifd_delete_process(proc);
}
netifd_delete_process(proc);
}
@@
-206,22
+211,17
@@
static void netifd_do_restart(struct uloop_timeout *timeout)
execvp(global_argv[0], global_argv);
}
execvp(global_argv[0], global_argv);
}
-static void netifd_do_reload(struct uloop_timeout *timeout)
-{
- config_init_all();
-}
-
-static struct uloop_timeout main_timer;
-
void netifd_reload(void)
{
void netifd_reload(void)
{
- main_timer.cb = netifd_do_reload;
- uloop_timeout_set(&main_timer, 100);
+ config_init_all();
}
void netifd_restart(void)
{
}
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);
}
interface_set_down(NULL);
uloop_timeout_set(&main_timer, 1000);
}
@@
-233,6
+233,7
@@
static int usage(const char *progname)
" -d <mask>: Mask for debug messages\n"
" -s <path>: Path to the ubus socket\n"
" -p <path>: Path to netifd addons (default: %s)\n"
" -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"
" -h <path>: Path to the hotplug script\n"
" -r <path>: Path to resolv.conf\n"
" -l <level>: Log output level (default: %d)\n"
@@
-282,7
+283,7
@@
int main(int argc, char **argv)
global_argv = argv;
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);
switch(ch) {
case 'd':
debug_mask = strtoul(optarg, NULL, 0);
@@
-293,6
+294,9
@@
int main(int argc, char **argv)
case 'p':
main_path = optarg;
break;
case 'p':
main_path = optarg;
break;
+ case 'c':
+ config_path = optarg;
+ break;
case 'h':
hotplug_cmd_path = optarg;
break;
case 'h':
hotplug_cmd_path = optarg;
break;
@@
-323,6
+327,9
@@
int main(int argc, char **argv)
return 1;
}
return 1;
}
+ proto_shell_init();
+ wireless_init();
+
if (system_init()) {
fprintf(stderr, "Failed to initialize system control\n");
return 1;
if (system_init()) {
fprintf(stderr, "Failed to initialize system control\n");
return 1;