From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id BCA8AA00E6 for ; Thu, 16 May 2019 20:05:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8619F199AD; Thu, 16 May 2019 20:04:46 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id 82ED8D19B for ; Thu, 16 May 2019 20:04:41 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id y3so2023433plp.0 for ; Thu, 16 May 2019 11:04:41 -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=BYjakb7PAP91JdPTUe9cAmwAkDVj7D73o1Y9NuL3PYk=; b=NXGKDyPwcRnkneiuJ1FTrU0ElPaPg0MG81f/PsZrN/DPgeQS8uJpNDwhSUYd7kxuFW Gg2bKBqSed/je+h3VkJLnznzDOTMJFJcqm+ZcXkfoLYaUEnXWs8QBX3/2EvwrDifiU+L YechXeDi8WEweC/CEbRmXc9fKtX9DHerfWAAnDeWpEzLMmZ2JZyMM7vn1Yn0HYnnT9D4 vUQLHmcWm93XA94focnceuFOZg7U0XNnSAqwmfInuHTGlavuimr+wU5C3O/mUjRSw2xl TYHbSgvcfBOjZQxQyn0xDWviF1xUnpD7j88gyCW+x1KgQ9wAQ+ZWBHBForWKZTHVOenF +XIQ== 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=BYjakb7PAP91JdPTUe9cAmwAkDVj7D73o1Y9NuL3PYk=; b=AqiMAoccFXOlMfxsoV95WS2yQUBAORd+Fuo70aNl1ZuwVyz9ikbFBAv6Al9ZR8JkK9 xAby0wuxbWd6pYG8Kdk/yYpbeLKj0krcdme65Aaar/xiB/6TX0joMzBSMBfH2L1QsEp6 1BmcOam0lb5KEFqhLGNyRsMGPC/+45TKwcCiGZYQ2SFA9Tzjy463/Z6dKXBfP433Px1/ wVO6Ia+XCws2bPFkNReb7fI9EMUSs/7Hd01fWvvc54AFVaoxRz/3C4DWVldub550W2G5 CYK9kKj26eM2pxyE7PMff7jRUNuy+ww67Un9HMDGUYFUEgPLLdleWnh1CQ8CMlMfbdIA OLaA== X-Gm-Message-State: APjAAAXY/WnBwznyGezMphzF+pRwzNGV9F75piNNbS49gPEddr0CB3xa SUhKRmbZ3+N3mnC8ZWnaKdGrjGXOeys= X-Google-Smtp-Source: APXvYqxHQBqHPafLoobq/AGlyH5fFQL9BToZqY1OdCxTpRec/pLMv5Tjfqls2I8ijxQ/xRLvbV1u7g== X-Received: by 2002:a17:902:868e:: with SMTP id g14mr52949264plo.183.1558029880487; Thu, 16 May 2019 11:04:40 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id d67sm9376657pfa.35.2019.05.16.11.04.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 May 2019 11:04:39 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 16 May 2019 11:04:24 -0700 Message-Id: <20190516180427.17270-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190516180427.17270-1-stephen@networkplumber.org> References: <20190516180427.17270-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 4/7] ether: add eth_unformat_addr 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" Make a function that coresponds with eth_aton_r which can be used to convert string to ether_addr. This also allows rte_ethdev to no longer depend on the cmdline library. Signed-off-by: Stephen Hemminger --- lib/librte_net/rte_ether.c | 47 ++++++++++++++++++++++++++++++ lib/librte_net/rte_ether.h | 14 +++++++++ lib/librte_net/rte_net_version.map | 2 +- 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c index d4b41f122a16..12d9af58b5c3 100644 --- a/lib/librte_net/rte_ether.c +++ b/lib/librte_net/rte_ether.c @@ -27,3 +27,50 @@ ether_format_addr(char *buf, uint16_t size, eth_addr->addr_bytes[4], eth_addr->addr_bytes[5]); } + +/* + * Like ether_aton_r but can handle either + * XX:XX:XX:XX:XX:XX or XXXX:XXXX:XXXX + */ +int +ether_unformat_addr(const char *s, struct ether_addr *ea) +{ + unsigned int o0, o1, o2, o3, o4, o5; + int n; + + n = sscanf(s, "%x:%x:%x:%x:%x:%x", + &o0, &o1, &o2, &o3, &o4, &o5); + + if (n == 6) { + if (o0 > UINT8_MAX || o1 > UINT8_MAX || o2 > UINT8_MAX || + o3 > UINT8_MAX || o4 > UINT8_MAX || o5 > UINT8_MAX) + return -1; + + ea->addr_bytes[0] = o0; + ea->addr_bytes[1] = o1; + ea->addr_bytes[2] = o2; + ea->addr_bytes[3] = o3; + ea->addr_bytes[4] = o4; + ea->addr_bytes[5] = o5; + + return 0; + } + + /* Support the format XXXX:XXXX:XXXX */ + n = sscanf(s, "%x:%x:%x", &o0, &o1, &o2); + if (n == 3) { + if (o0 > UINT16_MAX || o1 > UINT16_MAX || o2 > UINT16_MAX) + return -1; + + ea->addr_bytes[0] = o0 >> 8; + ea->addr_bytes[1] = o0 & 0xff; + ea->addr_bytes[2] = o1 >> 8; + ea->addr_bytes[3] = o1 & 0xff; + ea->addr_bytes[4] = o2 >> 8; + ea->addr_bytes[5] = o2 & 0xff; + return 0; + } + /* unknown format */ + + return -1; +} diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index ed178a1f1736..0fa4481d266b 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -249,6 +249,20 @@ void ether_format_addr(char *buf, uint16_t size, const struct ether_addr *eth_addr); +/** + * Convert string with Ethernet address to an ether_addr. + * + * @param str + * A pointer to buffer contains the formatted MAC address. + * @param eth_addr + * A pointer to a ether_addr structure. + * @return + * 0 if successful + * -1 and sets rte_errno if invalid string + */ +int __rte_experimental +ether_unformat_addr(const char *str, struct ether_addr *eth_addr); + /** * Ethernet header: Contains the destination address, source address * and frame type. diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/rte_net_version.map index 49d34093781c..41d6a5943515 100644 --- a/lib/librte_net/rte_net_version.map +++ b/lib/librte_net/rte_net_version.map @@ -20,10 +20,10 @@ DPDK_19.08 { eth_format_addr; } DPDK_17.05; - EXPERIMENTAL { global: rte_net_make_rarp_packet; rte_net_skip_ip6_ext; + eth_unformat_addr; }; -- 2.20.1