* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
+#define _GNU_SOURCE
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
static struct blob_buf b;
static int
+config_section_idx(struct uci_section *s)
+{
+ struct uci_element *e;
+ int idx = 0;
+
+ uci_foreach_element(&uci_wireless->sections, e) {
+ struct uci_section *cur = uci_to_section(e);
+
+ if (s == cur)
+ return idx;
+
+ if (!strcmp(cur->type, s->type))
+ idx++;
+ }
+
+ return -1;
+}
+
+static int
config_parse_bridge_interface(struct uci_section *s)
{
char *name;
config_parse_interface(struct uci_section *s, bool alias)
{
struct interface *iface;
- const char *type = NULL;
+ const char *type = NULL, *disabled;
struct blob_attr *config;
- struct device *dev;
bool bridge = false;
+ disabled = uci_lookup_option_string(uci_ctx, s, "disabled");
+ if (disabled && !strcmp(disabled, "1"))
+ return;
+
blob_buf_init(&b, 0);
if (!alias)
} else {
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;
-
- blob_buf_init(&b, 0);
- uci_to_blob(&b, s, dev->type->config_params);
- if (blob_len(b.head) == 0)
- return;
-
- device_set_config(dev, dev->type, b.head);
return;
+
error_free_config:
free(config);
error:
struct uci_element *e;
uci_foreach_element(&uci_network->sections, e) {
+ const struct uci_blob_param_list *params = NULL;
struct uci_section *s = uci_to_section(e);
const struct device_type *devtype = NULL;
+ struct device *dev;
const char *type, *name;
if (strcmp(s->type, "device") != 0)
type = uci_lookup_option_string(uci_ctx, s, "type");
if (type) {
- if (!strcmp(type, "bridge"))
+ if (!strcmp(type, "8021ad"))
+ devtype = &vlandev_device_type;
+ else if (!strcmp(type, "8021q"))
+ devtype = &vlandev_device_type;
+ else if (!strcmp(type, "bridge"))
devtype = &bridge_device_type;
- else if (!strcmp(type, "tunnel"))
- devtype = &tunnel_device_type;
else if (!strcmp(type, "macvlan"))
devtype = &macvlan_device_type;
+ else if (!strcmp(type, "tunnel"))
+ devtype = &tunnel_device_type;
}
- if (!devtype)
- devtype = &simple_device_type;
+ if (devtype)
+ params = devtype->config_params;
+ if (!params)
+ params = simple_device_type.config_params;
blob_buf_init(&b, 0);
- uci_to_blob(&b, s, devtype->config_params);
- device_create(name, devtype, b.head);
+ uci_to_blob(&b, s, params);
+ if (devtype) {
+ dev = device_create(name, devtype, b.head);
+ if (!dev)
+ continue;
+ } else {
+ dev = device_get(name, 1);
+ if (!dev)
+ continue;
+
+ dev->current_config = true;
+ device_apply_config(dev, dev->type, b.head);
+ }
+ dev->default_config = false;
}
}
ctx = uci_alloc_context();
uci_ctx = ctx;
+ ctx->flags &= ~UCI_FLAG_STRICT;
if (config_path)
uci_set_confdir(ctx, config_path);
const char *ula_prefix = uci_lookup_option_string(
uci_ctx, globals, "ula_prefix");
interface_ip_set_ula_prefix(ula_prefix);
+
+ const char *default_ps = uci_lookup_option_string(
+ uci_ctx, globals, "default_ps");
+
+ if (default_ps)
+ device_set_default_ps(strcmp(default_ps, "1") ? false : true);
}
static void
static void
config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s)
{
+ char *name;
+
+ name = alloca(strlen(s->type) + 16);
+ sprintf(name, "@%s[%d]", s->type, config_section_idx(s));
+
blob_buf_init(&b, 0);
uci_to_blob(&b, s, wdev->drv->interface.config);
- wireless_interface_create(wdev, b.head, s->e.name);
+ wireless_interface_create(wdev, b.head, s->anonymous ? name : s->e.name);
}
static void