IFACE_ATTR_IFNAME,
IFACE_ATTR_UP,
IFACE_ATTR_DATA,
+ IFACE_ATTR_PREFIX,
IFACE_ATTR_MAX,
};
static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
[IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
- [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
+ [IFACE_ATTR_IFNAME] = { .name = "l3_device", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_UP] = { .name = "up", .type = BLOBMSG_TYPE_BOOL },
[IFACE_ATTR_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
+ [IFACE_ATTR_PREFIX] = { .name = "ipv6-prefix", .type = BLOBMSG_TYPE_ARRAY },
};
static void handle_dump(_unused struct ubus_request *req, _unused int type, struct blob_attr *msg)
static void subscribe_netifd(void)
{
- netifd.cb = handle_update;
ubus_subscribe(ubus, &netifd, objid);
ubus_invoke(ubus, objid, "dump", NULL, handle_dump, NULL, 0);
}
void ubus_apply_network(void)
{
struct blob_attr *c;
- int rem;
+ unsigned rem;
if (!dump)
return;
blobmsg_for_each_attr(c, dump, rem) {
struct blob_attr *tb[IFACE_ATTR_MAX];
- blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(c), blob_len(c));
+ blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_DATA])
continue;
const char *ifname = (tb[IFACE_ATTR_IFNAME]) ?
blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : "";
+ bool matched = false;
struct interface *c;
list_for_each_entry(c, &interfaces, head) {
char *f = memmem(c->upstream, c->upstream_len,
interface, strlen(interface) + 1);
- if (strcmp(interface, c->name) && strcmp(ifname, c->ifname) &&
- (!f || (f != c->upstream && f[-1] != 0)))
+ bool cmatched = !strcmp(interface, c->name) || !strcmp(ifname, c->ifname);
+ matched |= cmatched;
+
+ if (!cmatched && (!f || (f != c->upstream && f[-1] != 0)))
continue;
- if (!c || !c->ignore)
- config_parse_interface(tb[IFACE_ATTR_DATA], interface, false);
+ if (!c->ignore)
+ config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]),
+ blobmsg_data_len(tb[IFACE_ATTR_DATA]), c->name, false);
}
+
+ if (!matched)
+ config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]),
+ blobmsg_data_len(tb[IFACE_ATTR_DATA]), interface, false);
}
}
const char* ubus_get_ifname(const char *name)
{
struct blob_attr *c;
- int rem;
+ unsigned rem;
if (!dump)
return NULL;
blobmsg_for_each_attr(c, dump, rem) {
struct blob_attr *tb[IFACE_ATTR_MAX];
- blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(c), blob_len(c));
+ blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
if (!tb[IFACE_ATTR_INTERFACE] || strcmp(name,
blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
}
+bool ubus_has_prefix(const char *name, const char *ifname)
+{
+ struct blob_attr *c, *cur;
+ unsigned rem;
+
+ if (!dump)
+ return NULL;
+
+ blobmsg_for_each_attr(c, dump, rem) {
+ struct blob_attr *tb[IFACE_ATTR_MAX];
+ blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
+
+ if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_IFNAME])
+ continue;
+
+ if (!strcmp(name, blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])) ||
+ !strcmp(ifname, blobmsg_get_string(tb[IFACE_ATTR_IFNAME])))
+ continue;
+
+ if ((cur = tb[IFACE_ATTR_PREFIX])) {
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_ARRAY || !blobmsg_check_attr(cur, NULL))
+ continue;
+
+ struct blob_attr *d;
+ unsigned drem;
+ blobmsg_for_each_attr(d, cur, drem) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
+
int init_ubus(void)
{
if (!(ubus = ubus_connect(NULL))) {
return -1;
}
+ netifd.cb = handle_update;
+ ubus_register_subscriber(ubus, &netifd);
+
ubus_add_uloop(ubus);
ubus_add_object(ubus, &main_object);
ubus_register_event_handler(ubus, &event_handler, "ubus.object.add");