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
Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
[sliver-openvswitch.git]
/
lib
/
reconnect.c
diff --git
a/lib/reconnect.c
b/lib/reconnect.c
index
b914ef6
..
0a773bc
100644
(file)
--- a/
lib/reconnect.c
+++ b/
lib/reconnect.c
@@
-331,7
+331,7
@@
reconnect_disconnected(struct reconnect *fsm, long long int now, int error)
if (fsm->state & (S_ACTIVE | S_IDLE)) {
if (error > 0) {
VLOG_WARN("%s: connection dropped (%s)",
if (fsm->state & (S_ACTIVE | S_IDLE)) {
if (error > 0) {
VLOG_WARN("%s: connection dropped (%s)",
- fsm->name, strerror(error));
+ fsm->name,
ovs_
strerror(error));
} else if (error == EOF) {
VLOG(fsm->info, "%s: connection closed by peer", fsm->name);
} else {
} else if (error == EOF) {
VLOG(fsm->info, "%s: connection closed by peer", fsm->name);
} else {
@@
-340,7
+340,7
@@
reconnect_disconnected(struct reconnect *fsm, long long int now, int error)
} else if (fsm->state == S_LISTENING) {
if (error > 0) {
VLOG_WARN("%s: error listening for connections (%s)",
} else if (fsm->state == S_LISTENING) {
if (error > 0) {
VLOG_WARN("%s: error listening for connections (%s)",
- fsm->name, strerror(error));
+ fsm->name,
ovs_
strerror(error));
} else {
VLOG(fsm->info, "%s: error listening for connections",
fsm->name);
} else {
VLOG(fsm->info, "%s: error listening for connections",
fsm->name);
@@
-349,7
+349,7
@@
reconnect_disconnected(struct reconnect *fsm, long long int now, int error)
const char *type = fsm->passive ? "listen" : "connection";
if (error > 0) {
VLOG_WARN("%s: %s attempt failed (%s)",
const char *type = fsm->passive ? "listen" : "connection";
if (error > 0) {
VLOG_WARN("%s: %s attempt failed (%s)",
- fsm->name, type, strerror(error));
+ fsm->name, type,
ovs_
strerror(error));
} else {
VLOG(fsm->info, "%s: %s attempt timed out", fsm->name, type);
}
} else {
VLOG(fsm->info, "%s: %s attempt timed out", fsm->name, type);
}
@@
-532,7
+532,7
@@
reconnect_deadline__(const struct reconnect *fsm)
return fsm->state_entered;
}
return fsm->state_entered;
}
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
/* Assesses whether any action should be taken on 'fsm'. The return value is
}
/* Assesses whether any action should be taken on 'fsm'. The return value is
@@
-604,7
+604,7
@@
reconnect_run(struct reconnect *fsm, long long int now)
return 0;
}
return 0;
}
- NOT_REACHED();
+
OVS_
NOT_REACHED();
} else {
return 0;
}
} else {
return 0;
}