git://git.onelab.eu
/
sliver-openvswitch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6ef891a
)
Make rconn_disconnect() a no-op if already disconnected.
author
Ben Pfaff
<blp@nicira.com>
Wed, 8 Oct 2008 21:24:18 +0000
(14:24 -0700)
committer
Ben Pfaff
<blp@nicira.com>
Thu, 9 Oct 2008 22:53:05 +0000
(15:53 -0700)
lib/rconn.c
patch
|
blob
|
history
diff --git
a/lib/rconn.c
b/lib/rconn.c
index
8195495
..
e5f377b
100644
(file)
--- a/
lib/rconn.c
+++ b/
lib/rconn.c
@@
-227,18
+227,20
@@
rconn_connect_unreliably(struct rconn *rc,
void
rconn_disconnect(struct rconn *rc)
{
void
rconn_disconnect(struct rconn *rc)
{
- if (rc->vconn) {
- vconn_close(rc->vconn);
- rc->vconn = NULL;
- }
- free(rc->name);
- rc->name = xstrdup("void");
- rc->reliable = false;
+ if (rc->state != S_VOID) {
+ if (rc->vconn) {
+ vconn_close(rc->vconn);
+ rc->vconn = NULL;
+ }
+ free(rc->name);
+ rc->name = xstrdup("void");
+ rc->reliable = false;
- rc->backoff = 0;
- rc->backoff_deadline = TIME_MIN;
+
rc->backoff = 0;
+
rc->backoff_deadline = TIME_MIN;
- state_transition(rc, S_VOID);
+ state_transition(rc, S_VOID);
+ }
}
/* Disconnects 'rc' and frees the underlying storage. */
}
/* Disconnects 'rc' and frees the underlying storage. */