projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
secchan: Tighten in-band traffic always allowed into switch
[openvswitch]
/
vswitchd
/
ovs-brcompatd.c
diff --git
a/vswitchd/ovs-brcompatd.c
b/vswitchd/ovs-brcompatd.c
index b7ef84703e60a1165913da75239679392476f7d9..50ed632a2fbdd126861c01a7daad1745e66c1516 100644
(file)
--- a/
vswitchd/ovs-brcompatd.c
+++ b/
vswitchd/ovs-brcompatd.c
@@
-865,6
+865,8
@@
handle_get_ports_cmd(struct ofpbuf *buffer)
svec_init(&ports);
get_bridge_ports(ovs_bridge, &ports, br_vlan);
svec_init(&ports);
get_bridge_ports(ovs_bridge, &ports, br_vlan);
+ svec_sort(&ports);
+ svec_del(&ports, linux_bridge);
send_ifindex_reply(seq, &ports); /* XXX bonds won't show up */
svec_destroy(&ports);
send_ifindex_reply(seq, &ports); /* XXX bonds won't show up */
svec_destroy(&ports);
@@
-992,7
+994,6
@@
rtnl_recv_update(void)
const char *port_name = nl_attr_get_string(attrs[IFLA_IFNAME]);
char br_name[IFNAMSIZ];
uint32_t br_idx = nl_attr_get_u32(attrs[IFLA_MASTER]);
const char *port_name = nl_attr_get_string(attrs[IFLA_IFNAME]);
char br_name[IFNAMSIZ];
uint32_t br_idx = nl_attr_get_u32(attrs[IFLA_MASTER]);
- struct svec ports;
enum netdev_flags flags;
if (!if_indextoname(br_idx, br_name)) {
enum netdev_flags flags;
if (!if_indextoname(br_idx, br_name)) {
@@
-1009,8
+1010,11
@@
rtnl_recv_update(void)
if (netdev_nodev_get_flags(port_name, &flags) == ENODEV) {
/* Network device is really gone. */
if (netdev_nodev_get_flags(port_name, &flags) == ENODEV) {
/* Network device is really gone. */
+ struct svec ports;
+
VLOG_INFO("network device %s destroyed, "
"removing from bridge %s", port_name, br_name);
VLOG_INFO("network device %s destroyed, "
"removing from bridge %s", port_name, br_name);
+
svec_init(&ports);
cfg_get_all_keys(&ports, "bridge.%s.port", br_name);
svec_sort(&ports);
svec_init(&ports);
cfg_get_all_keys(&ports, "bridge.%s.port", br_name);
svec_sort(&ports);
@@
-1018,6
+1022,7
@@
rtnl_recv_update(void)
del_port(br_name, port_name);
rewrite_and_reload_config();
}
del_port(br_name, port_name);
rewrite_and_reload_config();
}
+ svec_destroy(&ports);
} else {
/* A network device by that name exists even though the kernel
* told us it had disappeared. Probably, what happened was
} else {
/* A network device by that name exists even though the kernel
* told us it had disappeared. Probably, what happened was