#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
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)
{
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)) {
- D(INTERFACE, "Failed to create '%s' device for interface '%s'\n",
+ D(INTERFACE, "Failed to create '%s' device for interface '%s'",
devtype->name, s->e.name);
}
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,
char *name_buf;
int name_len = 0;
int n_ports = 0;
- int rem;
+ size_t rem;
val = uci_lookup_option_string(uci_ctx, s, "vlan");
if (!val)
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);
}
wireless_device_create(drv, s->e.name, b.head);
}
-static struct wireless_interface*
-config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s)
+static void
+config_parse_wireless_vlan(struct wireless_interface *vif, struct uci_section *s)
{
char *name;
sprintf(name, "@%s[%d]", s->type, config_section_idx(s));
blob_buf_init(&b, 0);
- uci_to_blob(&b, s, wdev->drv->interface.config);
- return wireless_interface_create(wdev, b.head, s->anonymous ? name : s->e.name);
+ uci_to_blob(&b, s, vif->wdev->drv->vlan.config);
+ wireless_vlan_create(vif, b.head, s->anonymous ? name : s->e.name);
}
static void
-config_parse_wireless_vlan(struct wireless_device *wdev, char *vif, struct uci_section *s)
+config_parse_wireless_station(struct wireless_interface *vif, struct uci_section *s)
{
char *name;
sprintf(name, "@%s[%d]", s->type, config_section_idx(s));
blob_buf_init(&b, 0);
- uci_to_blob(&b, s, wdev->drv->vlan.config);
- wireless_vlan_create(wdev, vif, b.head, s->anonymous ? name : s->e.name);
+ uci_to_blob(&b, s, vif->wdev->drv->station.config);
+ wireless_station_create(vif, b.head, s->anonymous ? name : s->e.name);
}
static void
-config_parse_wireless_station(struct wireless_device *wdev, char *vif, struct uci_section *s)
+config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s)
{
+ struct wireless_interface *vif;
+ struct uci_element *f;
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->station.config);
- wireless_station_create(wdev, vif, b.head, s->anonymous ? name : s->e.name);
+ uci_to_blob(&b, s, wdev->drv->interface.config);
+ vif = wireless_interface_create(wdev, b.head, s->anonymous ? name : s->e.name);
+ if (!vif)
+ return;
+
+ vif->vlan_idx = vif->sta_idx = 0;
+ vlist_update(&vif->vlans);
+ vlist_update(&vif->stations);
+
+ if (s->anonymous)
+ goto out;
+
+ uci_foreach_element(&uci_wireless->sections, f) {
+ struct uci_section *cur = uci_to_section(f);
+ const char *vif_name;
+
+ if (strcmp(cur->type, "wifi-vlan") != 0)
+ continue;
+
+ vif_name = uci_lookup_option_string(uci_ctx, cur, "iface");
+ if (vif_name && strcmp(s->e.name, vif_name))
+ continue;
+ config_parse_wireless_vlan(vif, cur);
+ }
+
+ uci_foreach_element(&uci_wireless->sections, f) {
+ struct uci_section *cur = uci_to_section(f);
+ const char *vif_name;
+
+ if (strcmp(cur->type, "wifi-station") != 0)
+ continue;
+
+ vif_name = uci_lookup_option_string(uci_ctx, cur, "iface");
+ if (vif_name && strcmp(s->e.name, vif_name))
+ continue;
+ config_parse_wireless_station(vif, cur);
+ }
+
+out:
+ vlist_flush(&vif->vlans);
+ vlist_flush(&vif->stations);
}
static void
const char *dev_name;
if (!uci_wireless) {
- DPRINTF("No wireless configuration found\n");
+ D(WIRELESS, "No wireless configuration found");
return;
}
vlist_for_each_element(&wireless_devices, wdev, node) {
wdev->vif_idx = 0;
vlist_update(&wdev->interfaces);
- wdev->vlan_idx = 0;
- vlist_update(&wdev->vlans);
- wdev->sta_idx = 0;
- vlist_update(&wdev->stations);
}
uci_foreach_element(&uci_wireless->sections, e) {
struct uci_section *s = uci_to_section(e);
- struct wireless_interface *vif;
- struct uci_element *f;
if (strcmp(s->type, "wifi-iface") != 0)
continue;
wdev = vlist_find(&wireless_devices, dev_name, wdev, node);
if (!wdev) {
- DPRINTF("device %s not found!\n", dev_name);
+ D(WIRELESS, "device %s not found!", dev_name);
continue;
}
- vif = config_parse_wireless_interface(wdev, s);
+ config_parse_wireless_interface(wdev, s);
+ }
- if (!vif || s->anonymous)
- continue;
- uci_foreach_element(&uci_wireless->sections, f) {
- struct uci_section *s = uci_to_section(f);
- const char *vif_name;
+ vlist_for_each_element(&wireless_devices, wdev, node)
+ vlist_flush(&wdev->interfaces);
+}
- if (strcmp(s->type, "wifi-vlan") != 0)
- continue;
- vif_name = uci_lookup_option_string(uci_ctx, s, "iface");
- if (vif_name && strcmp(e->name, vif_name))
- continue;
- config_parse_wireless_vlan(wdev, vif->name, s);
- }
+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;
- uci_foreach_element(&uci_wireless->sections, f) {
- struct uci_section *s = uci_to_section(f);
- const char *vif_name;
+ blobmsg_parse(&policy, 1, &cur, blobmsg_data(attr), blobmsg_len(attr));
- if (strcmp(s->type, "wifi-station") != 0)
- continue;
+ return cur;
+}
- vif_name = uci_lookup_option_string(uci_ctx, s, "iface");
- if (vif_name && strcmp(e->name, vif_name))
- continue;
- config_parse_wireless_station(wdev, vif->name, s);
- }
- }
+struct ether_addr *config_get_default_macaddr(const char *ifname)
+{
+ struct blob_attr *cur;
- vlist_for_each_element(&wireless_devices, wdev, node) {
- vlist_flush(&wdev->interfaces);
- vlist_flush(&wdev->vlans);
- vlist_flush(&wdev->stations);
- }
+ 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));
+}
+
+int config_get_default_gro(const char *ifname)
+{
+ struct blob_attr *cur;
+
+ if (!board_netdevs)
+ return -1;
+
+ cur = config_find_blobmsg_attr(board_netdevs, ifname, BLOBMSG_TYPE_TABLE);
+ if (!cur)
+ return -1;
+
+ cur = config_find_blobmsg_attr(cur, "gro", BLOBMSG_TYPE_BOOL);
+ if (!cur)
+ return -1;
+
+ return blobmsg_get_bool(cur);
+}
+
+const char *config_get_default_conduit(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, "conduit", BLOBMSG_TYPE_STRING);
+ if (!cur)
+ return NULL;
+
+ return 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
ret = -1;
}
+ config_init_board();
+
vlist_update(&interfaces);
config_init = true;
- device_lock();
device_reset_config();
config_init_devices(true);
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();
+ wireless_start_pending(0);
return ret;
}
projects / project / netifd.git / blobdiff