From 09a670e8716f57ad8fd26761bf8e8d8ff22b85c5 Mon Sep 17 00:00:00 2001 From: Adrien Mazarguil Date: Thu, 4 May 2017 19:08:23 +0200 Subject: [PATCH] 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 --- app/test-pmd/cmdline_flow.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index e952c91a3c..0fd69f90cf 100644 --- 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; -- 2.20.1