From: Ben Pfaff <blp@nicira.com>
Date: Fri, 4 Jan 2013 20:37:17 +0000 (-0800)
Subject: ovs-ofctl: Use vconn_open() instead of vconn_open_block() in open_vconn__().
X-Git-Tag: sliver-openvswitch-1.9.90-3~3^2~30
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=539b741f5999e22de02b14a35cc3e3855e2dc51d

ovs-ofctl: Use vconn_open() instead of vconn_open_block() in open_vconn__().

All of the paths in open_vconn__(), except the one path that calls
vconn_open() directly, just start the connection and do not block until
it completes.  This changes the remaining path to work the same way.

This will be important in an upcoming commit when in some cases we need to
take an action between opening and connecting.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
index 2ffe3d5e6..779404319 100644
--- a/utilities/ovs-ofctl.c
+++ b/utilities/ovs-ofctl.c
@@ -387,8 +387,7 @@ open_vconn__(const char *name, const char *default_suffix,
     free(datapath_type);
 
     if (strchr(name, ':')) {
-        run(vconn_open_block(name, get_allowed_ofp_versions(), DSCP_DEFAULT,
-                             vconnp),
+        run(vconn_open(name, get_allowed_ofp_versions(), DSCP_DEFAULT, vconnp),
             "connecting to %s", name);
     } else if (!open_vconn_socket(name, vconnp)) {
         /* Fall Through. */