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 C14CBA0096 for ; Wed, 5 Jun 2019 03:09:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 00EED1B993; Wed, 5 Jun 2019 03:09:03 +0200 (CEST) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id A5D8C1B957 for ; Wed, 5 Jun 2019 03:08:58 +0200 (CEST) Received: by mail-pg1-f196.google.com with SMTP id h2so8155446pgg.1 for ; Tue, 04 Jun 2019 18:08:58 -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=PxJUOCPDuUff114jaitEyK9dRnxfzfrX1nmhShGdxCw=; b=BQ/CaFRpL/qWgTo+a5HktEaqWH+Z6pX+vR/xZfvEUPK1cvX54MdG03qf/HYniEFrNk 6Q5Ax1ngLou/Evoc4iJ2Kq9lrzUWG+mBTHG3miy+3wKhsC8m02YwO/oMMjEsgPCYh/pT ewQpWOUJWKzSdk5Au/23sr6tt23QiFR4puIODr2IgOWUXVimATjeaFawmXRw5iLbvN9J WiL0Ow4uvXjKO5OqX+eGKVFUzNImuhI1oZSRI0naNjQp9u8pWZThX9uWMvuhXsfF5ygu 000Npyj7xZDgmXOgVNhvr5WY0fFjCN7dUdQAvcEt6mejnHJ55qoEy2H+q7lQrSGN+zi6 dfPg== 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=PxJUOCPDuUff114jaitEyK9dRnxfzfrX1nmhShGdxCw=; b=io/WckPMpzk3BUoFKlOyNsS8IUjyCO6mvTWszwUqFFKzIqPqwSJqFv50lfa8+l8PTv JohB9p9RR0S0t30+caXeU+h20XBWOaZNn+Lo4Df2nP8lLQZkDt/FHb1tpkoKX519qsgQ koogAkAJNFzpKz4HKKDBWNZOlD3qS7rIVrRG7BIV3s3AiaI6xNqGNqtr6YzSQKHACkV6 7DbhoC15usAhZNtg4XgzznT/AJ7abvK3xTMKBEvzeKj0yO5Om0f/W+gX1DIdNr5UjrrR 9Xh7057OOD4b+WwPE5twegbKV9EYvQvmhU/WecsTer/6hT46KFoyZ5eR/yKnkDcynGKw E9qw== X-Gm-Message-State: APjAAAVUGar/oElQw8/WHQaw+yvErNnXhk9hCXZNliFx+iQkH6LAN1a4 qPRpv0zSRAiigunta9uakNanKd848U4= X-Google-Smtp-Source: APXvYqzQxanuFGjsZXvJn2sXgoPCvDGzAg6h7s1MHXSq2How/M+rvcO9Hs1PVhjOf6EesrpxQUKRfw== X-Received: by 2002:a17:90a:25af:: with SMTP id k44mr26270051pje.122.1559696937480; Tue, 04 Jun 2019 18:08:57 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 12sm8645936pfi.60.2019.06.04.18.08.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 18:08:56 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 4 Jun 2019 18:08:48 -0700 Message-Id: <20190605010852.28395-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190605010852.28395-1-stephen@networkplumber.org> References: <20190516180427.17270-1-stephen@networkplumber.org> <20190605010852.28395-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 2/6] net/ether: add rte_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 rte_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 | 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 + */ +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 dae6e420cded..8776534b731d 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_eth_unformat_addr; }; -- 2.20.1