[DEV_ATTR_MACADDR] = { .name = "macaddr", .type = BLOBMSG_TYPE_STRING },
[DEV_ATTR_TXQUEUELEN] = { .name = "txqueuelen", .type = BLOBMSG_TYPE_INT32 },
[DEV_ATTR_ENABLED] = { .name = "enabled", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_IPV6] = { .name = "ipv6", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_PROMISC] = { .name = "promisc", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_RPFILTER] = { .name = "rpfilter", .type = BLOBMSG_TYPE_STRING },
+ [DEV_ATTR_ACCEPTLOCAL] = { .name = "acceptlocal", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_IGMPVERSION] = { .name = "igmpversion", .type = BLOBMSG_TYPE_INT32 },
+ [DEV_ATTR_MLDVERSION] = { .name = "mldversion", .type = BLOBMSG_TYPE_INT32 },
};
const struct uci_blob_param_list device_attr_list = {
static int set_device_state(struct device *dev, bool state)
{
+ if (state) {
+ /* Set ifindex for all devices being enabled so a valid */
+ /* ifindex is in place avoiding possible race conditions */
+ device_set_ifindex(dev, system_if_resolve(dev));
+ if (!dev->ifindex)
+ return -1;
+ }
+
+ if (dev->external)
+ return 0;
+
if (state)
system_if_up(dev);
else
memcpy(n->macaddr,
(s->flags & DEV_OPT_MACADDR ? s->macaddr : os->macaddr),
sizeof(n->macaddr));
+ n->ipv6 = s->flags & DEV_OPT_IPV6 ? s->ipv6 : os->ipv6;
+ n->promisc = s->flags & DEV_OPT_PROMISC ? s->promisc : os->promisc;
+ n->rpfilter = s->flags & DEV_OPT_RPFILTER ? s->rpfilter : os->rpfilter;
+ n->acceptlocal = s->flags & DEV_OPT_ACCEPTLOCAL ? s->acceptlocal : os->acceptlocal;
+ n->igmpversion = s->flags & DEV_OPT_IGMPVERSION ? s->igmpversion : os->igmpversion;
+ n->mldversion = s->flags & DEV_OPT_MLDVERSION ? s->mldversion : os->mldversion;
n->flags = s->flags | os->flags;
}
}
}
+ if ((cur = tb[DEV_ATTR_IPV6])) {
+ s->ipv6 = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_IPV6;
+ }
+
+ if ((cur = tb[DEV_ATTR_PROMISC])) {
+ s->promisc = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_PROMISC;
+ }
+
+ if ((cur = tb[DEV_ATTR_RPFILTER])) {
+ if (system_resolve_rpfilter(blobmsg_data(cur), &s->rpfilter))
+ s->flags |= DEV_OPT_RPFILTER;
+ else
+ DPRINTF("Failed to resolve rpfilter: %s\n", (char *) blobmsg_data(cur));
+ }
+
+ if ((cur = tb[DEV_ATTR_ACCEPTLOCAL])) {
+ s->acceptlocal = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_ACCEPTLOCAL;
+ }
+
+ if ((cur = tb[DEV_ATTR_IGMPVERSION])) {
+ s->igmpversion = blobmsg_get_u32(cur);
+ if (s->igmpversion >= 1 && s->igmpversion <= 3)
+ s->flags |= DEV_OPT_IGMPVERSION;
+ else
+ DPRINTF("Failed to resolve igmpversion: %d\n", blobmsg_get_u32(cur));
+ }
+
+ if ((cur = tb[DEV_ATTR_MLDVERSION])) {
+ s->mldversion = blobmsg_get_u32(cur);
+ if (s->mldversion >= 1 && s->mldversion <= 2)
+ s->flags |= DEV_OPT_MLDVERSION;
+ else
+ DPRINTF("Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur));
+ }
+
device_set_disabled(dev, disabled);
}
struct device_user *dep = container_of(list, struct device_user, list);
int *ev = ctx;
+ /* device might have been removed by an earlier callback */
+ if (!dep->dev)
+ return 0;
+
if (dep->cb)
dep->cb(dep, *ev);
return 0;
return 0;
dep->claimed = true;
- D(DEVICE, "Claim %s %s, new refcount: %d\n", dev->type->name, dev->ifname, dev->active + 1);
+ D(DEVICE, "Claim %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active + 1);
if (++dev->active != 1)
return 0;
dep->claimed = false;
dev->active--;
- D(DEVICE, "Release %s %s, new refcount: %d\n", dev->type->name, dev->ifname, dev->active);
+ D(DEVICE, "Release %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active);
assert(dev->active >= 0);
if (dev->active)
return;
device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
- if (!dep->hotplug)
+ if (!dev->external)
dev->set_state(dev, false);
device_broadcast_event(dev, DEV_EVENT_DOWN);
}
int device_check_state(struct device *dev)
{
if (!dev->type->check_state)
- return 0;
+ return simple_device_type.check_state(dev);
return dev->type->check_state(dev);
}
device_refresh_present(dev);
}
+void device_set_link(struct device *dev, bool state)
+{
+ if (dev->link_active == state)
+ return;
+
+ netifd_log_message(L_NOTICE, "%s '%s' link is %s\n", dev->type->name, dev->ifname, state ? "up" : "down" );
+
+ dev->link_active = state;
+ device_broadcast_event(dev, state ? DEV_EVENT_LINK_UP : DEV_EVENT_LINK_DOWN);
+}
+
+void device_set_ifindex(struct device *dev, int ifindex)
+{
+ if (dev->ifindex == ifindex)
+ return;
+
+ dev->ifindex = ifindex;
+ device_broadcast_event(dev, DEV_EVENT_UPDATE_IFINDEX);
+}
+
static int device_refcount(struct device *dev)
{
struct list_head *list;
dep->cb(dep, DEV_EVENT_ADD);
if (dev->active)
dep->cb(dep, DEV_EVENT_UP);
+
+ if (dev->link_active)
+ dep->cb(dep, DEV_EVENT_LINK_UP);
}
}
odev->current_config = true;
change = device_set_config(odev, type, config);
if (odev->external) {
- system_if_apply_settings(odev, &odev->settings);
+ system_if_apply_settings(odev, &odev->settings, odev->settings.flags);
change = DEV_CONFIG_APPLIED;
}
switch (change) {
return;
blobmsg_add_u8(b, "up", !!dev->active);
+ blobmsg_add_u8(b, "carrier", !!dev->link_active);
+
if (dev->type->dump_info)
dev->type->dump_info(dev, b);
else
blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr));
if (st.flags & DEV_OPT_TXQUEUELEN)
blobmsg_add_u32(b, "txqueuelen", st.txqueuelen);
+ if (st.flags & DEV_OPT_IPV6)
+ blobmsg_add_u8(b, "ipv6", st.ipv6);
+ if (st.flags & DEV_OPT_PROMISC)
+ blobmsg_add_u8(b, "promisc", st.promisc);
+ if (st.flags & DEV_OPT_RPFILTER)
+ blobmsg_add_u32(b, "rpfilter", st.rpfilter);
+ if (st.flags & DEV_OPT_ACCEPTLOCAL)
+ blobmsg_add_u8(b, "acceptlocal", st.acceptlocal);
+ if (st.flags & DEV_OPT_IGMPVERSION)
+ blobmsg_add_u32(b, "igmpversion", st.igmpversion);
+ if (st.flags & DEV_OPT_MLDVERSION)
+ blobmsg_add_u32(b, "mldversion", st.mldversion);
}
s = blobmsg_open_table(b, "statistics");
projects / project / netifd.git / blobdiff