X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-dpctl.c;h=4fb02dda42ebdf95da39167fcccb846b7199eb1e;hb=0a37839c03307cc4cc726d27a7348c05d469c5eb;hp=a87a30514ef05fad20d12a7153154309b0d62b31;hpb=4e022ec09e14ac89add74c1b4b8e3ff3873edbf0;p=sliver-openvswitch.git diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c index a87a30514..4fb02dda4 100644 --- a/utilities/ovs-dpctl.c +++ b/utilities/ovs-dpctl.c @@ -49,8 +49,6 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(dpctl); - /* -s, --statistics: Print port/flow statistics? */ static bool print_statistics; @@ -60,13 +58,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 +72,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; } @@ -170,18 +165,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" @@ -590,13 +589,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 +607,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; } @@ -741,9 +740,12 @@ dpctl_dump_flows(int argc, char *argv[]) { const struct dpif_flow_stats *stats; const struct nlattr *actions; - struct dpif_flow_dump dump; + struct dpif_flow_dump flow_dump; const struct nlattr *key; const struct nlattr *mask; + struct dpif_port dpif_port; + struct dpif_port_dump port_dump; + struct hmap portno_names; size_t actions_len; struct dpif *dpif; size_t key_len; @@ -755,13 +757,19 @@ dpctl_dump_flows(int argc, char *argv[]) run(parsed_dpif_open(name, false, &dpif), "opening datapath"); free(name); + hmap_init(&portno_names); + DPIF_PORT_FOR_EACH (&dpif_port, &port_dump, dpif) { + odp_portno_names_set(&portno_names, dpif_port.port_no, dpif_port.name); + } + ds_init(&ds); - dpif_flow_dump_start(&dump, dpif); - while (dpif_flow_dump_next(&dump, &key, &key_len, + dpif_flow_dump_start(&flow_dump, dpif); + while (dpif_flow_dump_next(&flow_dump, &key, &key_len, &mask, &mask_len, &actions, &actions_len, &stats)) { ds_clear(&ds); - odp_flow_format(key, key_len, mask, mask_len, &ds); + odp_flow_format(key, key_len, mask, mask_len, &portno_names, &ds, + verbosity); ds_put_cstr(&ds, ", "); dpif_flow_stats_format(stats, &ds); @@ -769,7 +777,9 @@ dpctl_dump_flows(int argc, char *argv[]) format_odp_actions(&ds, actions, actions_len); printf("%s\n", ds_cstr(&ds)); } - dpif_flow_dump_done(&dump); + dpif_flow_dump_done(&flow_dump); + odp_portno_names_destroy(&portno_names); + hmap_destroy(&portno_names); ds_destroy(&ds); dpif_close(dpif); } @@ -780,25 +790,37 @@ dpctl_put_flow(int argc, char *argv[], enum dpif_flow_put_flags flags) const char *key_s = argv[argc - 2]; const char *actions_s = argv[argc - 1]; struct dpif_flow_stats stats; + struct dpif_port dpif_port; + struct dpif_port_dump port_dump; struct ofpbuf actions; struct ofpbuf key; struct ofpbuf mask; struct dpif *dpif; struct ds s; char *dp_name; + struct simap port_names; + + dp_name = argc == 4 ? xstrdup(argv[1]) : get_one_dp(); + run(parsed_dpif_open(dp_name, false, &dpif), "opening datapath"); + free(dp_name); + + + simap_init(&port_names); + DPIF_PORT_FOR_EACH (&dpif_port, &port_dump, dpif) { + simap_put(&port_names, dpif_port.name, odp_to_u32(dpif_port.port_no)); + } ds_init(&s); ofpbuf_init(&key, 0); ofpbuf_init(&mask, 0); - run(odp_flow_from_string(key_s, NULL, &key, &mask), "parsing flow key"); + run(odp_flow_from_string(key_s, &port_names, &key, &mask), + "parsing flow key"); + + simap_destroy(&port_names); ofpbuf_init(&actions, 0); run(odp_actions_from_string(actions_s, NULL, &actions), "parsing actions"); - 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, @@ -847,23 +869,32 @@ dpctl_del_flow(int argc, char *argv[]) { const char *key_s = argv[argc - 1]; struct dpif_flow_stats stats; + struct dpif_port dpif_port; + struct dpif_port_dump port_dump; struct ofpbuf key; struct ofpbuf mask; /* To be ignored. */ struct dpif *dpif; char *dp_name; + struct simap port_names; - ofpbuf_init(&key, 0); - 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); + simap_init(&port_names); + DPIF_PORT_FOR_EACH (&dpif_port, &port_dump, dpif) { + simap_put(&port_names, dpif_port.name, odp_to_u32(dpif_port.port_no)); + } + + ofpbuf_init(&key, 0); + ofpbuf_init(&mask, 0); + run(odp_flow_from_string(key_s, &port_names, &key, &mask), "parsing flow key"); + run(dpif_flow_del(dpif, key.data, key.size, print_statistics ? &stats : NULL), "deleting flow"); + simap_destroy(&port_names); ofpbuf_uninit(&key); ofpbuf_uninit(&mask); @@ -997,7 +1028,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)); } } @@ -1049,7 +1081,7 @@ dpctl_normalize_actions(int argc, char *argv[]) "odp_flow_key_from_string"); ds_clear(&s); - odp_flow_format(keybuf.data, keybuf.size, NULL, 0, &s); + odp_flow_format(keybuf.data, keybuf.size, NULL, 0, NULL, &s, verbosity); printf("input flow: %s\n", ds_cstr(&s)); run(odp_flow_key_to_flow(keybuf.data, keybuf.size, &flow), @@ -1060,6 +1092,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); @@ -1109,7 +1142,7 @@ dpctl_normalize_actions(int argc, char *argv[]) printf("no vlan: "); } - if (af->flow.mpls_depth) { + if (eth_type_mpls(af->flow.dl_type)) { printf("mpls(label=%"PRIu32",tc=%d,ttl=%d): ", mpls_lse_to_label(af->flow.mpls_lse), mpls_lse_to_tc(af->flow.mpls_lse), @@ -1146,3 +1179,8 @@ static const struct command all_commands[] = { { NULL, 0, 0, NULL }, }; + +static const struct command *get_all_commands(void) +{ + return all_commands; +}