/*
- * 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.
#include "poll-loop.h"
#include "shash.h"
#include "socket-util.h"
+#include "svec.h"
#include "util.h"
+#include "vlog.h"
#ifndef SCM_CREDENTIALS
#include <time.h>
#endif
-#define THIS_MODULE VLM_unixctl
-#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(unixctl);
+
+COVERAGE_DEFINE(unixctl_received);
+COVERAGE_DEFINE(unixctl_replied);
\f
struct unixctl_command {
- void (*cb)(struct unixctl_conn *, const char *args);
+ unixctl_cb_func *cb;
+ void *aux;
};
struct unixctl_conn {
static struct shash commands = SHASH_INITIALIZER(&commands);
static void
-unixctl_help(struct unixctl_conn *conn, const char *args 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 svec names;
+ const char *name;
+ size_t i;
ds_put_cstr(&ds, "The available commands are:\n");
+
+ svec_init(&names);
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);
}
void
-unixctl_command_register(const char *name,
- void (*cb)(struct unixctl_conn *, const char *args))
+unixctl_command_register(const char *name, unixctl_cb_func *cb, void *aux)
{
struct unixctl_command *command;
|| shash_find_data(&commands, name) == cb);
command = xmalloc(sizeof *command);
command->cb = cb;
+ command->aux = aux;
shash_add(&commands, name, command);
}
*
* - NULL, in which case <rundir>/<program>.<pid>.ctl is used.
*
+ * - "none", in which case the function will return successfully but
+ * no socket will actually be created.
+ *
* - A name that does not start with '/', in which case it is put in
* <rundir>.
*
* A program that (optionally) daemonizes itself should call this function
* *after* daemonization, so that the socket name contains the pid of the
* daemon instead of the pid of the program that exited. (Otherwise,
- * "ovs-appctl --target <program>.pid" will fail.)
+ * "ovs-appctl --target=<program>" will fail.)
*
* Returns 0 if successful, otherwise a positive errno value. If successful,
- * sets '*serverp' to the new unixctl_server, otherwise to NULL. */
+ * sets '*serverp' to the new unixctl_server (or to NULL if 'path' was "none"),
+ * otherwise to NULL. */
int
unixctl_server_create(const char *path, struct unixctl_server **serverp)
{
struct unixctl_server *server;
int error;
- unixctl_command_register("help", unixctl_help);
+ if (path && !strcmp(path, "none")) {
+ *serverp = NULL;
+ return 0;
+ }
+
+ unixctl_command_register("help", unixctl_help, NULL);
server = xmalloc(sizeof *server);
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,
+ server->path = xasprintf("%s/%s.%ld.ctl", ovs_rundir(),
program_name, (long int) getpid());
}
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;
- 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;
- 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;
}
command = shash_find_data(&commands, name);
if (command) {
- command->cb(conn, args);
+ command->cb(conn, args, command->aux);
} else {
char *msg = xasprintf("\"%s\" is not a valid command", name);
unixctl_command_reply(conn, 400, msg);
struct unixctl_conn *conn, *next;
int i;
+ if (!server) {
+ return;
+ }
+
for (i = 0; i < 10; i++) {
int fd = accept(server->fd, NULL, NULL);
if (fd < 0) {
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);
{
struct unixctl_conn *conn;
+ if (!server) {
+ return;
+ }
+
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 (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);
}
\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).
+ * the rundir (e.g. /usr/local/var/run/openvswitch).
*
* Returns 0 if successful, otherwise a positive errno value. If successful,
* sets '*clientp' to the new unixctl_client, otherwise to NULL. */
/* 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++);
git://git.onelab.eu / sliver-openvswitch.git / blobdiff