projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian: Make the init script's start command idempotent
[openvswitch]
/
ofproto
/
fail-open.c
diff --git
a/ofproto/fail-open.c
b/ofproto/fail-open.c
index a79c5b226ac6fed8370599c77707c5087b6a220d..2a8fb955f53ef16a1d9a372594f37361dd18d6d1 100644
(file)
--- a/
ofproto/fail-open.c
+++ b/
ofproto/fail-open.c
@@
-21,6
+21,7
@@
#include "flow.h"
#include "mac-learning.h"
#include "odp-util.h"
#include "flow.h"
#include "mac-learning.h"
#include "odp-util.h"
+#include "ofp-util.h"
#include "ofpbuf.h"
#include "ofproto.h"
#include "pktbuf.h"
#include "ofpbuf.h"
#include "ofproto.h"
#include "pktbuf.h"
@@
-29,10
+30,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.
*
@@
-256,7
+257,7
@@
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 flow
flow;
VLOG_WARN("No longer in fail-open mode");
fo->last_disconn_secs = 0;
VLOG_WARN("No longer in fail-open mode");
fo->last_disconn_secs = 0;
@@
-271,7
+272,7
@@
void
fail_open_wait(struct fail_open *fo)
{
if (fo->next_bogus_packet_in != LLONG_MAX) {
fail_open_wait(struct fail_open *fo)
{
if (fo->next_bogus_packet_in != LLONG_MAX) {
- poll_timer_wait
(fo->next_bogus_packet_in - time_msec()
);
+ poll_timer_wait
_until(fo->next_bogus_packet_in
);
}
}
}
}
@@
-282,7
+283,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 flow
flow;
/* 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. */