X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-dpctl.c;h=ecfb3069ade397fe657900e2f0079738f685afcb;hb=76ce9432393df462e2030036021ea60096a734d4;hp=0dd93351d1eca365217129e0993fdfb2a7e79e7b;hpb=2886875a385df582354ac916431b278f2fe698e0;p=openvswitch diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c index 0dd93351..ecfb3069 100644 --- a/utilities/ovs-dpctl.c +++ b/utilities/ovs-dpctl.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. @@ -43,67 +43,35 @@ #include "vlog.h" #define THIS_MODULE VLM_dpctl -struct command { - const char *name; - int min_args; - int max_args; - void (*handler)(int argc, char *argv[]); -}; - -static struct command all_commands[]; +static const struct command all_commands[]; static void usage(void) NO_RETURN; static void parse_options(int argc, char *argv[]); -int main(int argc, char *argv[]) +int +main(int argc, char *argv[]) { - struct command *p; - set_program_name(argv[0]); time_init(); vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); - - argc -= optind; - argv += optind; - if (argc < 1) - ovs_fatal(0, "missing command name; use --help for help"); - - for (p = all_commands; p->name != NULL; p++) { - if (!strcmp(p->name, argv[0])) { - int n_arg = argc - 1; - if (n_arg < p->min_args) - ovs_fatal(0, "'%s' command requires at least %d arguments", - p->name, p->min_args); - else if (n_arg > p->max_args) - ovs_fatal(0, "'%s' command takes at most %d arguments", - p->name, p->max_args); - else { - p->handler(argc, argv); - if (ferror(stdout)) { - ovs_fatal(0, "write to stdout failed"); - } - if (ferror(stderr)) { - ovs_fatal(0, "write to stderr failed"); - } - exit(0); - } - } - } - ovs_fatal(0, "unknown command '%s'; use --help for help", argv[0]); - + run_command(argc - optind, argv + optind, all_commands); return 0; } static void parse_options(int argc, char *argv[]) { + enum { + OPT_DUMMY = UCHAR_MAX + 1, + VLOG_OPTION_ENUMS + }; static struct option long_options[] = { {"timeout", required_argument, 0, 't'}, - {"verbose", optional_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, + VLOG_LONG_OPTIONS, {0, 0, 0, 0}, }; char *short_options = long_options_to_short_options(long_options); @@ -135,9 +103,7 @@ parse_options(int argc, char *argv[]) OVS_PRINT_VERSION(0, 0); exit(EXIT_SUCCESS); - case 'v': - vlog_set_verbosity(optarg); - break; + VLOG_OPTION_HANDLERS case '?': exit(EXIT_FAILURE); @@ -202,7 +168,7 @@ static int if_up(const char *netdev_name) struct netdev *netdev; int retval; - retval = netdev_open(netdev_name, NETDEV_ETH_TYPE_NONE, &netdev); + retval = netdev_open_default(netdev_name, &netdev); if (!retval) { retval = netdev_turn_flags_on(netdev, NETDEV_UP, true); netdev_close(netdev); @@ -210,24 +176,43 @@ static int if_up(const char *netdev_name) 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 UNUSED, char *argv[]) +do_add_dp(int argc OVS_UNUSED, char *argv[]) { - struct dpif dpif; - run(dpif_create(argv[1], &dpif), "add_dp"); - dpif_close(&dpif); + 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 UNUSED, char *argv[]) +do_del_dp(int argc OVS_UNUSED, char *argv[]) { - struct dpif dpif; - run(dpif_open(argv[1], &dpif), "opening datapath"); - run(dpif_delete(&dpif), "del_dp"); - dpif_close(&dpif); + struct dpif *dpif; + run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); + run(dpif_delete(dpif), "del_dp"); + dpif_close(dpif); } static int @@ -245,41 +230,17 @@ query_ports(struct dpif *dpif, struct odp_port **ports, size_t *n_ports) qsort(*ports, *n_ports, sizeof **ports, compare_ports); } -static uint16_t -get_free_port(struct dpif *dpif) -{ - struct odp_port *ports; - size_t n_ports; - int port_no; - - query_ports(dpif, &ports, &n_ports); - for (port_no = 0; port_no <= UINT16_MAX; port_no++) { - size_t i; - for (i = 0; i < n_ports; i++) { - if (ports[i].port == port_no) { - goto next_portno; - } - } - free(ports); - return port_no; - - next_portno: ; - } - ovs_fatal(0, "no free datapath ports"); -} - static void -do_add_if(int argc UNUSED, char *argv[]) +do_add_if(int argc OVS_UNUSED, char *argv[]) { bool failure = false; - struct dpif dpif; + struct dpif *dpif; int i; - run(dpif_open(argv[1], &dpif), "opening datapath"); + run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); for (i = 2; i < argc; i++) { char *save_ptr = NULL; char *devname, *suboptions; - int port = -1; int flags = 0; int error; @@ -292,11 +253,9 @@ do_add_if(int argc UNUSED, char *argv[]) suboptions = strtok_r(NULL, "", &save_ptr); if (suboptions) { enum { - AP_PORT, AP_INTERNAL }; static char *options[] = { - "port", "internal" }; @@ -304,13 +263,6 @@ do_add_if(int argc UNUSED, char *argv[]) char *value; switch (getsubopt(&suboptions, options, &value)) { - case AP_PORT: - if (!value) { - ovs_error(0, "'port' suboption requires a value"); - } - port = atoi(value); - break; - case AP_INTERNAL: flags |= ODP_PORT_INTERNAL; break; @@ -321,20 +273,16 @@ do_add_if(int argc UNUSED, char *argv[]) } } } - if (port < 0) { - port = get_free_port(&dpif); - } - error = dpif_port_add(&dpif, devname, port, flags); + error = dpif_port_add(dpif, devname, flags, NULL); if (error) { - ovs_error(error, "adding %s as port %"PRIu16" of %s failed", - devname, port, argv[1]); + ovs_error(error, "adding %s to %s failed", devname, argv[1]); failure = true; } else if (if_up(devname)) { failure = true; } } - dpif_close(&dpif); + dpif_close(dpif); if (failure) { exit(EXIT_FAILURE); } @@ -361,13 +309,13 @@ get_port_number(struct dpif *dpif, const char *name, uint16_t *port) } static void -do_del_if(int argc UNUSED, char *argv[]) +do_del_if(int argc OVS_UNUSED, char *argv[]) { bool failure = false; - struct dpif dpif; + struct dpif *dpif; int i; - run(dpif_open(argv[1], &dpif), "opening datapath"); + run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); for (i = 2; i < argc; i++) { const char *name = argv[i]; uint16_t port; @@ -375,18 +323,18 @@ do_del_if(int argc UNUSED, char *argv[]) if (!name[strspn(name, "0123456789")]) { port = atoi(name); - } else if (!get_port_number(&dpif, name, &port)) { + } else if (!get_port_number(dpif, name, &port)) { failure = true; continue; } - error = dpif_port_del(&dpif, port); + 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); + dpif_close(dpif); if (failure) { exit(EXIT_FAILURE); } @@ -400,7 +348,7 @@ show_dpif(struct dpif *dpif) size_t n_ports; size_t i; - printf("dp%u:\n", dpif_id(dpif)); + printf("%s:\n", dpif_name(dpif)); if (!dpif_get_dp_stats(dpif, &stats)) { printf("\tflows: cur:%"PRIu32", soft-max:%"PRIu32", " "hard-max:%"PRIu32"\n", @@ -436,12 +384,12 @@ do_show(int argc, char *argv[]) int i; for (i = 1; i < argc; i++) { const char *name = argv[i]; - struct dpif dpif; + struct dpif *dpif; int error; - error = dpif_open(name, &dpif); + error = parsed_dpif_open(name, false, &dpif); if (!error) { - show_dpif(&dpif); + show_dpif(dpif); } else { ovs_error(error, "opening datapath %s failed", name); failure = true; @@ -451,13 +399,13 @@ do_show(int argc, char *argv[]) unsigned int i; for (i = 0; i < ODP_MAX; i++) { char name[128]; - struct dpif dpif; + struct dpif *dpif; int error; sprintf(name, "dp%u", i); - error = dpif_open(name, &dpif); + error = parsed_dpif_open(name, false, &dpif); if (!error) { - show_dpif(&dpif); + show_dpif(dpif); } else if (error != ENODEV) { ovs_error(error, "opening datapath %s failed", name); failure = true; @@ -470,45 +418,52 @@ do_show(int argc, char *argv[]) } static void -do_dump_dps(int argc UNUSED, char *argv[] UNUSED) +do_dump_dps(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { - struct svec all_dps; + struct svec dpif_names, dpif_types; unsigned int i; - int error; + int error = 0; - svec_init(&all_dps); - error = dp_enumerate(&all_dps); + svec_init(&dpif_names); + svec_init(&dpif_types); + dp_enumerate_types(&dpif_types); - for (i = 0; i < all_dps.n; i++) { - struct dpif dpif; - char dpif_name[IF_NAMESIZE]; + for (i = 0; i < dpif_types.n; i++) { + unsigned int j; + int retval; - if (dpif_open(all_dps.names[i], &dpif)) { - continue; + retval = dp_enumerate_names(dpif_types.names[i], &dpif_names); + if (retval) { + error = retval; } - if (!dpif_get_name(&dpif, dpif_name, sizeof dpif_name)) { - printf("%s\n", dpif_name); + + 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); + } } - dpif_close(&dpif); } - svec_destroy(&all_dps); + svec_destroy(&dpif_names); + svec_destroy(&dpif_types); if (error) { exit(EXIT_FAILURE); } } static void -do_dump_flows(int argc UNUSED, char *argv[]) +do_dump_flows(int argc OVS_UNUSED, char *argv[]) { struct odp_flow *flows; - struct dpif dpif; + struct dpif *dpif; size_t n_flows; struct ds ds; size_t i; - run(dpif_open(argv[1], &dpif), "opening datapath"); - run(dpif_flow_list_all(&dpif, &flows, &n_flows), "listing all flows"); + 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++) { @@ -518,41 +473,40 @@ do_dump_flows(int argc UNUSED, char *argv[]) f->actions = actions; f->n_actions = MAX_ACTIONS; - dpif_flow_get(&dpif, f); - - ds_clear(&ds); - format_odp_flow(&ds, f); - printf("%s\n", ds_cstr(&ds)); + 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); + dpif_close(dpif); } static void -do_del_flows(int argc UNUSED, char *argv[]) +do_del_flows(int argc OVS_UNUSED, char *argv[]) { - struct dpif dpif; + struct dpif *dpif; - run(dpif_open(argv[1], &dpif), "opening datapath"); - run(dpif_flow_flush(&dpif), "deleting all flows"); - dpif_close(&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_dump_groups(int argc UNUSED, char *argv[]) +do_dump_groups(int argc OVS_UNUSED, char *argv[]) { struct odp_stats stats; - struct dpif dpif; + struct dpif *dpif; unsigned int i; - run(dpif_open(argv[1], &dpif), "opening datapath"); - run(dpif_get_dp_stats(&dpif, &stats), "get datapath stats"); + run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); + run(dpif_get_dp_stats(dpif, &stats), "get datapath stats"); for (i = 0; i < stats.max_groups; i++) { - uint16_t ports[UINT16_MAX]; + uint16_t *ports; size_t n_ports; - if (!dpif_port_group_get(&dpif, i, ports, - ARRAY_SIZE(ports), &n_ports) && n_ports) { + if (!dpif_port_group_get(dpif, i, &ports, &n_ports) && n_ports) { size_t j; printf("group %u:", i); @@ -561,17 +515,18 @@ do_dump_groups(int argc UNUSED, char *argv[]) } printf("\n"); } + free(ports); } - dpif_close(&dpif); + dpif_close(dpif); } static void -do_help(int argc UNUSED, char *argv[] UNUSED) +do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { usage(); } -static struct command all_commands[] = { +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 },