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 7DCD7A0487 for ; Fri, 5 Jul 2019 16:25:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 74DFF1B957; Fri, 5 Jul 2019 16:25:05 +0200 (CEST) Received: from mail.droids-corp.org (zoll.droids-corp.org [94.23.50.67]) by dpdk.org (Postfix) with ESMTP id 1C509374C for ; Fri, 5 Jul 2019 16:25:04 +0200 (CEST) Received: from lfbn-lil-1-176-160.w90-45.abo.wanadoo.fr ([90.45.26.160] helo=droids-corp.org) by mail.droids-corp.org with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hjPC5-0004ym-AF; Fri, 05 Jul 2019 16:28:10 +0200 Received: by droids-corp.org (sSMTP sendmail emulation); Fri, 05 Jul 2019 16:25:01 +0200 Date: Fri, 5 Jul 2019 16:25:01 +0200 From: Olivier Matz To: Stephen Hemminger Cc: dev@dpdk.org, Andrew Rybchenko Message-ID: <20190705142501.mocddjav4tz3ytvf@platinum> References: <20190516180427.17270-1-stephen@networkplumber.org> <20190702221247.28391-1-stephen@networkplumber.org> <20190702221247.28391-3-stephen@networkplumber.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190702221247.28391-3-stephen@networkplumber.org> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [dpdk-dev] [PATCH v7 02/12] net/ether: add function to convert string to ethernet address 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" Hi, On Tue, Jul 02, 2019 at 03:12:37PM -0700, Stephen Hemminger wrote: > Make a function that can be used in place of eth_aton_r > to convert a string to rte_ether_addr. This function > allows both byte (xx:xx:xx:xx:xx:xx) and word (XXXX:XXXX:XXXX) > format and has the same lack of error handling as the original. > > This also allows ethdev to no longer have a hard dependency > on the cmdline library. > > Signed-off-by: Stephen Hemminger > Reviewed-by: Andrew Rybchenko > --- > lib/librte_net/rte_ether.c | 47 ++++++++++++++++++++++++++++++ > lib/librte_net/rte_ether.h | 14 +++++++++ > lib/librte_net/rte_net_version.map | 1 + > 3 files changed, 62 insertions(+) > > diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c > index 974fe815b335..acc8a0e938c5 100644 > --- a/lib/librte_net/rte_ether.c > +++ b/lib/librte_net/rte_ether.c > @@ -27,3 +27,50 @@ rte_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 > +rte_ether_unformat_addr(const char *s, struct rte_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 3caae0d98f6d..8edc7e217b25 100644 > --- a/lib/librte_net/rte_ether.h > +++ b/lib/librte_net/rte_ether.h > @@ -250,6 +250,20 @@ static inline void rte_ether_addr_copy(const struct rte_ether_addr *ea_from, > void > rte_ether_format_addr(char *buf, uint16_t size, > const struct rte_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 Is rte_errno really set? > + */ > +int __rte_experimental > +rte_ether_unformat_addr(const char *str, struct rte_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 f1e1b84ab491..f4c915069d57 100644 > --- a/lib/librte_net/rte_net_version.map > +++ b/lib/librte_net/rte_net_version.map > @@ -25,4 +25,5 @@ EXPERIMENTAL { > > rte_net_make_rarp_packet; > rte_net_skip_ip6_ext; > + rte_ether_unformat_addr; > }; > -- > 2.20.1 >