X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-appctl.c;h=ddeeb1dfabd389ee24cc6dd5ce34f8819a59e8d5;hb=b4dca848eb6860d1f93e4ea0556dd35aeb265dbf;hp=93496623587f3b2386b67ff30b63d536426c4d69;hpb=a14bc59fb8f27db193d74662dc9c5cb8237177ef;p=sliver-openvswitch.git diff --git a/utilities/ovs-appctl.c b/utilities/ovs-appctl.c index 934966235..ddeeb1dfa 100644 --- a/utilities/ovs-appctl.c +++ b/utilities/ovs-appctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 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. @@ -13,197 +13,148 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include -#include "vlog.h" -#include #include #include -#include #include #include #include #include "command-line.h" -#include "compiler.h" +#include "daemon.h" +#include "dirs.h" +#include "dynamic-string.h" +#include "jsonrpc.h" +#include "process.h" #include "timeval.h" #include "unixctl.h" #include "util.h" -static void -usage(char *prog_name, int exit_code) -{ - printf("Usage: %s [TARGET] [ACTION...]\n" - "Targets:\n" - " -t, --target=TARGET Path to Unix domain socket\n" - "Actions:\n" - " -l, --list List current settings\n" - " -s, --set=MODULE[:FACILITY[:LEVEL]]\n" - " Set MODULE and FACILITY log level to LEVEL\n" - " MODULE may be any valid module name or 'ANY'\n" - " FACILITY may be 'syslog', 'console', 'file', or 'ANY' (default)\n" - " LEVEL may be 'emer', 'err', 'warn', 'info', or 'dbg' (default)\n" - " -r, --reopen Make the program reopen its log file\n" - " -e, --execute=COMMAND Execute control COMMAND and print its output\n" - "Other options:\n" - " -h, --help Print this helpful information\n" - " -V, --version Display version information\n", - prog_name); - exit(exit_code); -} +static void usage(void); +static const char *parse_command_line(int argc, char *argv[]); +static struct jsonrpc *connect_to_target(const char *target); -static char * -transact(struct unixctl_client *client, const char *request, bool *ok) +int +main(int argc, char *argv[]) { - int code; - char *reply; - int error = unixctl_client_transact(client, request, &code, &reply); - if (error) { - fprintf(stderr, "%s: transaction error: %s\n", - unixctl_client_target(client), strerror(error)); - *ok = false; - return xstrdup(""); - } else { - if (code / 100 != 2) { - fprintf(stderr, "%s: server returned reply code %03d\n", - unixctl_client_target(client), code); - } - return reply; - } -} + char *cmd_result, *cmd_error; + struct jsonrpc *client; + char *cmd, **cmd_argv; + const char *target; + int cmd_argc; + int error; -static void -transact_ack(struct unixctl_client *client, const char *request, bool *ok) -{ - free(transact(client, request, ok)); -} + set_program_name(argv[0]); -static void -execute_command(struct unixctl_client *client, const char *request, bool *ok) -{ - int code; - char *reply; - int error = unixctl_client_transact(client, request, &code, &reply); + /* Parse command line and connect to target. */ + target = parse_command_line(argc, argv); + client = connect_to_target(target); + + /* Transact request and process reply. */ + cmd = argv[optind++]; + cmd_argc = argc - optind; + cmd_argv = cmd_argc ? argv + optind : NULL; + error = unixctl_client_transact(client, cmd, cmd_argc, cmd_argv, + &cmd_result, &cmd_error); if (error) { - fprintf(stderr, "%s: transaction error: %s\n", - unixctl_client_target(client), strerror(error)); - *ok = false; + ovs_fatal(error, "%s: transaction error", target); + } + + if (cmd_error) { + fputs(cmd_error, stderr); + ovs_error(0, "%s: server returned an error", target); + exit(2); + } else if (cmd_result) { + fputs(cmd_result, stdout); } else { - if (code / 100 != 2) { - fprintf(stderr, "%s: server returned reply code %03d\n", - unixctl_client_target(client), code); - fputs(reply, stderr); - *ok = false; - } else { - fputs(reply, stdout); - } + NOT_REACHED(); } + + jsonrpc_close(client); + free(cmd_result); + free(cmd_error); + return 0; } static void -add_target(struct unixctl_client ***clients, size_t *n_clients, - const char *path, bool *ok) +usage(void) { - struct unixctl_client *client; - int error = unixctl_client_create(path, &client); - if (error) { - fprintf(stderr, "Error connecting to \"%s\": %s\n", - path, strerror(error)); - *ok = false; - } else { - *clients = xrealloc(*clients, sizeof *clients * (*n_clients + 1)); - (*clients)[*n_clients] = client; - ++*n_clients; - } + printf("\ +%s, for querying and controlling Open vSwitch daemon\n\ +usage: %s [TARGET] COMMAND [ARG...]\n\ +Targets:\n\ + -t, --target=TARGET pidfile or socket to contact\n\ +Common commands:\n\ + help List commands supported by the target\n\ + version Print version of the target\n\ + vlog/list List current logging levels\n\ + vlog/set [SPEC]\n\ + Set log levels as detailed in SPEC, which may include:\n\ + A valid module name (all modules, by default)\n\ + 'syslog', 'console', 'file' (all facilities, by default))\n\ + 'off', 'emer', 'err', 'warn', 'info', or 'dbg' ('dbg', bydefault)\n\ + vlog/reopen Make the program reopen its log file\n\ +Other options:\n\ + --timeout=SECS wait at most SECS seconds for a response\n\ + -h, --help Print this helpful information\n\ + -V, --version Display ovs-appctl version information\n", + program_name, program_name); + exit(EXIT_SUCCESS); } -int main(int argc, char *argv[]) +static const char * +parse_command_line(int argc, char *argv[]) { static const struct option long_options[] = { - /* Target options must come first. */ {"target", required_argument, NULL, 't'}, + {"execute", no_argument, NULL, 'e'}, {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'V'}, - - /* Action options come afterward. */ - {"list", no_argument, NULL, 'l'}, - {"set", required_argument, NULL, 's'}, - {"reopen", no_argument, NULL, 'r'}, - {"execute", required_argument, NULL, 'e'}, - {0, 0, 0, 0}, + {"timeout", required_argument, NULL, 'T'}, + {NULL, 0, NULL, 0}, }; - char *short_options; - - /* Determine targets. */ - bool ok = true; - int n_actions = 0; - struct unixctl_client **clients = NULL; - size_t n_clients = 0; - - set_program_name(argv[0]); - time_init(); + const char *target; + int e_options; - short_options = long_options_to_short_options(long_options); + target = NULL; + e_options = 0; for (;;) { int option; - size_t i; - option = getopt_long(argc, argv, short_options, long_options, NULL); + option = getopt_long(argc, argv, "+t:hVe", long_options, NULL); if (option == -1) { break; } - if (!strchr("thV", option) && n_clients == 0) { - ovs_fatal(0, "no targets specified (use --help for help)"); - } else { - ++n_actions; - } switch (option) { case 't': - add_target(&clients, &n_clients, optarg, &ok); - break; - - case 'l': - for (i = 0; i < n_clients; i++) { - struct unixctl_client *client = clients[i]; - char *reply; - - printf("%s:\n", unixctl_client_target(client)); - reply = transact(client, "vlog/list", &ok); - fputs(reply, stdout); - free(reply); - } - break; - - case 's': - for (i = 0; i < n_clients; i++) { - struct unixctl_client *client = clients[i]; - char *request = xasprintf("vlog/set %s", optarg); - transact_ack(client, request, &ok); - free(request); - } - break; - - case 'r': - for (i = 0; i < n_clients; i++) { - struct unixctl_client *client = clients[i]; - char *request = xstrdup("vlog/reopen"); - transact_ack(client, request, &ok); - free(request); + if (target) { + ovs_fatal(0, "-t or --target may be specified only once"); } + target = optarg; break; case 'e': - for (i = 0; i < n_clients; i++) { - execute_command(clients[i], optarg, &ok); + /* We ignore -e for compatibility. Older versions specified the + * command as the argument to -e. Since the current version takes + * the command as non-option arguments and we say that -e has no + * arguments, this just works in the common case. */ + if (e_options++) { + ovs_fatal(0, "-e or --execute may be speciifed only once"); } break; case 'h': - usage(argv[0], EXIT_SUCCESS); + usage(); + break; + + case 'T': + time_alarm(atoi(optarg)); break; case 'V': - OVS_PRINT_VERSION(0, 0); + ovs_print_version(0, 0); exit(EXIT_SUCCESS); case '?': @@ -213,9 +164,44 @@ int main(int argc, char *argv[]) NOT_REACHED(); } } - if (!n_actions) { - fprintf(stderr, - "warning: no actions specified (use --help for help)\n"); + + if (optind >= argc) { + ovs_fatal(0, "at least one non-option argument is required " + "(use --help for help)"); } - exit(ok ? 0 : 1); + + return target ? target : "ovs-vswitchd"; } + +static struct jsonrpc * +connect_to_target(const char *target) +{ + struct jsonrpc *client; + char *socket_name; + int error; + + if (target[0] != '/') { + char *pidfile_name; + pid_t pid; + + pidfile_name = xasprintf("%s/%s.pid", ovs_rundir(), target); + pid = read_pidfile(pidfile_name); + if (pid < 0) { + ovs_fatal(-pid, "cannot read pidfile \"%s\"", pidfile_name); + } + free(pidfile_name); + socket_name = xasprintf("%s/%s.%ld.ctl", + ovs_rundir(), target, (long int) pid); + } else { + socket_name = xstrdup(target); + } + + error = unixctl_client_create(socket_name, &client); + if (error) { + ovs_fatal(error, "cannot connect to \"%s\"", socket_name); + } + free(socket_name); + + return client; +} +