+/*
+ * 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>
BRIDGE_ATTR_IFNAME,
BRIDGE_ATTR_STP,
BRIDGE_ATTR_FORWARD_DELAY,
+ BRIDGE_ATTR_PRIORITY,
BRIDGE_ATTR_IGMP_SNOOP,
BRIDGE_ATTR_AGEING_TIME,
BRIDGE_ATTR_HELLO_TIME,
BRIDGE_ATTR_MAX_AGE,
+ BRIDGE_ATTR_BRIDGE_EMPTY,
__BRIDGE_ATTR_MAX
};
[BRIDGE_ATTR_IFNAME] = { "ifname", BLOBMSG_TYPE_ARRAY },
[BRIDGE_ATTR_STP] = { "stp", BLOBMSG_TYPE_BOOL },
[BRIDGE_ATTR_FORWARD_DELAY] = { "forward_delay", BLOBMSG_TYPE_INT32 },
+ [BRIDGE_ATTR_PRIORITY] = { "priority", BLOBMSG_TYPE_INT32 },
[BRIDGE_ATTR_AGEING_TIME] = { "ageing_time", BLOBMSG_TYPE_INT32 },
[BRIDGE_ATTR_HELLO_TIME] = { "hello_time", BLOBMSG_TYPE_INT32 },
[BRIDGE_ATTR_MAX_AGE] = { "max_age", BLOBMSG_TYPE_INT32 },
[BRIDGE_ATTR_IGMP_SNOOP] = { "igmp_snooping", BLOBMSG_TYPE_BOOL },
+ [BRIDGE_ATTR_BRIDGE_EMPTY] = { "bridge_empty", BLOBMSG_TYPE_BOOL },
};
-static const union config_param_info bridge_attr_info[__BRIDGE_ATTR_MAX] = {
+static const struct uci_blob_param_info bridge_attr_info[__BRIDGE_ATTR_MAX] = {
[BRIDGE_ATTR_IFNAME] = { .type = BLOBMSG_TYPE_STRING },
};
-static const struct config_param_list bridge_attr_list = {
+static const struct uci_blob_param_list bridge_attr_list = {
.n_params = __BRIDGE_ATTR_MAX,
.params = bridge_attrs,
.info = bridge_attr_info,
bool active;
bool force_active;
+ struct uloop_timeout retry;
+ struct bridge_member *primary_port;
struct vlist_tree members;
int n_present;
+ int n_failed;
};
struct bridge_member {
char name[];
};
+static void
+bridge_reset_primary(struct bridge_state *bst)
+{
+ struct bridge_member *bm;
+
+ if (!bst->primary_port &&
+ (bst->dev.settings.flags & DEV_OPT_MACADDR))
+ return;
+
+ bst->primary_port = NULL;
+ bst->dev.settings.flags &= ~DEV_OPT_MACADDR;
+ vlist_for_each_element(&bst->members, bm, node) {
+ uint8_t *macaddr;
+
+ if (!bm->present)
+ continue;
+
+ bst->primary_port = bm;
+ if (bm->dev.dev->settings.flags & DEV_OPT_MACADDR)
+ macaddr = bm->dev.dev->settings.macaddr;
+ else
+ macaddr = bm->dev.dev->orig_settings.macaddr;
+ memcpy(bst->dev.settings.macaddr, macaddr, 6);
+ bst->dev.settings.flags |= DEV_OPT_MACADDR;
+ return;
+ }
+}
+
static int
bridge_disable_member(struct bridge_member *bm)
{
system_bridge_delif(&bst->dev, bm->dev.dev);
device_release(&bm->dev);
+ device_broadcast_event(&bst->dev, DEV_EVENT_TOPO_CHANGE);
+
return 0;
}
static int
+bridge_enable_interface(struct bridge_state *bst)
+{
+ int ret;
+
+ if (bst->active)
+ return 0;
+
+ ret = system_bridge_addbr(&bst->dev, &bst->config);
+ if (ret < 0)
+ return ret;
+
+ bst->active = true;
+ return 0;
+}
+
+static void
+bridge_disable_interface(struct bridge_state *bst)
+{
+ if (!bst->active)
+ return;
+
+ system_bridge_delbr(&bst->dev);
+ bst->active = false;
+}
+
+static int
bridge_enable_member(struct bridge_member *bm)
{
struct bridge_state *bst = bm->bst;
if (!bm->present)
return 0;
+ ret = bridge_enable_interface(bst);
+ if (ret)
+ goto error;
+
+ /* Disable IPv6 for bridge members */
+ if (!(bm->dev.dev->settings.flags & DEV_OPT_IPV6)) {
+ bm->dev.dev->settings.ipv6 = 0;
+ bm->dev.dev->settings.flags |= DEV_OPT_IPV6;
+ }
+
ret = device_claim(&bm->dev);
if (ret < 0)
goto error;
goto error;
}
+ device_set_present(&bst->dev, true);
+ device_broadcast_event(&bst->dev, DEV_EVENT_TOPO_CHANGE);
+
return 0;
error:
+ bst->n_failed++;
bm->present = false;
bst->n_present--;
+ device_release(&bm->dev);
+
return ret;
}
if (!bm->present)
return;
+ if (bm == bst->primary_port)
+ bridge_reset_primary(bst);
+
if (bst->dev.active)
bridge_disable_member(bm);
bm->present = false;
bm->bst->n_present--;
+ if (bst->config.bridge_empty)
+ return;
+
bst->force_active = false;
if (bst->n_present == 0)
device_set_present(&bst->dev, false);
}
static void
+bridge_free_member(struct bridge_member *bm)
+{
+ struct device *dev = bm->dev.dev;
+
+ bridge_remove_member(bm);
+ device_remove_user(&bm->dev);
+
+ /*
+ * When reloading the config and moving a device from one bridge to
+ * another, the other bridge may have tried to claim this device
+ * before it was removed here.
+ * Ensure that claiming the device is retried by toggling its present
+ * state
+ */
+ if (dev->present) {
+ device_set_present(dev, false);
+ device_set_present(dev, true);
+ }
+
+ free(bm);
+}
+
+static void
+bridge_check_retry(struct bridge_state *bst)
+{
+ if (!bst->n_failed)
+ return;
+
+ uloop_timeout_set(&bst->retry, 100);
+}
+
+static void
bridge_member_cb(struct device_user *dev, enum device_event ev)
{
struct bridge_member *bm = container_of(dev, struct bridge_member, dev);
bm->present = true;
bst->n_present++;
- if (bst->dev.active)
- bridge_enable_member(bm);
- else if (bst->n_present == 1)
+ if (bst->n_present == 1)
device_set_present(&bst->dev, true);
+ if (bst->dev.active && !bridge_enable_member(bm)) {
+ /*
+ * Adding a bridge member can overwrite the bridge mtu
+ * in the kernel, apply the bridge settings in case the
+ * bridge mtu is set
+ */
+ system_if_apply_settings(&bst->dev, &bst->dev.settings,
+ DEV_OPT_MTU);
+ }
break;
case DEV_EVENT_REMOVE:
vlist_for_each_element(&bst->members, bm, node)
bridge_disable_member(bm);
- system_bridge_delbr(&bst->dev);
+ bridge_disable_interface(bst);
return 0;
}
struct bridge_member *bm;
int ret;
- if (!bst->force_active && !bst->n_present)
- return -ENOENT;
+ if (!bst->n_present) {
+ if (!bst->force_active)
+ return -ENOENT;
- ret = system_bridge_addbr(&bst->dev, &bst->config);
- if (ret < 0)
- goto out;
+ ret = bridge_enable_interface(bst);
+ if (ret)
+ return ret;
+ }
+ bst->n_failed = 0;
vlist_for_each_element(&bst->members, bm, node)
bridge_enable_member(bm);
+ bridge_check_retry(bst);
if (!bst->force_active && !bst->n_present) {
/* initialization of all member interfaces failed */
- system_bridge_delbr(&bst->dev);
+ bridge_disable_interface(bst);
device_set_present(&bst->dev, false);
return -ENOENT;
}
+ bridge_reset_primary(bst);
ret = bst->set_state(&bst->dev, true);
if (ret < 0)
bridge_set_down(bst);
-out:
return ret;
}
struct bridge_member *bm;
bm = calloc(1, sizeof(*bm) + strlen(dev->ifname) + 1);
+ if (!bm)
+ return NULL;
+
bm->bst = bst;
bm->dev.cb = bridge_member_cb;
bm->dev.hotplug = hotplug;
strcpy(bm->name, dev->ifname);
bm->dev.dev = dev;
vlist_add(&bst->members, &bm->node, bm->name);
- if (hotplug)
+ // Need to look up the bridge member again as the above
+ // created pointer will be freed in case the bridge member
+ // already existed
+ bm = vlist_find(&bst->members, dev->ifname, bm, node);
+ if (hotplug && bm)
bm->node.version = -1;
return bm;
if (node_old) {
bm = container_of(node_old, struct bridge_member, node);
- bridge_remove_member(bm);
- device_remove_user(&bm->dev);
- free(bm);
+ bridge_free_member(bm);
}
}
{
struct bridge_state *bst;
- device_cleanup(dev);
bst = container_of(dev, struct bridge_state, dev);
vlist_flush_all(&bst->members);
free(bst);
bst = container_of(dev, struct bridge_state, dev);
- if (!bst->ifnames)
- return;
+ if (bst->config.bridge_empty) {
+ bst->force_active = true;
+ device_set_present(&bst->dev, true);
+ }
+ bst->n_failed = 0;
vlist_update(&bst->members);
- blobmsg_for_each_attr(cur, bst->ifnames, rem) {
- bridge_add_member(bst, blobmsg_data(cur));
+ if (bst->ifnames) {
+ blobmsg_for_each_attr(cur, bst->ifnames, rem) {
+ bridge_add_member(bst, blobmsg_data(cur));
+ }
}
vlist_flush(&bst->members);
+ bridge_check_retry(bst);
}
static void
struct blob_attr *cur;
/* defaults */
- cfg->stp = true;
+ cfg->stp = false;
cfg->forward_delay = 2;
cfg->igmp_snoop = true;
+ cfg->bridge_empty = false;
+ cfg->priority = 0x7FFF;
if ((cur = tb[BRIDGE_ATTR_STP]))
cfg->stp = blobmsg_get_bool(cur);
if ((cur = tb[BRIDGE_ATTR_FORWARD_DELAY]))
cfg->forward_delay = blobmsg_get_u32(cur);
+ if ((cur = tb[BRIDGE_ATTR_PRIORITY]))
+ cfg->priority = blobmsg_get_u32(cur);
+
if ((cur = tb[BRIDGE_ATTR_IGMP_SNOOP]))
cfg->igmp_snoop = blobmsg_get_bool(cur);
cfg->max_age = blobmsg_get_u32(cur);
cfg->flags |= BRIDGE_OPT_MAX_AGE;
}
+
+ if ((cur = tb[BRIDGE_ATTR_BRIDGE_EMPTY]))
+ cfg->bridge_empty = blobmsg_get_bool(cur);
}
enum dev_change_type
blob_data(bst->config_data), blob_len(bst->config_data));
diff = 0;
- config_diff(tb_dev, otb_dev, &device_attr_list, &diff);
+ uci_blob_diff(tb_dev, otb_dev, &device_attr_list, &diff);
if (diff & ~(1 << DEV_ATTR_IFNAME))
ret = DEV_CONFIG_RESTART;
blob_data(bst->config_data), blob_len(bst->config_data));
diff = 0;
- config_diff(tb_br, otb_br, &bridge_attr_list, &diff);
+ uci_blob_diff(tb_br, otb_br, &bridge_attr_list, &diff);
if (diff & ~(1 << BRIDGE_ATTR_IFNAME))
ret = DEV_CONFIG_RESTART;
return ret;
}
+static void
+bridge_retry_members(struct uloop_timeout *timeout)
+{
+ struct bridge_state *bst = container_of(timeout, struct bridge_state, retry);
+ struct bridge_member *bm;
+
+ bst->n_failed = 0;
+ vlist_for_each_element(&bst->members, bm, node) {
+ if (bm->present)
+ continue;
+
+ if (!bm->dev.dev->present)
+ continue;
+
+ bm->present = true;
+ bst->n_present++;
+ bridge_enable_member(bm);
+ }
+}
+
static struct device *
bridge_create(const char *name, struct blob_attr *attr)
{
dev = &bst->dev;
device_init(dev, &bridge_device_type, name);
dev->config_pending = true;
+ bst->retry.cb = bridge_retry_members;
bst->set_state = dev->set_state;
dev->set_state = bridge_set_state;
return dev;
}
-
-
projects / project / netifd.git / blobdiff