+/*
+ * 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>
static void bridge_config_init(struct device *dev);
static void bridge_free(struct device *dev);
static void bridge_dump_info(struct device *dev, struct blob_buf *b);
+enum dev_change_type
+bridge_reload(struct device *dev, struct blob_attr *attr);
const struct device_type bridge_device_type = {
.name = "Bridge",
.create = bridge_create,
.config_init = bridge_config_init,
+ .reload = bridge_reload,
.free = bridge_free,
.dump_info = bridge_dump_info,
};
struct device dev;
device_state_cb set_state;
+ struct blob_attr *config_data;
struct bridge_config config;
struct blob_attr *ifnames;
bool active;
struct bridge_state *bst;
struct device_user dev;
bool present;
+ char name[];
};
static int
goto error;
ret = system_bridge_addif(&bst->dev, bm->dev.dev);
- if (ret < 0)
+ if (ret < 0) {
+ D(DEVICE, "Bridge device %s could not be added\n", bm->dev.dev->ifname);
goto error;
+ }
return 0;
if (!bm->present)
return;
- bm->present = false;
- bm->bst->n_present--;
if (bst->dev.active)
bridge_disable_member(bm);
+ bm->present = false;
+ bm->bst->n_present--;
+
bst->force_active = false;
if (bst->n_present == 0)
device_set_present(&bst->dev, false);
break;
case DEV_EVENT_REMOVE:
- if (!bm->present)
+ if (dev->hotplug) {
+ vlist_delete(&bst->members, &bm->node);
return;
+ }
- if (dev->hotplug)
- vlist_delete(&bst->members, &bm->node);
- else
+ if (bm->present)
bridge_remove_member(bm);
break;
bridge_create_member(struct bridge_state *bst, struct device *dev, bool hotplug)
{
struct bridge_member *bm;
- char *name;
bm = calloc(1, sizeof(*bm) + strlen(dev->ifname) + 1);
bm->bst = bst;
bm->dev.cb = bridge_member_cb;
bm->dev.hotplug = hotplug;
- name = (char *) (bm + 1);
- strcpy(name, dev->ifname);
- vlist_add(&bst->members, &bm->node, name);
-
- device_add_user(&bm->dev, dev);
+ strcpy(bm->name, dev->ifname);
+ bm->dev.dev = dev;
+ vlist_add(&bst->members, &bm->node, bm->name);
+ if (hotplug)
+ bm->node.version = -1;
return bm;
}
struct vlist_node *node_old)
{
struct bridge_member *bm;
+ struct device *dev;
+
+ if (node_new) {
+ bm = container_of(node_new, struct bridge_member, node);
+
+ if (node_old) {
+ free(bm);
+ return;
+ }
+
+ dev = bm->dev.dev;
+ bm->dev.dev = NULL;
+ device_add_user(&bm->dev, dev);
+ }
- if (node_new && node_old)
- return;
if (node_old) {
bm = container_of(node_old, struct bridge_member, node);
device_remove_user(&bm->dev);
free(bm);
}
-
- if (node_new) {
- bm = container_of(node_new, struct bridge_member, node);
- }
}
{
struct bridge_state *bst;
- device_cleanup(dev);
bst = container_of(dev, struct bridge_state, dev);
vlist_flush_all(&bst->members);
free(bst);
if (!bst->ifnames)
return;
+ vlist_update(&bst->members);
blobmsg_for_each_attr(cur, bst->ifnames, rem) {
bridge_add_member(bst, blobmsg_data(cur));
}
+ vlist_flush(&bst->members);
}
static void
struct blob_attr *cur;
/* defaults */
- cfg->stp = true;
- cfg->forward_delay = 1;
+ cfg->stp = false;
+ cfg->forward_delay = 2;
cfg->igmp_snoop = true;
if ((cur = tb[BRIDGE_ATTR_STP]))
}
}
-static struct device *
-bridge_create(const char *name, struct blob_attr *attr)
+enum dev_change_type
+bridge_reload(struct device *dev, struct blob_attr *attr)
{
struct blob_attr *tb_dev[__DEV_ATTR_MAX];
struct blob_attr *tb_br[__BRIDGE_ATTR_MAX];
+ enum dev_change_type ret = DEV_CONFIG_APPLIED;
+ unsigned long diff;
struct bridge_state *bst;
- struct device *dev = NULL;
+
+ BUILD_BUG_ON(sizeof(diff) < __BRIDGE_ATTR_MAX / 8);
+ BUILD_BUG_ON(sizeof(diff) < __DEV_ATTR_MAX / 8);
+
+ bst = container_of(dev, struct bridge_state, dev);
blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, tb_dev,
blob_data(attr), blob_len(attr));
blobmsg_parse(bridge_attrs, __BRIDGE_ATTR_MAX, tb_br,
blob_data(attr), blob_len(attr));
+ bst->ifnames = tb_br[BRIDGE_ATTR_IFNAME];
+ device_init_settings(dev, tb_dev);
+ bridge_apply_settings(bst, tb_br);
+
+ if (bst->config_data) {
+ struct blob_attr *otb_dev[__DEV_ATTR_MAX];
+ struct blob_attr *otb_br[__BRIDGE_ATTR_MAX];
+
+ blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, otb_dev,
+ blob_data(bst->config_data), blob_len(bst->config_data));
+
+ diff = 0;
+ config_diff(tb_dev, otb_dev, &device_attr_list, &diff);
+ if (diff & ~(1 << DEV_ATTR_IFNAME))
+ ret = DEV_CONFIG_RESTART;
+
+ blobmsg_parse(bridge_attrs, __BRIDGE_ATTR_MAX, otb_br,
+ blob_data(bst->config_data), blob_len(bst->config_data));
+
+ diff = 0;
+ config_diff(tb_br, otb_br, &bridge_attr_list, &diff);
+ if (diff & ~(1 << BRIDGE_ATTR_IFNAME))
+ ret = DEV_CONFIG_RESTART;
+
+ bridge_config_init(dev);
+ }
+
+ bst->config_data = attr;
+ return ret;
+}
+
+static struct device *
+bridge_create(const char *name, struct blob_attr *attr)
+{
+ struct bridge_state *bst;
+ struct device *dev = NULL;
+
bst = calloc(1, sizeof(*bst));
if (!bst)
return NULL;
dev = &bst->dev;
device_init(dev, &bridge_device_type, name);
- device_init_settings(dev, tb_dev);
dev->config_pending = true;
- bst->ifnames = tb_br[BRIDGE_ATTR_IFNAME];
- bridge_apply_settings(bst, tb_br);
bst->set_state = dev->set_state;
dev->set_state = bridge_set_state;
dev->hotplug_ops = &bridge_ops;
vlist_init(&bst->members, avl_strcmp, bridge_member_update);
+ bst->members.keep_old = true;
+ bridge_reload(dev, attr);
return dev;
}
projects / project / netifd.git / blobdiff