app/testpmd: fix MAC endian in flow command

MAC addresses are implicitly handled in network order since they are
actually byte strings, however this is not properly enforced with MAC masks
provided as prefix lengths, which end up inverted on little endian
systems.

Fixes: 6df81b325fa4 ("app/testpmd: add items eth/vlan to flow command")
Cc: stable@dpdk.org
Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index e952c91a3c36d9907a55ad0b52cd772fbf68731d..0fd69f90cf2566b1285aaedf9712c159686ff1a9 100644 (file)
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -1057,13 +1057,13 @@ static const struct token token_list[] = {
                .name = "dst",
                .help = "destination MAC",
                .next = NEXT(item_eth, NEXT_ENTRY(MAC_ADDR), item_param),
-               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_eth, dst)),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_eth, dst)),
        },
        [ITEM_ETH_SRC] = {
                .name = "src",
                .help = "source MAC",
                .next = NEXT(item_eth, NEXT_ENTRY(MAC_ADDR), item_param),
-               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_eth, src)),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_eth, src)),
        },
        [ITEM_ETH_TYPE] = {
                .name = "type",
@@ -2238,6 +2238,9 @@ parse_mac_addr(struct context *ctx, const struct token *token,
        /* Bit-mask fill is not supported. */
        if (arg->mask || size != sizeof(tmp))
                goto error;
+       /* Only network endian is supported. */
+       if (!arg->hton)
+               goto error;
        ret = cmdline_parse_etheraddr(NULL, str, &tmp, size);
        if (ret < 0 || (unsigned int)ret != len)
                goto error;