projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: Add more functions for supporting OpenFlow error codes.
[openvswitch]
/
lib
/
unixctl.c
diff --git
a/lib/unixctl.c
b/lib/unixctl.c
index f710ffd60fb363b8837fec387b372ad987f2409a..6abb3328dda59ee50128ac56530db83ddacdad13 100644
(file)
--- a/
lib/unixctl.c
+++ b/
lib/unixctl.c
@@
-34,14
+34,15
@@
#include "poll-loop.h"
#include "shash.h"
#include "socket-util.h"
#include "poll-loop.h"
#include "shash.h"
#include "socket-util.h"
+#include "svec.h"
#include "util.h"
#include "util.h"
+#include "vlog.h"
#ifndef SCM_CREDENTIALS
#include <time.h>
#endif
#ifndef SCM_CREDENTIALS
#include <time.h>
#endif
-#define THIS_MODULE VLM_unixctl
-#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(unixctl);
\f
struct unixctl_command {
unixctl_cb_func *cb;
\f
struct unixctl_command {
unixctl_cb_func *cb;
@@
-82,11
+83,23
@@
unixctl_help(struct unixctl_conn *conn, const char *args OVS_UNUSED,
{
struct ds ds = DS_EMPTY_INITIALIZER;
struct shash_node *node;
{
struct ds ds = DS_EMPTY_INITIALIZER;
struct shash_node *node;
+ struct svec names;
+ const char *name;
+ size_t i;
ds_put_cstr(&ds, "The available commands are:\n");
ds_put_cstr(&ds, "The available commands are:\n");
+
+ svec_init(&names);
SHASH_FOR_EACH (node, &commands) {
SHASH_FOR_EACH (node, &commands) {
- ds_put_format(&ds, "\t%s\n", node->name);
+ svec_add(&names, node->name);
+ }
+ svec_sort(&names);
+
+ SVEC_FOR_EACH (i, name, &names) {
+ ds_put_format(&ds, "\t%s\n", name);
}
}
+ svec_destroy(&names);
+
unixctl_command_reply(conn, 214, ds_cstr(&ds));
ds_destroy(&ds);
}
unixctl_command_reply(conn, 214, ds_cstr(&ds));
ds_destroy(&ds);
}
@@
-186,11
+199,7
@@
unixctl_server_create(const char *path, struct unixctl_server **serverp)
list_init(&server->conns);
if (path) {
list_init(&server->conns);
if (path) {
- if (path[0] == '/') {
- server->path = xstrdup(path);
- } else {
- server->path = xasprintf("%s/%s", ovs_rundir, path);
- }
+ server->path = abs_file_name(ovs_rundir, path);
} else {
server->path = xasprintf("%s/%s.%ld.ctl", ovs_rundir,
program_name, (long int) getpid());
} else {
server->path = xasprintf("%s/%s.%ld.ctl", ovs_rundir,
program_name, (long int) getpid());
@@
-402,8
+411,7
@@
unixctl_server_run(struct unixctl_server *server)
new_connection(server, fd);
}
new_connection(server, fd);
}
- LIST_FOR_EACH_SAFE (conn, next,
- struct unixctl_conn, node, &server->conns) {
+ LIST_FOR_EACH_SAFE (conn, next, node, &server->conns) {
int error = run_connection(conn);
if (error && error != EAGAIN) {
kill_connection(conn);
int error = run_connection(conn);
if (error && error != EAGAIN) {
kill_connection(conn);
@@
-417,7
+425,7
@@
unixctl_server_wait(struct unixctl_server *server)
struct unixctl_conn *conn;
poll_fd_wait(server->fd, POLLIN);
struct unixctl_conn *conn;
poll_fd_wait(server->fd, POLLIN);
- LIST_FOR_EACH (conn,
struct unixctl_conn,
node, &server->conns) {
+ LIST_FOR_EACH (conn, node, &server->conns) {
if (conn->state == S_RECV) {
poll_fd_wait(conn->fd, POLLIN);
} else if (conn->state == S_SEND) {
if (conn->state == S_RECV) {
poll_fd_wait(conn->fd, POLLIN);
} else if (conn->state == S_SEND) {
@@
-433,8
+441,7
@@
unixctl_server_destroy(struct unixctl_server *server)
if (server) {
struct unixctl_conn *conn, *next;
if (server) {
struct unixctl_conn *conn, *next;
- LIST_FOR_EACH_SAFE (conn, next,
- struct unixctl_conn, node, &server->conns) {
+ LIST_FOR_EACH_SAFE (conn, next, node, &server->conns) {
kill_connection(conn);
}
kill_connection(conn);
}
@@
-447,7
+454,7
@@
unixctl_server_destroy(struct unixctl_server *server)
\f
/* Connects to a Vlog server socket. 'path' should be the name of a Vlog
* server socket. If it does not start with '/', it will be prefixed with
\f
/* Connects to a Vlog server socket. 'path' should be the name of a Vlog
* server socket. If it does not start with '/', it will be prefixed with
- * ovs_rundir (e.g. /var/run).
+ * ovs_rundir (e.g. /var/run
/openvswitch
).
*
* Returns 0 if successful, otherwise a positive errno value. If successful,
* sets '*clientp' to the new unixctl_client, otherwise to NULL. */
*
* Returns 0 if successful, otherwise a positive errno value. If successful,
* sets '*clientp' to the new unixctl_client, otherwise to NULL. */
@@
-461,11
+468,7
@@
unixctl_client_create(const char *path, struct unixctl_client **clientp)
/* Determine location. */
client = xmalloc(sizeof *client);
/* Determine location. */
client = xmalloc(sizeof *client);
- if (path[0] == '/') {
- client->connect_path = xstrdup(path);
- } else {
- client->connect_path = xasprintf("%s/%s", ovs_rundir, path);
- }
+ client->connect_path = abs_file_name(ovs_rundir, path);
client->bind_path = xasprintf("/tmp/vlog.%ld.%d",
(long int) getpid(), counter++);
client->bind_path = xasprintf("/tmp/vlog.%ld.%d",
(long int) getpid(), counter++);