projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb: Fix support for systems where libpcre is not installed.
[openvswitch]
/
vswitchd
/
bridge.c
diff --git
a/vswitchd/bridge.c
b/vswitchd/bridge.c
index 88f8db112365cd5704aa264a5bedc7d3160ed436..e945ca84ca4312262ef8f0d1201b8d59c54380e4 100644
(file)
--- a/
vswitchd/bridge.c
+++ b/
vswitchd/bridge.c
@@
-199,6
+199,9
@@
static void bridge_destroy(struct bridge *);
static struct bridge *bridge_lookup(const char *name);
static unixctl_cb_func bridge_unixctl_dump_flows;
static int bridge_run_one(struct bridge *);
static struct bridge *bridge_lookup(const char *name);
static unixctl_cb_func bridge_unixctl_dump_flows;
static int bridge_run_one(struct bridge *);
+static const struct ovsrec_controller *bridge_get_controller(
+ const struct ovsrec_open_vswitch *ovs_cfg,
+ const struct bridge *br);
static void bridge_reconfigure_one(const struct ovsrec_open_vswitch *,
struct bridge *);
static void bridge_reconfigure_controller(const struct ovsrec_open_vswitch *,
static void bridge_reconfigure_one(const struct ovsrec_open_vswitch *,
struct bridge *);
static void bridge_reconfigure_controller(const struct ovsrec_open_vswitch *,
@@
-755,7
+758,8
@@
bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg)
/* Set sFlow configuration on this bridge. */
if (br->cfg->sflow) {
/* Set sFlow configuration on this bridge. */
if (br->cfg->sflow) {
- struct ovsrec_sflow *sflow_cfg = br->cfg->sflow;
+ const struct ovsrec_sflow *sflow_cfg = br->cfg->sflow;
+ const struct ovsrec_controller *ctrl;
struct ofproto_sflow_options oso;
memset(&oso, 0, sizeof oso);
struct ofproto_sflow_options oso;
memset(&oso, 0, sizeof oso);
@@
-781,10
+785,8
@@
bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg)
oso.sub_id = sflow_bridge_number++;
oso.agent_device = sflow_cfg->agent;
oso.sub_id = sflow_bridge_number++;
oso.agent_device = sflow_cfg->agent;
-#if 0 /* xxx foo */
ctrl = bridge_get_controller(ovs_cfg, br);
oso.control_ip = ctrl ? ctrl->local_ip : NULL;
ctrl = bridge_get_controller(ovs_cfg, br);
oso.control_ip = ctrl ? ctrl->local_ip : NULL;
-#endif
ofproto_set_sflow(br->ofproto, &oso);
svec_destroy(&oso.targets);
ofproto_set_sflow(br->ofproto, &oso);
svec_destroy(&oso.targets);
@@
-1155,7
+1157,7
@@
bridge_create(const struct ovsrec_bridge *br_cfg)
br->cfg = br_cfg;
br->ml = mac_learning_create();
br->sent_config_request = false;
br->cfg = br_cfg;
br->ml = mac_learning_create();
br->sent_config_request = false;
- eth_addr_random(br->default_ea);
+ eth_addr_
nicira_
random(br->default_ea);
port_array_init(&br->ifaces);
port_array_init(&br->ifaces);