#include <uci.h>
+#include <libubox/blobmsg_json.h>
+
#include "netifd.h"
#include "interface.h"
#include "interface-ip.h"
static struct uci_context *uci_ctx;
static struct uci_package *uci_network;
static struct uci_package *uci_wireless;
+static struct blob_attr *board_netdevs;
static struct blob_buf b;
static int
}
static void
-config_fixup_bridge_vlan_filtering(struct uci_section *s, const char *name)
+config_fixup_bridge_var(struct uci_section *s, const char *name, const char *val)
{
struct uci_ptr ptr = {
.p = s->package,
.s = s,
- .option = "vlan_filtering",
- .value = "1",
+ .option = name,
+ .value = val,
};
- if (!config_bridge_has_vlans(name))
- return;
-
uci_lookup_ptr(uci_ctx, &ptr, NULL, false);
if (ptr.o)
return;
uci_set(uci_ctx, &ptr);
}
+/**
+ * config_fixup_bridge_ports - translate deprecated configs
+ *
+ * Old configs used "ifname" option for specifying bridge ports. For backward
+ * compatibility translate it into the new "ports" option.
+ */
+static void config_fixup_bridge_ports(struct uci_section *s)
+{
+ struct uci_ptr ptr = {
+ .p = s->package,
+ .s = s,
+ .option = "ifname",
+ };
+
+ if (uci_lookup_option(uci_ctx, s, "ports"))
+ return;
+
+ uci_lookup_ptr(uci_ctx, &ptr, NULL, false);
+ if (!ptr.o)
+ return;
+
+ ptr.value = "ports";
+ uci_rename(uci_ctx, &ptr);
+}
+
+static void
+config_fixup_bridge_vlan_filtering(struct uci_section *s, const char *name)
+{
+ bool has_vlans = config_bridge_has_vlans(name);
+
+ config_fixup_bridge_var(s, "__has_vlans", has_vlans ? "1" : "0");
+
+ if (!has_vlans)
+ return;
+
+ config_fixup_bridge_var(s, "vlan_filtering", "1");
+}
+
static int
config_parse_bridge_interface(struct uci_section *s, struct device_type *devtype)
{
sprintf(name, "%s-%s", devtype->name_prefix, s->e.name);
blobmsg_add_string(&b, "name", name);
+ config_fixup_bridge_ports(s);
config_fixup_bridge_vlan_filtering(s, name);
uci_to_blob(&b, s, devtype->config_params);
if (!device_create(name, devtype, b.head)) {
}
static void
-config_init_devices(void)
+config_init_devices(bool bridge)
{
struct uci_element *e;
if (type)
devtype = device_type_get(type);
+ if (bridge != (devtype && devtype->bridge_capability))
+ continue;
+
if (devtype)
params = devtype->config_params;
if (!params)
params = simple_device_type.config_params;
- if (devtype && devtype->bridge_capability)
+ if (devtype && devtype->bridge_capability) {
+ config_fixup_bridge_ports(s);
config_fixup_bridge_vlan_filtering(s, name);
+ }
blob_buf_init(&b, 0);
uci_to_blob(&b, s, params);
BRVLAN_ATTR_VID,
BRVLAN_ATTR_LOCAL,
BRVLAN_ATTR_PORTS,
+ BRVLAN_ATTR_ALIAS,
__BRVLAN_ATTR_MAX,
};
static const struct blobmsg_policy vlan_attrs[__BRVLAN_ATTR_MAX] = {
[BRVLAN_ATTR_VID] = { "vlan", BLOBMSG_TYPE_INT32 },
[BRVLAN_ATTR_LOCAL] = { "local", BLOBMSG_TYPE_BOOL },
[BRVLAN_ATTR_PORTS] = { "ports", BLOBMSG_TYPE_ARRAY },
+ [BRVLAN_ATTR_ALIAS] = { "alias", BLOBMSG_TYPE_ARRAY },
};
static const struct uci_blob_param_info vlan_attr_info[__BRVLAN_ATTR_MAX] = {
[BRVLAN_ATTR_PORTS] = { .type = BLOBMSG_TYPE_STRING },
+ [BRVLAN_ATTR_ALIAS] = { .type = BLOBMSG_TYPE_STRING },
};
static const struct uci_blob_param_list vlan_attr_list = {
.n_params = __BRVLAN_ATTR_MAX,
vlan->n_ports = n_ports;
vlan->ports = port = (struct bridge_vlan_port *)&vlan[1];
+ INIT_LIST_HEAD(&vlan->hotplug_ports);
name_buf = (char *)&port[n_ports];
blobmsg_for_each_attr(cur, tb[BRVLAN_ATTR_PORTS], rem) {
port++;
}
+ blobmsg_for_each_attr(cur, tb[BRVLAN_ATTR_ALIAS], rem)
+ kvlist_set(&dev->vlan_aliases, blobmsg_get_string(cur), &vid);
+
vlist_add(&dev->vlans, &vlan->node, &vlan->vid);
}
}
}
+
+static struct blob_attr *
+config_find_blobmsg_attr(struct blob_attr *attr, const char *name, int type)
+{
+ struct blobmsg_policy policy = { .name = name, .type = type };
+ struct blob_attr *cur;
+
+ blobmsg_parse(&policy, 1, &cur, blobmsg_data(attr), blobmsg_len(attr));
+
+ return cur;
+}
+
+struct ether_addr *config_get_default_macaddr(const char *ifname)
+{
+ struct blob_attr *cur;
+
+ if (!board_netdevs)
+ return NULL;
+
+ cur = config_find_blobmsg_attr(board_netdevs, ifname, BLOBMSG_TYPE_TABLE);
+ if (!cur)
+ return NULL;
+
+ cur = config_find_blobmsg_attr(cur, "macaddr", BLOBMSG_TYPE_STRING);
+ if (!cur)
+ return NULL;
+
+ return ether_aton(blobmsg_get_string(cur));
+}
+
+static void
+config_init_board(void)
+{
+ struct blob_attr *cur;
+
+ blob_buf_init(&b, 0);
+
+ if (!blobmsg_add_json_from_file(&b, DEFAULT_BOARD_JSON))
+ return;
+
+ free(board_netdevs);
+ board_netdevs = NULL;
+
+ cur = config_find_blobmsg_attr(b.head, "network-device",
+ BLOBMSG_TYPE_TABLE);
+ if (!cur)
+ return;
+
+ board_netdevs = blob_memdup(cur);
+}
+
int
config_init_all(void)
{
ret = -1;
}
+ config_init_board();
+
vlist_update(&interfaces);
config_init = true;
- device_lock();
device_reset_config();
- config_init_devices();
- config_init_interfaces();
+ config_init_devices(true);
config_init_vlans();
+ config_init_devices(false);
+ config_init_interfaces();
config_init_ip();
config_init_rules();
config_init_globals();
config_init_wireless();
config_init = false;
- device_unlock();
device_reset_old();
device_init_pending();
vlist_flush(&interfaces);
- device_free_unused(NULL);
interface_refresh_assignments(false);
interface_start_pending();
wireless_start_pending();
projects / project / netifd.git / blobdiff