X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Funixctl.c;h=ac756a834bc456c5169868c9ccd76d9b579df6ee;hb=5136ce492c414f377f7be9ae32b259abb9f76580;hp=7d6fdd67bb5afdcf83f708720a1a0b4010349fb2;hpb=be2c418b73fcb6c606725d84c18b0ad618082c75;p=sliver-openvswitch.git diff --git a/lib/unixctl.c b/lib/unixctl.c index 7d6fdd67b..ac756a834 100644 --- 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. @@ -34,17 +34,19 @@ #include "poll-loop.h" #include "shash.h" #include "socket-util.h" +#include "svec.h" #include "util.h" +#include "vlog.h" #ifndef SCM_CREDENTIALS #include #endif -#define THIS_MODULE VLM_unixctl -#include "vlog.h" +VLOG_DEFINE_THIS_MODULE(unixctl) struct unixctl_command { - void (*cb)(struct unixctl_conn *, const char *args); + unixctl_cb_func *cb; + void *aux; }; struct unixctl_conn { @@ -76,22 +78,34 @@ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 5); 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; @@ -99,6 +113,7 @@ unixctl_command_register(const char *name, || shash_find_data(&commands, name) == cb); command = xmalloc(sizeof *command); command->cb = cb; + command->aux = aux; shash_add(&commands, name, command); } @@ -168,7 +183,7 @@ unixctl_command_reply(struct unixctl_conn *conn, * 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 .pid" will fail.) + * "ovs-appctl --target=" will fail.) * * Returns 0 if successful, otherwise a positive errno value. If successful, * sets '*serverp' to the new unixctl_server, otherwise to NULL. */ @@ -178,17 +193,13 @@ unixctl_server_create(const char *path, struct unixctl_server **serverp) struct unixctl_server *server; int error; - unixctl_command_register("help", unixctl_help); + 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, program_name, (long int) getpid()); @@ -198,22 +209,21 @@ unixctl_server_create(const char *path, struct unixctl_server **serverp) 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; } @@ -282,7 +292,7 @@ process_command(struct unixctl_conn *conn, char *s) 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); @@ -438,8 +448,7 @@ unixctl_server_destroy(struct unixctl_server *server) } close(server->fd); - unlink(server->path); - fatal_signal_remove_file_to_unlink(server->path); + fatal_signal_unlink_file_now(server->path); free(server->path); free(server); } @@ -447,7 +456,7 @@ unixctl_server_destroy(struct unixctl_server *server) /* 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. */ @@ -461,11 +470,7 @@ unixctl_client_create(const char *path, struct unixctl_client **clientp) /* 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++); @@ -504,8 +509,7 @@ void unixctl_client_destroy(struct unixctl_client *client) { if (client) { - unlink(client->bind_path); - fatal_signal_remove_file_to_unlink(client->bind_path); + fatal_signal_unlink_file_now(client->bind_path); free(client->bind_path); free(client->connect_path); fclose(client->stream);