From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9D51FA00E6 for ; Mon, 8 Jul 2019 20:27:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A66911BDF1; Mon, 8 Jul 2019 20:26:43 +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 1B63B1B9D9 for ; Mon, 8 Jul 2019 20:26:31 +0200 (CEST) Received: by mail-pl1-f195.google.com with SMTP id k8so8708712plt.3 for ; Mon, 08 Jul 2019 11:26:31 -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=uxofA1fH5LVJFFkYn2rPgtgSS2+9oXHF6cRk13/XoEA=; b=J8RM97GiM8SSnbA5GaPsvdXNtQBOjwT0EUTBYmOuIqrh8RefOgydtN3ZXn7Ow0VKi1 lyTWF5mlW0i01Jg+rciJCJsP5CziM//YiT/lYw6CWYt9ko8cBeVQ6fMf1G409zk4fUbQ eR1UWm6ESMA5zxoCqxcNmVxxQNPnnEij1IXjvEUp/4bHsbzymgwmCxfIHS+2PVYHNkNP GGDLhfijkEmO8ZDolKlxImNIUtRxs4WjE4/uS8RwnzCbtMqsP2VPVFhJYiu9PZQOTh5V TcZFKRN2TSKBoETl4y064nHs6V650hHfWp3JRYbl/eeAzvZA0+pLno8RBq4A5GbOuJne K4cQ== 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=uxofA1fH5LVJFFkYn2rPgtgSS2+9oXHF6cRk13/XoEA=; b=dp6lLuyb/SuAyLMg1geQQfdguBlFKlDlhwRnpyZ3/MKcV1cu8O9kfP7tY4/HqZ0EDq ytnNDaNXPI71TqKuh6K80tU2vRxtdvAZveENIiUkpigs3x/LX001b7sRGYNC0Acf5Wz/ 64bV4ma7D+Vyz5ZJQ0YMTEbeHycAfp3fdT/jXJIM4XsQih5m+IYXwwrYRPT8O1Plp47m 6DFVwDfKGQ0TZU0z6IbuUJVrSSgSbykEvC8ybCqKGdPrfitYKBVzeCv/vcB0qBRIPYDx WNf3gIxfRXFNF+/Np99To+JCiC9Os+jowaMVobvWWIYzracdOH4S6QYHMgRGStI0E+C6 P3kw== X-Gm-Message-State: APjAAAVr47t5fVk+lylkONg1onBzs5DWY5pQNcrnBFI4eLhEQCGrCViE 8l46+j/Spxmgme4yJkLGdXoHo1XwId8= X-Google-Smtp-Source: APXvYqx1j4LhpewS+blZEK+VyKwtEOyNvfDTvuyx0CU3H6HI3WngNaj65JcEBKJfmXctXhr/9atnFA== X-Received: by 2002:a17:902:f216:: with SMTP id gn22mr26173599plb.118.1562610390107; Mon, 08 Jul 2019 11:26:30 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id o15sm18769295pgj.18.2019.07.08.11.26.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 11:26:29 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Bernard Iremonger Date: Mon, 8 Jul 2019 11:26:10 -0700 Message-Id: <20190708182614.1677-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190708182614.1677-1-stephen@networkplumber.org> References: <20190516180427.17270-1-stephen@networkplumber.org> <20190708182614.1677-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v9 07/11] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Acked-by: Bernard Iremonger --- 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 e3e8448c9421..c92c748b18eb 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include "testpmd.h" @@ -4734,8 +4733,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 #endif #include -#include #include #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 #include #include -#ifdef RTE_LIBRTE_CMDLINE -#include -#include -#endif #ifdef RTE_LIBRTE_PMD_BOND #include #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