projects
/
project
/
odhcpd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle reload mechanism
[project/odhcpd.git]
/
src
/
config.c
diff --git
a/src/config.c
b/src/config.c
index
e455965
..
f6a5327
100644
(file)
--- a/
src/config.c
+++ b/
src/config.c
@@
-254,10
+254,10
@@
err:
}
}
-int config_parse_interface(
struct blob_attr *b
, const char *name, bool overwrite)
+int config_parse_interface(
void *data, size_t len
, const char *name, bool overwrite)
{
struct blob_attr *tb[IFACE_ATTR_MAX], *c;
{
struct blob_attr *tb[IFACE_ATTR_MAX], *c;
- blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
blob_data(b), blob_len(b)
);
+ blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
data, len
);
if (tb[IFACE_ATTR_INTERFACE])
name = blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]);
if (tb[IFACE_ATTR_INTERFACE])
name = blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]);
@@
-270,13
+270,13
@@
int config_parse_interface(struct blob_attr *b, const char *name, bool overwrite
iface = calloc(1, sizeof(*iface));
strncpy(iface->name, name, sizeof(iface->name) - 1);
list_add(&iface->head, &interfaces);
iface = calloc(1, sizeof(*iface));
strncpy(iface->name, name, sizeof(iface->name) - 1);
list_add(&iface->head, &interfaces);
- } else {
+ } else
if (overwrite)
{
clean_interface(iface);
}
const char *ifname = NULL;
#ifdef WITH_UBUS
clean_interface(iface);
}
const char *ifname = NULL;
#ifdef WITH_UBUS
- if (overwrite)
+ if (overwrite
|| !iface->ifname[0]
)
ifname = ubus_get_ifname(name);
#endif
if ((c = tb[IFACE_ATTR_IFNAME]))
ifname = ubus_get_ifname(name);
#endif
if ((c = tb[IFACE_ATTR_IFNAME]))
@@
-284,10
+284,12
@@
int config_parse_interface(struct blob_attr *b, const char *name, bool overwrite
else if ((c = tb[IFACE_ATTR_NETWORKID]))
ifname = blobmsg_get_string(c);
else if ((c = tb[IFACE_ATTR_NETWORKID]))
ifname = blobmsg_get_string(c);
- if (!ifname)
+ if (!if
ace->ifname[0] && !if
name)
return -1;
return -1;
- strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
+ if (ifname)
+ strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
+
iface->inuse = true;
if (overwrite)
iface->inuse = true;
if (overwrite)
@@
-481,14
+483,21
@@
static int set_interface(struct uci_section *s)
{
blob_buf_init(&b, 0);
uci_to_blob(&b, s, &interface_attr_list);
{
blob_buf_init(&b, 0);
uci_to_blob(&b, s, &interface_attr_list);
- return config_parse_interface(b
.head
, s->e.name, true);
+ return config_parse_interface(b
lob_data(b.head), blob_len(b.head)
, s->e.name, true);
}
static volatile int do_reload = false;
}
static volatile int do_reload = false;
+void odhcpd_reload(void)
+{
+ uloop_cancelled = true;
+ do_reload = true;
+}
+
+
static void set_stop(int signal)
{
static void set_stop(int signal)
{
- uloop_
end()
;
+ uloop_
cancelled = true
;
do_reload = (signal == SIGHUP);
}
do_reload = (signal == SIGHUP);
}
@@
-499,6
+508,10
@@
void odhcpd_run(void)
signal(SIGHUP, set_stop);
signal(SIGINT, set_stop);
signal(SIGHUP, set_stop);
signal(SIGINT, set_stop);
+#ifdef WITH_UBUS
+ init_ubus();
+#endif
+
do {
do_reload = uloop_cancelled = false;
do {
do_reload = uloop_cancelled = false;
@@
-532,7
+545,7
@@
void odhcpd_run(void)
#endif
// Evaluate hybrid mode for master
#endif
// Evaluate hybrid mode for master
- struct interface *master = NULL, *i;
+ struct interface *master = NULL, *i
, *n
;
list_for_each_entry(i, &interfaces, head) {
if (!i->master)
continue;
list_for_each_entry(i, &interfaces, head) {
if (!i->master)
continue;
@@
-557,8
+570,8
@@
void odhcpd_run(void)
}
}
- list_for_each_entry
(i
, &interfaces, head) {
- if (i->inuse
&& !i->ignore
) {
+ list_for_each_entry
_safe(i, n
, &interfaces, head) {
+ if (i->inuse) {
// Resolve hybrid mode
if (i->dhcpv6 == RELAYD_HYBRID)
i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ?
// Resolve hybrid mode
if (i->dhcpv6 == RELAYD_HYBRID)
i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ?
@@
-576,6
+589,7
@@
void odhcpd_run(void)
setup_dhcpv6_interface(i, true);
setup_ndp_interface(i, true);
setup_dhcpv4_interface(i, true);
setup_dhcpv6_interface(i, true);
setup_ndp_interface(i, true);
setup_dhcpv4_interface(i, true);
+ i->inuse = false;
} else {
close_interface(i);
}
} else {
close_interface(i);
}