git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-dpif-xlate: Limit memory and time that translation can consume.
[sliver-openvswitch.git]
/
vswitchd
/
bridge.c
diff --git
a/vswitchd/bridge.c
b/vswitchd/bridge.c
index
f993ba1
..
ec3633c
100644
(file)
--- a/
vswitchd/bridge.c
+++ b/
vswitchd/bridge.c
@@
-473,10
+473,9
@@
collect_in_band_managers(const struct ovsrec_open_vswitch *ovs_cfg,
SSET_FOR_EACH (target, &targets) {
struct sockaddr_in *sin = &managers[n_managers];
SSET_FOR_EACH (target, &targets) {
struct sockaddr_in *sin = &managers[n_managers];
- if (stream_parse_target_with_default_ports(target,
- JSONRPC_TCP_PORT,
- JSONRPC_SSL_PORT,
- sin)) {
+ if (stream_parse_target_with_default_port(target,
+ OVSDB_OLD_PORT,
+ sin)) {
n_managers++;
}
}
n_managers++;
}
}
@@
-548,7
+547,6
@@
bridge_reconfigure_ofp(void)
long long int deadline;
struct bridge *br;
long long int deadline;
struct bridge *br;
- time_refresh();
deadline = time_msec() + OFP_PORT_ACTION_WINDOW;
/* The kernel will reject any attempt to add a given port to a datapath if
deadline = time_msec() + OFP_PORT_ACTION_WINDOW;
/* The kernel will reject any attempt to add a given port to a datapath if
@@
-567,7
+565,6
@@
bridge_reconfigure_ofp(void)
list_remove(&garbage->list_node);
free(garbage);
list_remove(&garbage->list_node);
free(garbage);
- time_refresh();
if (time_msec() >= deadline) {
return false;
}
if (time_msec() >= deadline) {
return false;
}
@@
-580,7
+577,6
@@
bridge_reconfigure_ofp(void)
HMAP_FOR_EACH_SAFE (if_cfg, next, hmap_node, &br->if_cfg_todo) {
iface_create(br, if_cfg, OFPP_NONE);
HMAP_FOR_EACH_SAFE (if_cfg, next, hmap_node, &br->if_cfg_todo) {
iface_create(br, if_cfg, OFPP_NONE);
- time_refresh();
if (time_msec() >= deadline) {
return false;
}
if (time_msec() >= deadline) {
return false;
}
@@
-2262,11
+2258,10
@@
instant_stats_run(void)
iface_refresh_cfm_stats(iface);
smap_init(&smap);
iface_refresh_cfm_stats(iface);
smap_init(&smap);
- if (!ofproto_port_get_bfd_status(br->ofproto, iface->ofp_port,
- &smap)) {
- ovsrec_interface_set_bfd_status(iface->cfg, &smap);
- smap_destroy(&smap);
- }
+ ofproto_port_get_bfd_status(br->ofproto, iface->ofp_port,
+ &smap);
+ ovsrec_interface_set_bfd_status(iface->cfg, &smap);
+ smap_destroy(&smap);
}
}
}
}
}
}