From 539b741f5999e22de02b14a35cc3e3855e2dc51d Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 4 Jan 2013 12:37:17 -0800 Subject: [PATCH] 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 Acked-by: Ethan Jackson --- utilities/ovs-ofctl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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. */ -- 2.43.0