+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
}
static void
-config_parse_interface(struct uci_section *s)
+config_parse_interface(struct uci_section *s, bool alias)
{
struct interface *iface;
- const char *type;
+ const char *type = NULL;
struct blob_attr *config;
struct device *dev;
blob_buf_init(&b, 0);
- type = uci_lookup_option_string(uci_ctx, s, "type");
+ if (!alias)
+ type = uci_lookup_option_string(uci_ctx, s, "type");
if (type && !strcmp(type, "bridge"))
if (config_parse_bridge_interface(s))
return;
uci_to_blob(&b, s, iface->proto_handler->config_params);
config = malloc(blob_pad_len(b.head));
- if (!config) {
- free(iface);
- return;
- }
+ if (!config)
+ goto error;
memcpy(config, b.head, blob_pad_len(b.head));
- interface_add(iface, config);
+
+ if (alias) {
+ if (!interface_add_alias(iface, config))
+ goto error_free_config;
+ } else {
+ interface_add(iface, config);
+ }
/*
* need to look up the interface name again, in case of config update,
return;
device_set_config(dev, dev->type, b.head);
+ return;
+error_free_config:
+ free(config);
+error:
+ free(iface);
}
static void
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)
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);
struct uci_section *s = uci_to_section(e);
if (!strcmp(s->type, "interface"))
- config_parse_interface(s);
+ config_parse_interface(s, false);
+ }
+
+ uci_foreach_element(&uci_network->sections, e) {
+ struct uci_section *s = uci_to_section(e);
+
+ if (!strcmp(s->type, "alias"))
+ config_parse_interface(s, true);
}
}