projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix config routes enable/disable handling on down/up
[project/netifd.git]
/
config.c
diff --git
a/config.c
b/config.c
index
fcfea7c
..
d134a90
100644
(file)
--- a/
config.c
+++ b/
config.c
@@
-176,6
+176,14
@@
config_parse_interface(struct uci_section *s)
memcpy(config, b.head, blob_pad_len(b.head));
interface_add(iface, config);
memcpy(config, b.head, blob_pad_len(b.head));
interface_add(iface, config);
+ /*
+ * need to look up the interface name again, in case of config update,
+ * the pointer will have changed
+ */
+ iface = vlist_find(&interfaces, s->e.name, iface, node);
+ if (!iface)
+ return;
+
dev = iface->main_dev.dev;
if (!dev || !dev->default_config)
return;
dev = iface->main_dev.dev;
if (!dev || !dev->default_config)
return;
@@
-207,7
+215,7
@@
config_init_devices(void)
uci_foreach_element(&uci_network->sections, e) {
struct uci_section *s = uci_to_section(e);
uci_foreach_element(&uci_network->sections, e) {
struct uci_section *s = uci_to_section(e);
- const struct device_type *devtype;
+ const struct device_type *devtype
= NULL
;
const char *type, *name;
if (strcmp(s->type, "device") != 0)
const char *type, *name;
if (strcmp(s->type, "device") != 0)
@@
-218,9
+226,14
@@
config_init_devices(void)
continue;
type = uci_lookup_option_string(uci_ctx, s, "type");
continue;
type = uci_lookup_option_string(uci_ctx, s, "type");
- if (type && !strcmp(type, "bridge"))
- devtype = &bridge_device_type;
- else
+ if (type) {
+ if (!strcmp(type, "bridge"))
+ devtype = &bridge_device_type;
+ else if (!strcmp(type, "tunnel"))
+ devtype = &tunnel_device_type;
+ }
+
+ if (!devtype)
devtype = &simple_device_type;
blob_buf_init(&b, 0);
devtype = &simple_device_type;
blob_buf_init(&b, 0);
@@
-387,6
+400,7
@@
config_init_all(void)
return;
}
return;
}
+ vlist_update(&interfaces);
config_init = true;
device_lock();
config_init = true;
device_lock();
@@
-401,5
+415,6
@@
config_init_all(void)
device_reset_old();
device_init_pending();
device_free_unused(NULL);
device_reset_old();
device_init_pending();
device_free_unused(NULL);
+ vlist_flush(&interfaces);
interface_start_pending();
}
interface_start_pending();
}