From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id CEC19A0487
for <public@inbox.dpdk.org>; Wed, 3 Jul 2019 00:14:06 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 0A87A1BE37;
Wed, 3 Jul 2019 00:13:09 +0200 (CEST)
Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com
[209.85.214.195]) by dpdk.org (Postfix) with ESMTP id 363C91BE17
for <dev@dpdk.org>; Wed, 3 Jul 2019 00:13:03 +0200 (CEST)
Received: by mail-pl1-f195.google.com with SMTP id a93so29508pla.7
for <dev@dpdk.org>; Tue, 02 Jul 2019 15:13:03 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=xdUsjvA+XM/A8lvdK1H1mldU1CJ2JFzy3kElJGpilZc=;
b=1QdZXIwbgw8vnK4F88QuduR4/e9n5emu3AtzooOoFoz+/oWO8TM+Cz5J9vvBJDGKr0
pbGG2QElDISsTbvmUur+JOO5bvjKFdJnyBQRKOSNjVRCg88diNeO08J3rKRiPAU8C+04
kMM8MTk0K4LRUBUrGYrv9PjfQrCynyRRGT4CDlYi2kS5IyhG28f/mn8E69cbGmseMA0+
ABLuAAFN+3AIXvnrIrm3mcTDfUzeRMg/MlAIfzzMID9oL5VCEGY75plEk3pbBOP1cXZa
CRywmEaAX8GqqDSNHa9UDkbo4nigxzwwQinzhjgnlh1luotHUfRbtVewM6rtG8GfZiRC
X2uw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=xdUsjvA+XM/A8lvdK1H1mldU1CJ2JFzy3kElJGpilZc=;
b=f+K1cPjidi8Sm5GTzfZem/+wht6+kk1rnCh98ziR+4sxEe3sMWadczFBGXdPwNstjH
lMPvztmsM3MTZVUuc0kxDCiyoHPHG55xHoiev7Te2nDewzmvoUhPYTLJIa5TsrmM1kZV
gzSYn2SksDoDMWhTmSdLOLtHO5m/yj+3OgRh6EqrI4XlNapcaSrJxQO+mQ7zM73DHBGv
DzpR1lNMQL+utW6YWXTOzZFB/cxij3l4UXSqxIAPBBDXIK5x1rCWxCO4xBi/VsP0yj9P
7DuAJ+qYFfzhyuLM/e/8dPA3j5+V7EjCvPhn1qAHwurVhdXDgFq7MgOtNwZ7TLth3StX
TrUQ==
X-Gm-Message-State: APjAAAV2VISPqO6VcF/h08OvnVBgcO0XYtyCwzg++nkL4y3CvAzAsBLH
gultcFSwtSS2/4UnwHRWw7nHk8OLNPo=
X-Google-Smtp-Source: APXvYqzQylfKT2SLUbtTJOsWdANENRZdRYudWOiRVQtdFx+Pmk270LFx8jkuCwa3E++SoESmRzxkYw==
X-Received: by 2002:a17:902:583:: with SMTP id
f3mr37549953plf.137.1562105582120;
Tue, 02 Jul 2019 15:13:02 -0700 (PDT)
Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])
by smtp.gmail.com with ESMTPSA id q4sm25035pjq.27.2019.07.02.15.13.01
(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);
Tue, 02 Jul 2019 15:13:01 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 2 Jul 2019 15:12:43 -0700
Message-Id: <20190702221247.28391-9-stephen@networkplumber.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20190702221247.28391-1-stephen@networkplumber.org>
References: <20190516180427.17270-1-stephen@networkplumber.org>
<20190702221247.28391-1-stephen@networkplumber.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v7 08/12] app/testpmd: use new ethernet address
parser
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
The cmdline_parse_ether_addr does not need to be used everywhere
in testpmd. Can use rte_ether_unformat_addr instead.
As an added bonus it eliminates some code for copying.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
app/test-pmd/cmdline_flow.c | 5 ++---
app/test-pmd/config.c | 10 +++-------
app/test-pmd/parameters.c | 15 +++------------
3 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 201bd9de56e0..2b02ca29b7ac 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -18,7 +18,6 @@
#include <rte_ethdev.h>
#include <rte_byteorder.h>
#include <cmdline_parse.h>
-#include <cmdline_parse_etheraddr.h>
#include <rte_flow.h>
#include "testpmd.h"
@@ -4627,8 +4626,8 @@ parse_mac_addr(struct context *ctx, const struct token *token,
/* 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)
+ ret = rte_ether_unformat_addr(str, &tmp);
+ if (ret < 0)
goto error;
if (!ctx->object)
return len;
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index ab458c8d2837..1d804705d96c 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -49,7 +49,6 @@
#include <rte_pmd_bnxt.h>
#endif
#include <rte_gro.h>
-#include <cmdline_parse_etheraddr.h>
#include <rte_config.h>
#include "testpmd.h"
@@ -2278,19 +2277,16 @@ pkt_fwd_config_display(struct fwd_config *cfg)
void
set_fwd_eth_peer(portid_t port_id, char *peer_addr)
{
- uint8_t c, new_peer_addr[6];
+ struct rte_ether_addr new_peer_addr;
if (!rte_eth_dev_is_valid_port(port_id)) {
printf("Error: Invalid port number %i\n", port_id);
return;
}
- if (cmdline_parse_etheraddr(NULL, peer_addr, &new_peer_addr,
- sizeof(new_peer_addr)) < 0) {
+ if (rte_ether_unformat_addr(peer_addr, &new_peer_addr) < 0) {
printf("Error: Invalid ethernet address: %s\n", peer_addr);
return;
}
- for (c = 0; c < 6; c++)
- peer_eth_addrs[port_id].addr_bytes[c] =
- new_peer_addr[c];
+ peer_eth_addrs[port_id] = new_peer_addr;
}
int
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 245b610641ee..975a97807009 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -39,10 +39,6 @@
#include <rte_ether.h>
#include <rte_ethdev.h>
#include <rte_string_fns.h>
-#ifdef RTE_LIBRTE_CMDLINE
-#include <cmdline_parse.h>
-#include <cmdline_parse_etheraddr.h>
-#endif
#ifdef RTE_LIBRTE_PMD_BOND
#include <rte_eth_bond.h>
#endif
@@ -227,8 +223,7 @@ init_peer_eth_addrs(char *config_filename)
if (fgets(buf, sizeof(buf), config_file) == NULL)
break;
- if (cmdline_parse_etheraddr(NULL, buf, &peer_eth_addrs[i],
- sizeof(peer_eth_addrs[i])) < 0) {
+ if (rte_ether_unformat_addr(buf, &peer_eth_addrs[i]) < 0) {
printf("Bad MAC address format on line %d\n", i+1);
fclose(config_file);
return -1;
@@ -727,7 +722,6 @@ launch_args_parse(int argc, char** argv)
}
if (!strcmp(lgopts[opt_idx].name, "eth-peer")) {
char *port_end;
- uint8_t c, peer_addr[6];
errno = 0;
n = strtoul(optarg, &port_end, 10);
@@ -739,14 +733,11 @@ launch_args_parse(int argc, char** argv)
"eth-peer: port %d >= RTE_MAX_ETHPORTS(%d)\n",
n, RTE_MAX_ETHPORTS);
- if (cmdline_parse_etheraddr(NULL, port_end,
- &peer_addr, sizeof(peer_addr)) < 0)
+ if (rte_ether_unformat_addr(port_end,
+ &peer_eth_addrs[n]) < 0)
rte_exit(EXIT_FAILURE,
"Invalid ethernet address: %s\n",
port_end);
- for (c = 0; c < 6; c++)
- peer_eth_addrs[n].addr_bytes[c] =
- peer_addr[c];
nb_peer_eth_addrs++;
}
#endif
--
2.20.1