X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-dpctl.c;h=98b47b8d7d40c061d1deef465d7b28f47eef5bcd;hb=86c1d8dcc38489c9b04ec242a14f6ec64c81fb24;hp=3b6e6a5bd23272a2fc456fc4068a9a2f01fd943b;hpb=186afbfef9dcdd3d98529a21f47d42d9e1b6d677;p=sliver-openvswitch.git diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c index 3b6e6a5bd..98b47b8d7 100644 --- a/utilities/ovs-dpctl.c +++ b/utilities/ovs-dpctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,13 +60,10 @@ static bool zero_statistics; /* --may-create: Allow mod-flows command to create a new flow? */ static bool may_create; -/* -m, --more: Output verbosity. - * - * So far only undocumented commands honor this option, so we don't document - * the option itself. */ +/* -m, --more: Increase output verbosity. */ static int verbosity; -static const struct command all_commands[]; +static const struct command *get_all_commands(void); static void usage(void) NO_RETURN; static void parse_options(int argc, char *argv[]); @@ -77,7 +74,7 @@ main(int argc, char *argv[]) set_program_name(argv[0]); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); - run_command(argc - optind, argv + optind, all_commands); + run_command(argc - optind, argv + optind, get_all_commands()); return 0; } @@ -89,7 +86,7 @@ parse_options(int argc, char *argv[]) OPT_MAY_CREATE, VLOG_OPTION_ENUMS }; - static struct option long_options[] = { + 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}, @@ -170,18 +167,22 @@ usage(void) " 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" - " 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" - " del-flow DP FLOW delete FLOW from 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" + " 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", + "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("\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" @@ -214,7 +215,7 @@ static int if_up(const char *netdev_name) retval = netdev_open(netdev_name, "system", &netdev); if (!retval) { - retval = netdev_turn_flags_on(netdev, NETDEV_UP, true); + retval = netdev_turn_flags_on(netdev, NETDEV_UP, NULL); netdev_close(netdev); } return retval; @@ -308,7 +309,7 @@ dpctl_add_if(int argc OVS_UNUSED, char *argv[]) char *save_ptr = NULL; struct netdev *netdev = NULL; struct smap args; - uint32_t port_no = UINT32_MAX; + odp_port_t port_no = ODPP_NONE; char *option; int error; @@ -335,7 +336,7 @@ dpctl_add_if(int argc OVS_UNUSED, char *argv[]) if (!strcmp(key, "type")) { type = value; } else if (!strcmp(key, "port_no")) { - port_no = atoi(value); + port_no = u32_to_odp(atoi(value)); } else if (!smap_add_once(&args, key, value)) { ovs_error(0, "duplicate \"%s\" option", key); } @@ -388,7 +389,7 @@ dpctl_set_if(int argc, char *argv[]) char *type = NULL; const char *name; struct smap args; - uint32_t port_no; + odp_port_t port_no; char *option; int error; @@ -441,7 +442,7 @@ dpctl_set_if(int argc, char *argv[]) failure = true; } } else if (!strcmp(key, "port_no")) { - if (port_no != atoi(value)) { + if (port_no != u32_to_odp(atoi(value))) { ovs_error(0, "%s: can't change port number from " "%"PRIu32" to %d", name, port_no, atoi(value)); @@ -476,7 +477,7 @@ next: } static bool -get_port_number(struct dpif *dpif, const char *name, uint32_t *port) +get_port_number(struct dpif *dpif, const char *name, odp_port_t *port) { struct dpif_port dpif_port; @@ -500,11 +501,11 @@ dpctl_del_if(int argc OVS_UNUSED, char *argv[]) run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath"); for (i = 2; i < argc; i++) { const char *name = argv[i]; - uint32_t port; + odp_port_t port; int error; if (!name[strspn(name, "0123456789")]) { - port = atoi(name); + port = u32_to_odp(atoi(name)); } else if (!get_port_number(dpif, name, &port)) { failure = true; continue; @@ -590,13 +591,13 @@ show_dpif(struct dpif *dpif) free(nodes); } else { printf(", could not retrieve configuration (%s)", - strerror(error)); + ovs_strerror(error)); } smap_destroy(&config); netdev_close(netdev); } else { - printf(": open failed (%s)", strerror(error)); + printf(": open failed (%s)", ovs_strerror(error)); } putchar(')'); } @@ -608,12 +609,12 @@ show_dpif(struct dpif *dpif) error = netdev_open(dpif_port.name, dpif_port.type, &netdev); if (error) { - printf(", open failed (%s)", strerror(error)); + printf(", open failed (%s)", ovs_strerror(error)); continue; } error = netdev_get_stats(netdev, &s); if (error) { - printf(", could not retrieve stats (%s)", strerror(error)); + printf(", could not retrieve stats (%s)", ovs_strerror(error)); continue; } @@ -743,9 +744,11 @@ dpctl_dump_flows(int argc, char *argv[]) const struct nlattr *actions; struct dpif_flow_dump dump; const struct nlattr *key; + const struct nlattr *mask; size_t actions_len; struct dpif *dpif; size_t key_len; + size_t mask_len; struct ds ds; char *name; @@ -756,10 +759,12 @@ dpctl_dump_flows(int argc, char *argv[]) ds_init(&ds); dpif_flow_dump_start(&dump, dpif); while (dpif_flow_dump_next(&dump, &key, &key_len, + &mask, &mask_len, &actions, &actions_len, &stats)) { ds_clear(&ds); - odp_flow_key_format(key, key_len, &ds); + odp_flow_format(key, key_len, mask, mask_len, &ds, verbosity); ds_put_cstr(&ds, ", "); + dpif_flow_stats_format(stats, &ds); ds_put_cstr(&ds, ", actions:"); format_odp_actions(&ds, actions, actions_len); @@ -778,26 +783,32 @@ dpctl_put_flow(int argc, char *argv[], enum dpif_flow_put_flags flags) struct dpif_flow_stats stats; struct ofpbuf actions; struct ofpbuf key; + struct ofpbuf mask; struct dpif *dpif; + struct ds s; char *dp_name; + ds_init(&s); ofpbuf_init(&key, 0); - run(odp_flow_key_from_string(key_s, NULL, &key), "parsing flow key"); + ofpbuf_init(&mask, 0); + run(odp_flow_from_string(key_s, NULL, &key, &mask), "parsing flow key"); ofpbuf_init(&actions, 0); run(odp_actions_from_string(actions_s, NULL, &actions), "parsing actions"); - dp_name = argc == 3 ? xstrdup(argv[1]) : get_one_dp(); + dp_name = argc == 4 ? xstrdup(argv[1]) : get_one_dp(); run(parsed_dpif_open(dp_name, false, &dpif), "opening datapath"); free(dp_name); run(dpif_flow_put(dpif, flags, key.data, key.size, + mask.size == 0 ? NULL : mask.data, mask.size, actions.data, actions.size, print_statistics ? &stats : NULL), "updating flow table"); ofpbuf_uninit(&key); + ofpbuf_uninit(&mask); ofpbuf_uninit(&actions); if (print_statistics) { @@ -838,13 +849,15 @@ dpctl_del_flow(int argc, char *argv[]) const char *key_s = argv[argc - 1]; struct dpif_flow_stats stats; struct ofpbuf key; + struct ofpbuf mask; /* To be ignored. */ struct dpif *dpif; char *dp_name; ofpbuf_init(&key, 0); - run(odp_flow_key_from_string(key_s, NULL, &key), "parsing flow key"); + ofpbuf_init(&mask, 0); + run(odp_flow_from_string(key_s, NULL, &key, &mask), "parsing flow key"); - dp_name = argc == 2 ? xstrdup(argv[1]) : get_one_dp(); + dp_name = argc == 3 ? xstrdup(argv[1]) : get_one_dp(); run(parsed_dpif_open(dp_name, false, &dpif), "opening datapath"); free(dp_name); @@ -853,6 +866,7 @@ dpctl_del_flow(int argc, char *argv[]) print_statistics ? &stats : NULL), "deleting flow"); ofpbuf_uninit(&key); + ofpbuf_uninit(&mask); if (print_statistics) { struct ds s; @@ -984,7 +998,8 @@ sort_output_actions(struct nlattr *actions, size_t length) } if (first_output) { uint8_t *end = (uint8_t *) actions + length; - sort_output_actions__(first_output, (struct nlattr *) end); + sort_output_actions__(first_output, + ALIGNED_CAST(struct nlattr *, end)); } } @@ -1032,11 +1047,11 @@ dpctl_normalize_actions(int argc, char *argv[]) /* Parse flow key. */ ofpbuf_init(&keybuf, 0); - run(odp_flow_key_from_string(argv[1], &port_names, &keybuf), + run(odp_flow_from_string(argv[1], &port_names, &keybuf, NULL), "odp_flow_key_from_string"); ds_clear(&s); - odp_flow_key_format(keybuf.data, keybuf.size, &s); + odp_flow_format(keybuf.data, keybuf.size, NULL, 0, &s, verbosity); printf("input flow: %s\n", ds_cstr(&s)); run(odp_flow_key_to_flow(keybuf.data, keybuf.size, &flow), @@ -1047,6 +1062,7 @@ dpctl_normalize_actions(int argc, char *argv[]) ofpbuf_init(&odp_actions, 0); run(odp_actions_from_string(argv[2], &port_names, &odp_actions), "odp_actions_from_string"); + simap_destroy(&port_names); if (verbosity) { ds_clear(&s); @@ -1133,3 +1149,8 @@ static const struct command all_commands[] = { { NULL, 0, 0, NULL }, }; + +static const struct command *get_all_commands(void) +{ + return all_commands; +}