X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=utilities%2Fovs-dpctl.c;h=c43066d263c4819c00370105045649442bfd23e1;hb=6d5d1f3bb76ca76b31fa8614bb914f91aace3f52;hp=dc93d558ab3fa05a88412c8ec2ba63c0468b8a16;hpb=17dddfc95f133997a81a02cd713fc309dd9c81ee;p=cascardo%2Fovs.git diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c index dc93d558a..c43066d26 100644 --- a/utilities/ovs-dpctl.c +++ b/utilities/ovs-dpctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,48 +33,65 @@ #include "command-line.h" #include "compiler.h" #include "dirs.h" -#include "dpif.h" -#include "dynamic-string.h" -#include "netdev.h" +#include "dpctl.h" +#include "fatal-signal.h" #include "odp-util.h" -#include "shash.h" -#include "svec.h" +#include "ofp-parse.h" +#include "packets.h" #include "timeval.h" #include "util.h" -#include "vlog.h" +#include "openvswitch/vlog.h" -VLOG_DEFINE_THIS_MODULE(dpctl); +static struct dpctl_params dpctl_p; -static const struct command all_commands[]; - -static void usage(void) NO_RETURN; +OVS_NO_RETURN static void usage(void *userdata OVS_UNUSED); static void parse_options(int argc, char *argv[]); +static void +dpctl_print(void *userdata OVS_UNUSED, bool error, const char *msg) +{ + FILE *outfile = error ? stderr : stdout; + fputs(msg, outfile); +} + int main(int argc, char *argv[]) { + int error; set_program_name(argv[0]); parse_options(argc, argv); - signal(SIGPIPE, SIG_IGN); - run_command(argc - optind, argv + optind, all_commands); - return 0; + fatal_ignore_sigpipe(); + + dpctl_p.is_appctl = false; + dpctl_p.output = dpctl_print; + dpctl_p.usage = usage; + + error = dpctl_run_command(argc - optind, (const char **) argv + optind, + &dpctl_p); + return error ? EXIT_FAILURE : EXIT_SUCCESS; } static void parse_options(int argc, char *argv[]) { enum { - OPT_DUMMY = UCHAR_MAX + 1, + OPT_CLEAR = UCHAR_MAX + 1, + OPT_MAY_CREATE, VLOG_OPTION_ENUMS }; - static struct option long_options[] = { - {"timeout", required_argument, 0, 't'}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, + static const struct option long_options[] = { + {"statistics", no_argument, NULL, 's'}, + {"clear", no_argument, NULL, OPT_CLEAR}, + {"may-create", no_argument, NULL, OPT_MAY_CREATE}, + {"more", no_argument, NULL, 'm'}, + {"timeout", required_argument, NULL, 't'}, + {"help", no_argument, NULL, 'h'}, + {"option", no_argument, NULL, 'o'}, + {"version", no_argument, NULL, 'V'}, VLOG_LONG_OPTIONS, - {0, 0, 0, 0}, + {NULL, 0, NULL, 0}, }; - char *short_options = long_options_to_short_options(long_options); + char *short_options = ovs_cmdl_long_options_to_short_options(long_options); for (;;) { unsigned long int timeout; @@ -86,6 +103,22 @@ parse_options(int argc, char *argv[]) } switch (c) { + case 's': + dpctl_p.print_statistics = true; + break; + + case OPT_CLEAR: + dpctl_p.zero_statistics = true; + break; + + case OPT_MAY_CREATE: + dpctl_p.may_create = true; + break; + + case 'm': + dpctl_p.verbosity++; + break; + case 't': timeout = strtoul(optarg, NULL, 10); if (timeout <= 0) { @@ -97,10 +130,14 @@ parse_options(int argc, char *argv[]) break; case 'h': - usage(); + usage(NULL); + + case 'o': + ovs_cmdl_print_options(long_options); + exit(EXIT_SUCCESS); case 'V': - OVS_PRINT_VERSION(0, 0); + ovs_print_version(0, 0); exit(EXIT_SUCCESS); VLOG_OPTION_HANDLERS @@ -116,420 +153,41 @@ parse_options(int argc, char *argv[]) } static void -usage(void) +usage(void *userdata OVS_UNUSED) { printf("%s: Open vSwitch datapath management utility\n" "usage: %s [OPTIONS] COMMAND [ARG...]\n" " add-dp DP [IFACE...] add new datapath DP (with IFACEs)\n" " del-dp DP delete local datapath DP\n" " add-if DP IFACE... add each IFACE as a port on DP\n" + " set-if DP IFACE... reconfigure each IFACE within DP\n" " del-if DP IFACE... delete each IFACE from DP\n" " dump-dps display names of all datapaths\n" " show show basic info on all datapaths\n" " show DP... show basic info on each DP\n" - " dump-flows DP display flows in DP\n" - " del-flows DP delete all flows from DP\n", + " dump-flows [DP] display flows in DP\n" + " add-flow [DP] FLOW ACTIONS add FLOW with ACTIONS to DP\n" + " mod-flow [DP] FLOW ACTIONS change FLOW actions to ACTIONS in DP\n" + " get-flow [DP] ufid:UFID fetch flow corresponding to UFID\n" + " del-flow [DP] FLOW delete FLOW from DP\n" + " del-flows [DP] delete all flows from DP\n" + "Each IFACE on add-dp, add-if, and set-if may be followed by\n" + "comma-separated options. See ovs-dpctl(8) for syntax, or the\n" + "Interface table in ovs-vswitchd.conf.db(5) for an options list.\n" + "For COMMAND dump-flows, add-flow, mod-flow, del-flow and\n" + "del-flows, DP is optional if there is only one datapath.\n", program_name, program_name); vlog_usage(); - printf("\nOther options:\n" + printf("\nOptions for show and mod-flow:\n" + " -s, --statistics print statistics for port or flow\n" + "\nOptions for dump-flows:\n" + " -m, --more increase verbosity of output\n" + "\nOptions for mod-flow:\n" + " --may-create create flow if it doesn't exist\n" + " --clear reset existing stats to zero\n" + "\nOther options:\n" " -t, --timeout=SECS give up after SECS seconds\n" " -h, --help display this help message\n" " -V, --version display version information\n"); exit(EXIT_SUCCESS); } - -static void run(int retval, const char *message, ...) - PRINTF_FORMAT(2, 3); - -static void run(int retval, const char *message, ...) -{ - if (retval) { - va_list args; - - fprintf(stderr, "%s: ", program_name); - va_start(args, message); - vfprintf(stderr, message, args); - va_end(args); - if (retval == EOF) { - fputs(": unexpected end of file\n", stderr); - } else { - fprintf(stderr, ": %s\n", strerror(retval)); - } - - exit(EXIT_FAILURE); - } -} - -static void do_add_if(int argc, char *argv[]); - -static int if_up(const char *netdev_name) -{ - struct netdev *netdev; - int retval; - - retval = netdev_open_default(netdev_name, &netdev); - if (!retval) { - retval = netdev_turn_flags_on(netdev, NETDEV_UP, true); - netdev_close(netdev); - } - return retval; -} - -static int -parsed_dpif_open(const char *arg_, bool create, struct dpif **dpifp) -{ - int result; - char *name, *type; - - dp_parse_name(arg_, &name, &type); - - if (create) { - result = dpif_create(name, type, dpifp); - } else { - result = dpif_open(name, type, dpifp); - } - - free(name); - free(type); - return result; -} - -static void -do_add_dp(int argc OVS_UNUSED, char *argv[]) -{ - struct dpif *dpif; - run(parsed_dpif_open(argv[1], true, &dpif), "add_dp"); - dpif_close(dpif); - if (argc > 2) { - do_add_if(argc, argv); - } -} - -static void -do_del_dp(int argc OVS_UNUSED, char *argv[]) -{ - struct dpif *dpif; - run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); - run(dpif_delete(dpif), "del_dp"); - dpif_close(dpif); -} - -static int -compare_ports(const void *a_, const void *b_) -{ - const struct odp_port *a = a_; - const struct odp_port *b = b_; - return a->port < b->port ? -1 : a->port > b->port; -} - -static void -query_ports(struct dpif *dpif, struct odp_port **ports, size_t *n_ports) -{ - run(dpif_port_list(dpif, ports, n_ports), "listing ports"); - qsort(*ports, *n_ports, sizeof **ports, compare_ports); -} - -static void -do_add_if(int argc OVS_UNUSED, char *argv[]) -{ - bool failure = false; - struct dpif *dpif; - int i; - - run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); - for (i = 2; i < argc; i++) { - char *save_ptr = NULL; - struct netdev_options options; - struct netdev *netdev; - struct shash args; - char *option; - int error; - - options.name = strtok_r(argv[i], ",", &save_ptr); - options.type = "system"; - options.args = &args; - options.ethertype = NETDEV_ETH_TYPE_NONE; - - if (!options.name) { - ovs_error(0, "%s is not a valid network device name", argv[i]); - continue; - } - - shash_init(&args); - while ((option = strtok_r(NULL, "", &save_ptr)) != NULL) { - char *save_ptr_2 = NULL; - char *key, *value; - - key = strtok_r(option, "=", &save_ptr_2); - value = strtok_r(NULL, "", &save_ptr_2); - if (!value) { - value = ""; - } - - if (!strcmp(key, "type")) { - options.type = value; - } else if (!shash_add_once(&args, key, value)) { - ovs_error(0, "duplicate \"%s\" option", key); - } - } - - error = netdev_open(&options, &netdev); - if (error) { - ovs_error(error, "%s: failed to open network device", - options.name); - } else { - error = dpif_port_add(dpif, netdev, NULL); - if (error) { - ovs_error(error, "adding %s to %s failed", - options.name, argv[1]); - } else { - error = if_up(options.name); - } - netdev_close(netdev); - } - if (error) { - failure = true; - } - } - dpif_close(dpif); - if (failure) { - exit(EXIT_FAILURE); - } -} - -static bool -get_port_number(struct dpif *dpif, const char *name, uint16_t *port) -{ - struct odp_port odp_port; - - if (!dpif_port_query_by_name(dpif, name, &odp_port)) { - *port = odp_port.port; - return true; - } else { - ovs_error(0, "no port named %s", name); - return false; - } -} - -static void -do_del_if(int argc OVS_UNUSED, char *argv[]) -{ - bool failure = false; - struct dpif *dpif; - int i; - - run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); - for (i = 2; i < argc; i++) { - const char *name = argv[i]; - uint16_t port; - int error; - - if (!name[strspn(name, "0123456789")]) { - port = atoi(name); - } else if (!get_port_number(dpif, name, &port)) { - failure = true; - continue; - } - - error = dpif_port_del(dpif, port); - if (error) { - ovs_error(error, "deleting port %s from %s failed", name, argv[1]); - failure = true; - } - } - dpif_close(dpif); - if (failure) { - exit(EXIT_FAILURE); - } -} - -static void -show_dpif(struct dpif *dpif) -{ - struct odp_port *ports; - struct odp_stats stats; - size_t n_ports; - size_t i; - - printf("%s:\n", dpif_name(dpif)); - if (!dpif_get_dp_stats(dpif, &stats)) { - printf("\tflows: cur:%"PRIu32", soft-max:%"PRIu32", " - "hard-max:%"PRIu32"\n", - stats.n_flows, stats.cur_capacity, stats.max_capacity); - printf("\tports: cur:%"PRIu32", max:%"PRIu32"\n", - stats.n_ports, stats.max_ports); - printf("\tlookups: frags:%llu, hit:%llu, missed:%llu, lost:%llu\n", - (unsigned long long int) stats.n_frags, - (unsigned long long int) stats.n_hit, - (unsigned long long int) stats.n_missed, - (unsigned long long int) stats.n_lost); - printf("\tqueues: max-miss:%"PRIu16", max-action:%"PRIu16"\n", - stats.max_miss_queue, stats.max_action_queue); - } - query_ports(dpif, &ports, &n_ports); - for (i = 0; i < n_ports; i++) { - const struct odp_port *p = &ports[i]; - struct ds ds; - - printf("\tport %u: %s", p->port, p->devname); - - ds_init(&ds); - format_odp_port_type(&ds, p); - printf("%s\n", ds_cstr(&ds)); - ds_destroy(&ds); - } - free(ports); - dpif_close(dpif); -} - -static void -do_show(int argc, char *argv[]) -{ - bool failure = false; - if (argc > 1) { - int i; - for (i = 1; i < argc; i++) { - const char *name = argv[i]; - struct dpif *dpif; - int error; - - error = parsed_dpif_open(name, false, &dpif); - if (!error) { - show_dpif(dpif); - } else { - ovs_error(error, "opening datapath %s failed", name); - failure = true; - } - } - } else { - struct svec types; - const char *type; - size_t i; - - svec_init(&types); - dp_enumerate_types(&types); - SVEC_FOR_EACH (i, type, &types) { - struct svec names; - const char *name; - size_t j; - - svec_init(&names); - if (dp_enumerate_names(type, &names)) { - failure = true; - continue; - } - SVEC_FOR_EACH (j, name, &names) { - struct dpif *dpif; - int error; - - error = dpif_open(name, type, &dpif); - if (!error) { - show_dpif(dpif); - } else { - ovs_error(error, "opening datapath %s failed", name); - failure = true; - } - } - svec_destroy(&names); - } - svec_destroy(&types); - } - if (failure) { - exit(EXIT_FAILURE); - } -} - -static void -do_dump_dps(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) -{ - struct svec dpif_names, dpif_types; - unsigned int i; - int error = 0; - - svec_init(&dpif_names); - svec_init(&dpif_types); - dp_enumerate_types(&dpif_types); - - for (i = 0; i < dpif_types.n; i++) { - unsigned int j; - int retval; - - retval = dp_enumerate_names(dpif_types.names[i], &dpif_names); - if (retval) { - error = retval; - } - - for (j = 0; j < dpif_names.n; j++) { - struct dpif *dpif; - if (!dpif_open(dpif_names.names[j], dpif_types.names[i], &dpif)) { - printf("%s\n", dpif_name(dpif)); - dpif_close(dpif); - } - } - } - - svec_destroy(&dpif_names); - svec_destroy(&dpif_types); - if (error) { - exit(EXIT_FAILURE); - } -} - -static void -do_dump_flows(int argc OVS_UNUSED, char *argv[]) -{ - struct odp_flow *flows; - struct dpif *dpif; - size_t n_flows; - struct ds ds; - size_t i; - - run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); - run(dpif_flow_list_all(dpif, &flows, &n_flows), "listing all flows"); - - ds_init(&ds); - for (i = 0; i < n_flows; i++) { - struct odp_flow *f = &flows[i]; - enum { MAX_ACTIONS = 4096 }; /* An arbitrary but large number. */ - struct nlattr actions[MAX_ACTIONS]; - - f->actions = actions; - f->actions_len = sizeof actions; - if (!dpif_flow_get(dpif, f)) { - ds_clear(&ds); - format_odp_flow(&ds, f); - printf("%s\n", ds_cstr(&ds)); - } - } - ds_destroy(&ds); - dpif_close(dpif); -} - -static void -do_del_flows(int argc OVS_UNUSED, char *argv[]) -{ - struct dpif *dpif; - - run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); - run(dpif_flow_flush(dpif), "deleting all flows"); - dpif_close(dpif); -} - -static void -do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) -{ - usage(); -} - -static const struct command all_commands[] = { - { "add-dp", 1, INT_MAX, do_add_dp }, - { "del-dp", 1, 1, do_del_dp }, - { "add-if", 2, INT_MAX, do_add_if }, - { "del-if", 2, INT_MAX, do_del_if }, - { "dump-dps", 0, 0, do_dump_dps }, - { "show", 0, INT_MAX, do_show }, - { "dump-flows", 1, 1, do_dump_flows }, - { "del-flows", 1, 1, do_del_flows }, - { "help", 0, INT_MAX, do_help }, - { NULL, 0, 0, NULL }, -};