projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev-linux: Fix strict aliasing warnings.
[openvswitch]
/
ofproto
/
fail-open.c
diff --git
a/ofproto/fail-open.c
b/ofproto/fail-open.c
index a86ee391b12dbfc8d56c8cdb55b1fb27965de50e..cd1db94c52614d1bcab933d805a019191bf4a110 100644
(file)
--- a/
ofproto/fail-open.c
+++ b/
ofproto/fail-open.c
@@
-18,6
+18,7
@@
#include "fail-open.h"
#include <inttypes.h>
#include <stdlib.h>
#include "fail-open.h"
#include <inttypes.h>
#include <stdlib.h>
+#include "classifier.h"
#include "flow.h"
#include "mac-learning.h"
#include "odp-util.h"
#include "flow.h"
#include "mac-learning.h"
#include "odp-util.h"
@@
-30,10
+31,10
@@
#include "status.h"
#include "timeval.h"
#include "vconn.h"
#include "status.h"
#include "timeval.h"
#include "vconn.h"
-
-#define THIS_MODULE VLM_fail_open
#include "vlog.h"
#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(fail_open);
+
/*
* Fail-open mode.
*
/*
* Fail-open mode.
*
@@
-257,14
+258,14
@@
static void
fail_open_recover(struct fail_open *fo)
{
if (fail_open_is_active(fo)) {
fail_open_recover(struct fail_open *fo)
{
if (fail_open_is_active(fo)) {
-
flow_t flow
;
+
struct cls_rule rule
;
VLOG_WARN("No longer in fail-open mode");
fo->last_disconn_secs = 0;
fo->next_bogus_packet_in = LLONG_MAX;
VLOG_WARN("No longer in fail-open mode");
fo->last_disconn_secs = 0;
fo->next_bogus_packet_in = LLONG_MAX;
-
memset(&flow, 0, sizeof flow
);
- ofproto_delete_flow(fo->ofproto, &
flow, OVSFW_ALL, FAIL_OPEN_PRIORITY
);
+
cls_rule_init_catchall(&rule, FAIL_OPEN_PRIORITY
);
+ ofproto_delete_flow(fo->ofproto, &
rule
);
}
}
}
}
@@
-283,7
+284,7
@@
fail_open_flushed(struct fail_open *fo)
bool open = disconn_secs >= trigger_duration(fo);
if (open) {
union ofp_action action;
bool open = disconn_secs >= trigger_duration(fo);
if (open) {
union ofp_action action;
-
flow_t flow
;
+
struct cls_rule rule
;
/* Set up a flow that matches every packet and directs them to
* OFPP_NORMAL. */
/* Set up a flow that matches every packet and directs them to
* OFPP_NORMAL. */
@@
-291,9
+292,9
@@
fail_open_flushed(struct fail_open *fo)
action.type = htons(OFPAT_OUTPUT);
action.output.len = htons(sizeof action);
action.output.port = htons(OFPP_NORMAL);
action.type = htons(OFPAT_OUTPUT);
action.output.len = htons(sizeof action);
action.output.port = htons(OFPP_NORMAL);
- memset(&flow, 0, sizeof flow);
- ofproto_add_flow(fo->ofproto, &flow, OVSFW_ALL, FAIL_OPEN_PRIORITY,
-
&action, 1, 0
);
+
+ cls_rule_init_catchall(&rule, FAIL_OPEN_PRIORITY);
+
ofproto_add_flow(fo->ofproto, &rule, &action, 1
);
}
}
}
}