mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-03 07:45:30 +00:00
Code Issues Releases Wiki Activity

ofproto-sflow: Maintain table of ports even when clearing configuration.

Browse Source 
When ofproto_sflow_set_options() fails, it calls ofproto_sflow_clear() to
deconfigure the ofproto_sflow object.  But ofproto_sflow_clear() deletes
all of the object's record of datapath ports.  That means that the next
call to ofproto_sflow_set_options(), if it succeeds, will believe that the
datapath has no ports.

This commit fixes the problem by only clearing ofproto_sflow's record of
datapath ports when it is destroyed, not just when a configuration error
occurs.

Reported-by: Neil McKee <neil.mckee@inmon.com>
This commit is contained in:
Ben Pfaff
2010-05-07 09:29:02 -07:00
parent 0caf6bde24
commit 32d9dc1181
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ofproto/ofproto-sflow.c
View File

@@ -239,9 +239,6 @@ success:
void void
ofproto_sflow_clear(struct ofproto_sflow *os) ofproto_sflow_clear(struct ofproto_sflow *os)
{ {
struct ofproto_sflow_port *osp;
unsigned int odp_port;
if (os->sflow_agent) { if (os->sflow_agent) {
sfl_agent_release(os->sflow_agent); sfl_agent_release(os->sflow_agent);
os->sflow_agent = NULL; os->sflow_agent = NULL;
@@ -251,11 +248,6 @@ ofproto_sflow_clear(struct ofproto_sflow *os)
ofproto_sflow_options_destroy(os->options); ofproto_sflow_options_destroy(os->options);
os->options = NULL; os->options = NULL;
PORT_ARRAY_FOR_EACH (osp, &os->ports, odp_port) {
ofproto_sflow_del_port(os, odp_port);
}
port_array_clear(&os->ports);
/* Turn off sampling to save CPU cycles. */ /* Turn off sampling to save CPU cycles. */
dpif_set_sflow_probability(os->dpif, 0); dpif_set_sflow_probability(os->dpif, 0);
} }
@@ -282,7 +274,13 @@ void
ofproto_sflow_destroy(struct ofproto_sflow *os) ofproto_sflow_destroy(struct ofproto_sflow *os)
{ {
if (os) { if (os) {
struct ofproto_sflow_port *osp;
unsigned int odp_port;
ofproto_sflow_clear(os); ofproto_sflow_clear(os);
PORT_ARRAY_FOR_EACH (osp, &os->ports, odp_port) {
ofproto_sflow_del_port(os, odp_port);
}
port_array_destroy(&os->ports); port_array_destroy(&os->ports);
free(os); free(os);
} }