projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only update resolv.conf if changed (avoid logspam)
[project/netifd.git]
/
proto-shell.c
diff --git
a/proto-shell.c
b/proto-shell.c
index
2317209
..
02f1836
100644
(file)
--- a/
proto-shell.c
+++ b/
proto-shell.c
@@
-30,8
+30,9
@@
#include "interface.h"
#include "interface-ip.h"
#include "proto.h"
#include "interface.h"
#include "interface-ip.h"
#include "proto.h"
+#include "system.h"
-static
struct netifd_fd proto_fd
;
+static
int proto_fd = -1
;
enum proto_shell_sm {
S_IDLE,
enum proto_shell_sm {
S_IDLE,
@@
-316,6
+317,7
@@
proto_shell_free(struct interface_proto_state *proto)
struct proto_shell_state *state;
state = container_of(proto, struct proto_shell_state, proto);
struct proto_shell_state *state;
state = container_of(proto, struct proto_shell_state, proto);
+ uloop_timeout_cancel(&state->teardown_timeout);
proto_shell_clear_host_dep(state);
netifd_kill_process(&state->script_task);
netifd_kill_process(&state->proto_task);
proto_shell_clear_host_dep(state);
netifd_kill_process(&state->script_task);
netifd_kill_process(&state->proto_task);
@@
-455,6
+457,7
@@
proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
interface_set_l3_dev(iface, dev);
device_claim(&iface->l3_dev);
interface_set_l3_dev(iface, dev);
device_claim(&iface->l3_dev);
+ device_set_present(dev, true);
}
if (!keep)
}
if (!keep)
@@
-703,10
+706,10
@@
proto_shell_attach(const struct proto_handler *h, struct interface *iface,
state->proto.cb = proto_shell_handler;
state->teardown_timeout.cb = proto_shell_teardown_timeout_cb;
state->script_task.cb = proto_shell_script_cb;
state->proto.cb = proto_shell_handler;
state->teardown_timeout.cb = proto_shell_teardown_timeout_cb;
state->script_task.cb = proto_shell_script_cb;
- state->script_task.dir_fd = proto_fd
.fd
;
+ state->script_task.dir_fd = proto_fd;
state->script_task.log_prefix = iface->name;
state->proto_task.cb = proto_shell_task_cb;
state->script_task.log_prefix = iface->name;
state->proto_task.cb = proto_shell_task_cb;
- state->proto_task.dir_fd = proto_fd
.fd
;
+ state->proto_task.dir_fd = proto_fd;
state->proto_task.log_prefix = iface->name;
state->handler = container_of(h, struct proto_shell_handler, proto);
state->proto_task.log_prefix = iface->name;
state->handler = container_of(h, struct proto_shell_handler, proto);
@@
-810,15
+813,12
@@
proto_shell_add_handler(const char *script, json_object *obj)
name = json_object_get_string(tmp);
name = json_object_get_string(tmp);
- handler = calloc(1, sizeof(*handler) +
- strlen(script) + 1 +
- strlen(name) + 1);
+ handler = calloc_a(sizeof(*handler) + strlen(script) + 1,
+ &str, strlen(name) + 1);
if (!handler)
return;
strcpy(handler->script_name, script);
if (!handler)
return;
strcpy(handler->script_name, script);
-
- str = handler->script_name + strlen(handler->script_name) + 1;
strcpy(str, name);
proto = &handler->proto;
strcpy(str, name);
proto = &handler->proto;
@@
-906,11
+906,11
@@
static void __init proto_shell_init(void)
if (chdir("./proto"))
goto close_cur;
if (chdir("./proto"))
goto close_cur;
- proto_fd
.fd
= open(".", O_RDONLY | O_DIRECTORY);
- if (proto_fd
.fd
< 0)
+ proto_fd = open(".", O_RDONLY | O_DIRECTORY);
+ if (proto_fd < 0)
goto close_cur;
goto close_cur;
-
netifd_fd_add(&
proto_fd);
+
system_fd_set_cloexec(
proto_fd);
glob("./*.sh", 0, NULL, &g);
for (i = 0; i < g.gl_pathc; i++)
proto_shell_add_script(g.gl_pathv[i]);
glob("./*.sh", 0, NULL, &g);
for (i = 0; i < g.gl_pathc; i++)
proto_shell_add_script(g.gl_pathv[i]);