projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket-util: Define LINUX macro at top of file.
[openvswitch]
/
lib
/
unixctl.c
diff --git
a/lib/unixctl.c
b/lib/unixctl.c
index 6378439414078940e280b54c1de618a218c72360..6abb3328dda59ee50128ac56530db83ddacdad13 100644
(file)
--- a/
lib/unixctl.c
+++ b/
lib/unixctl.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009
, 2010
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-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;
@@
-77,16
+78,28
@@
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 5);
static struct shash commands = SHASH_INITIALIZER(&commands);
static void
static struct shash commands = SHASH_INITIALIZER(&commands);
static void
-unixctl_help(struct unixctl_conn *conn, const char *args UNUSED,
- void *aux UNUSED)
+unixctl_help(struct unixctl_conn *conn, const char *args
OVS_
UNUSED,
+ void *aux
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());
@@
-200,22
+209,21
@@
unixctl_server_create(const char *path, struct unixctl_server **serverp)
NULL);
if (server->fd < 0) {
error = -server->fd;
NULL);
if (server->fd < 0) {
error = -server->fd;
-
fprintf(stderr, "Could not initialize control socket %s (%s)\n
",
-
server->path, strerror(error)
);
+
ovs_error(error, "could not initialize control socket %s
",
+
server->path
);
goto error;
}
if (chmod(server->path, S_IRUSR | S_IWUSR) < 0) {
error = errno;
goto error;
}
if (chmod(server->path, S_IRUSR | S_IWUSR) < 0) {
error = errno;
- fprintf(stderr, "Failed to chmod control socket %s (%s)\n",
- server->path, strerror(error));
+ ovs_error(error, "failed to chmod control socket %s", server->path);
goto error;
}
if (listen(server->fd, 10) < 0) {
error = errno;
goto error;
}
if (listen(server->fd, 10) < 0) {
error = errno;
-
fprintf(stderr, "Failed to listen on control socket %s (%s)\n
",
-
server->path, strerror(error)
);
+
ovs_error(error, "Failed to listen on control socket %s
",
+
server->path
);
goto error;
}
goto error;
}
@@
-403,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);
@@
-418,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) {
@@
-434,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);
}
@@
-448,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. */
@@
-462,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++);