/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
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);
server->listener = listener;
list_init(&server->conns);
*serverp = server;
- return 0;
+
+exit:
+ free(punix_path);
+ return error;
}
static void
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);