automake: ofp-errors.[c|inc] are actually inside srcdir

[openvswitch] / lib / unixctl.c

diff --git a/lib/unixctl.c b/lib/unixctl.c
index 054ce49c0cfad72bd1b42211db713f69b971c604..b495deb80514c81a1a405b49e9da0bbbbeaba7c6 100644 (file)
--- a/lib/unixctl.c
+++ b/lib/unixctl.c
@@ -221,13 +221,10 @@ unixctl_server_create(const char *path, struct unixctl_server **serverp)
                                program_name, (long int) getpid());
     }
 
-    error = pstream_open(punix_path, &listener);
-    free(punix_path);
-    punix_path = NULL;
-
+    error = pstream_open(punix_path, &listener, 0);
     if (error) {
-        ovs_error(error, "could not initialize control socket %s", path);
-        return error;
+        ovs_error(error, "could not initialize control socket %s", punix_path);
+        goto exit;
     }
 
     unixctl_command_register("help", "", 0, 0, unixctl_help, NULL);
@@ -237,7 +234,10 @@ unixctl_server_create(const char *path, struct unixctl_server **serverp)
     server->listener = listener;
     list_init(&server->conns);
     *serverp = server;
-    return 0;
+
+exit:
+    free(punix_path);
+    return error;
 }
 
 static void
@@ -422,7 +422,8 @@ unixctl_client_create(const char *path, struct jsonrpc **client)
 
     abs_path = abs_file_name(ovs_rundir(), path);
     unix_path = xasprintf("unix:%s", abs_path);
-    error = stream_open_block(stream_open(unix_path, &stream), &stream);
+    error = stream_open_block(stream_open(unix_path, &stream, DSCP_DEFAULT),
+                              &stream);
     free(unix_path);
     free(abs_path);