#include "device.h"
#include "interface.h"
#include "system.h"
+#include "ubus.h"
enum {
BRIDGE_ATTR_PORTS,
BRIDGE_ATTR_LAST_MEMBER_INTERVAL,
BRIDGE_ATTR_VLAN_FILTERING,
BRIDGE_ATTR_HAS_VLANS,
+ BRIDGE_ATTR_STP_KERNEL,
+ BRIDGE_ATTR_STP_PROTO,
__BRIDGE_ATTR_MAX
};
[BRIDGE_ATTR_LAST_MEMBER_INTERVAL] = { "last_member_interval", BLOBMSG_TYPE_INT32 },
[BRIDGE_ATTR_VLAN_FILTERING] = { "vlan_filtering", BLOBMSG_TYPE_BOOL },
[BRIDGE_ATTR_HAS_VLANS] = { "__has_vlans", BLOBMSG_TYPE_BOOL }, /* internal */
+ [BRIDGE_ATTR_STP_KERNEL] = { "stp_kernel", BLOBMSG_TYPE_BOOL },
+ [BRIDGE_ATTR_STP_PROTO] = { "stp_proto", BLOBMSG_TYPE_STRING },
};
static const struct uci_blob_param_info bridge_attr_info[__BRIDGE_ATTR_MAX] = {
.next = { &device_attr_list },
};
+static struct blob_buf b;
static struct device *bridge_create(const char *name, struct device_type *devtype,
struct blob_attr *attr);
static void bridge_config_init(struct device *dev);
static void bridge_dev_vlan_update(struct device *dev);
static void bridge_free(struct device *dev);
+static void bridge_stp_init(struct device *dev);
static void bridge_dump_info(struct device *dev, struct blob_buf *b);
static enum dev_change_type
bridge_reload(struct device *dev, struct blob_attr *attr);
.reload = bridge_reload,
.free = bridge_free,
.dump_info = bridge_dump_info,
+ .stp_init = bridge_stp_init,
};
struct bridge_state {
return 0;
}
+static void bridge_stp_notify(struct bridge_state *bst)
+{
+ struct bridge_config *cfg = &bst->config;
+
+ if (!cfg->stp || cfg->stp_kernel)
+ return;
+
+ blob_buf_init(&b, 0);
+ blobmsg_add_string(&b, "name", bst->dev.ifname);
+ if (cfg->stp_proto)
+ blobmsg_add_string(&b, "proto", cfg->stp_proto);
+ blobmsg_add_u32(&b, "forward_delay", cfg->forward_delay);
+ if (cfg->flags & BRIDGE_OPT_HELLO_TIME)
+ blobmsg_add_u32(&b, "hello_time", cfg->hello_time);
+ if (cfg->flags & BRIDGE_OPT_MAX_AGE)
+ blobmsg_add_u32(&b, "max_age", cfg->max_age);
+ if (cfg->flags & BRIDGE_OPT_AGEING_TIME)
+ blobmsg_add_u32(&b, "ageing_time", cfg->ageing_time);
+ netifd_ubus_device_notify("stp_init", b.head, 1000);
+}
+
static int
bridge_enable_interface(struct bridge_state *bst)
{
if (bst->active)
return 0;
+ bridge_stp_notify(bst);
ret = system_bridge_addbr(&bst->dev, &bst->config);
if (ret < 0)
return ret;
return 0;
}
+static void
+bridge_stp_init(struct device *dev)
+{
+ struct bridge_state *bst;
+
+ bst = container_of(dev, struct bridge_state, dev);
+ if (!bst->config.stp || !bst->active)
+ return;
+
+ bridge_stp_notify(bst);
+ system_bridge_set_stp_state(&bst->dev, false);
+ system_bridge_set_stp_state(&bst->dev, true);
+}
+
static void
bridge_disable_interface(struct bridge_state *bst)
{
/* defaults */
memset(cfg, 0, sizeof(*cfg));
cfg->stp = false;
+ cfg->stp_kernel = false;
cfg->forward_delay = 2;
cfg->robustness = 2;
cfg->igmp_snoop = false;
if ((cur = tb[BRIDGE_ATTR_STP]))
cfg->stp = blobmsg_get_bool(cur);
+ if ((cur = tb[BRIDGE_ATTR_STP_KERNEL]))
+ cfg->stp = blobmsg_get_bool(cur);
+
+ if ((cur = tb[BRIDGE_ATTR_STP_PROTO]))
+ cfg->stp_proto = blobmsg_get_string(cur);
+
if ((cur = tb[BRIDGE_ATTR_FORWARD_DELAY]))
cfg->forward_delay = blobmsg_get_u32(cur);
}
}
+void device_stp_init(void)
+{
+ struct device *dev;
+
+ avl_for_each_element(&devices, dev, avl) {
+ if (!dev->type->stp_init)
+ continue;
+
+ dev->type->stp_init(dev);
+ }
+}
+
static int set_device_state(struct device *dev, bool state)
{
if (state) {
void (*dump_info)(struct device *, struct blob_buf *buf);
void (*dump_stats)(struct device *, struct blob_buf *buf);
int (*check_state)(struct device *);
+ void (*stp_init)(struct device *);
void (*free)(struct device *);
};
void device_unlock(void);
void device_vlan_update(bool done);
+void device_stp_init(void);
int device_type_add(struct device_type *devtype);
struct device_type *device_type_get(const char *tname);
return 0;
}
+void system_bridge_set_stp_state(struct device *dev, bool val)
+{
+}
+
int system_bridge_vlan_check(struct device *dev, char *ifname)
{
return 0;
dev->ifname, val);
}
-static void system_bridge_set_stp_state(struct device *dev, const char *val)
+void system_bridge_set_stp_state(struct device *dev, bool val)
{
- system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/stp_state", dev->ifname, val);
+ const char *valstr = val ? "1" : "0";
+
+ system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/stp_state", dev->ifname, valstr);
}
static void system_bridge_set_forward_delay(struct device *dev, const char *val)
if (ioctl(sock_ioctl, SIOCBRADDBR, bridge->ifname) < 0)
return -1;
- system_bridge_set_stp_state(bridge, cfg->stp ? "1" : "0");
+ system_bridge_set_stp_state(bridge, cfg->stp);
snprintf(buf, sizeof(buf), "%lu", sec_to_jiffies(cfg->forward_delay));
system_bridge_set_forward_delay(bridge, buf);
struct bridge_config {
enum bridge_opt flags;
bool stp;
+ bool stp_kernel;
+ const char *stp_proto;
bool igmp_snoop;
bool multicast_querier;
int system_bridge_delif(struct device *bridge, struct device *dev);
int system_bridge_vlan(const char *iface, uint16_t vid, bool add, unsigned int vflags);
int system_bridge_vlan_check(struct device *dev, char *ifname);
+void system_bridge_set_stp_state(struct device *dev, bool val);
int system_macvlan_add(struct device *macvlan, struct device *dev, struct macvlan_config *cfg);
int system_macvlan_del(struct device *macvlan);
}
#endif
+static int
+netifd_handle_stp_init(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ device_stp_init();
+
+ return 0;
+}
+
static struct ubus_method dev_object_methods[] = {
UBUS_METHOD("status", netifd_dev_status, dev_policy),
UBUS_METHOD("set_alias", netifd_handle_alias, alias_attrs),
#ifdef DUMMY_MODE
UBUS_METHOD("hotplug_event", netifd_handle_dev_hotplug, dev_hotplug_policy),
#endif
+ UBUS_METHOD_NOARG("stp_init", netifd_handle_stp_init)
};
static struct ubus_object_type dev_object_type =
system_fd_set_cloexec(ubus_ctx->sock.fd);
}
+void netifd_ubus_device_notify(const char *event, struct blob_attr *data, int timeout)
+{
+ ubus_notify(ubus_ctx, &dev_object, event, data, timeout);
+}
+
static void
netifd_ubus_reconnect_timer(struct uloop_timeout *timeout)
{
void netifd_ubus_remove_interface(struct interface *iface);
void netifd_ubus_interface_event(struct interface *iface, bool up);
void netifd_ubus_interface_notify(struct interface *iface, bool up);
+void netifd_ubus_device_notify(const char *event, struct blob_attr *data, int timeout);
#endif