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 940ADA0487 for ; Fri, 5 Jul 2019 19:16:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AAB191BE22; Fri, 5 Jul 2019 19:16:41 +0200 (CEST) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by dpdk.org (Postfix) with ESMTP id BDD961BE17 for ; Fri, 5 Jul 2019 19:16:37 +0200 (CEST) Received: by mail-pg1-f173.google.com with SMTP id m4so4586092pgk.0 for ; Fri, 05 Jul 2019 10:16:37 -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=MeK+yID5ssi0NPFn+Lh/3/mX9Sd3TlIiRDH9K1yPHnY=; b=Y1zAOb8suMugKAouz99hkW6wuVHhiOxhQ8JKyiML5KiQfFiCSIM0b+mP/6L1dBYx0Q jqzbD9f9A2s7CFF0kHnhKz6wi8hY5n7eAFxGq3ubymPTZic/bKX1JwGRU03LL6iJYjP1 bxSRoWET9708UUeKdthbo2fCV0nUZkK8PvPsVfU8YClCclv1KjoOQwSKEJyDovKlK1Jk hAIl7k8NT9uenOYNzmuapXRIiURIlIRHqAGJCCE5FE0qHFyBpTCe2RP+O2ucat8iXhbm yHS07Ww6idw42v2xE4Ghui8ejay/FohwJBO77N1t6hDC9/blhiXwnnO8uYe1C3a8gm8x pGBQ== 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=MeK+yID5ssi0NPFn+Lh/3/mX9Sd3TlIiRDH9K1yPHnY=; b=HuTtW0/l394mVrh9giIIb7w4k8oK+P8gQHeAQVO92R8rkDCbLNPr189Nc2dqM8Z1xt dgoltPzOATDJ4eD+Zsor7pv5yUfOKZS/6xpeeaPgKWvO8s9qA6JzQkwzW1exz3EO8R9A JQzkRm8kVSRQS1t3boR6Ap7uFNg+/yMMkwj9JxsL6F4ivKfg/M4ghu36hwghfweEyhg4 bk9xlPwe4PNLTFJdDf6XJONRmSXaTohmpqBFgB08bO2XaY3xEh8qStXeN92VIaA8hc4R J+IjHYVeltguVQWYofCv9chRuJ3khvMzOOF+mMWGxrxZ3DN+JIKJG0K4+/FZLedS4Xl9 TvKg== X-Gm-Message-State: APjAAAWMD9MZoazj8G7GlP/SJVpuIEmuNcFlT7DhKjOBTc54QhmgOo1l v7IDery6FxAnU+9NotpV1nDTYUDbW6k= X-Google-Smtp-Source: APXvYqyEdA72rzsr4LsqdYA9MH2REPIQYlcbj9w69Jr06JzjqSvm5UWjB7BGtQxV56K4c2s1mD1x7w== X-Received: by 2002:a63:8f55:: with SMTP id r21mr6622057pgn.318.1562346996553; Fri, 05 Jul 2019 10:16:36 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 21sm8991014pjh.25.2019.07.05.10.16.35 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 05 Jul 2019 10:16:35 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Rybchenko Date: Fri, 5 Jul 2019 10:16:17 -0700 Message-Id: <20190705171626.13448-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190705171626.13448-1-stephen@networkplumber.org> References: <20190516180427.17270-1-stephen@networkplumber.org> <20190705171626.13448-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v8 02/11] 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" 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 | 49 ++++++++++++++++++++++++++++++ lib/librte_net/rte_ether.h | 14 +++++++++ lib/librte_net/rte_net_version.map | 1 + 3 files changed, 64 insertions(+) diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c index 974fe815b335..8d040173cfc6 100644 --- a/lib/librte_net/rte_ether.c +++ b/lib/librte_net/rte_ether.c @@ -3,6 +3,7 @@ */ #include +#include void rte_eth_random_addr(uint8_t *addr) @@ -27,3 +28,51 @@ 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) { + /* Standard format XX:XX:XX:XX:XX:XX */ + if (o0 > UINT8_MAX || o1 > UINT8_MAX || o2 > UINT8_MAX || + o3 > UINT8_MAX || o4 > UINT8_MAX || o5 > UINT8_MAX) { + rte_errno = ERANGE; + 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; + } else if (n == 3) { + /* Support the format XXXX:XXXX:XXXX */ + if (o0 > UINT16_MAX || o1 > UINT16_MAX || o2 > UINT16_MAX) { + rte_errno = ERANGE; + 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; + } else { + /* unknown format */ + rte_errno = EINVAL; + return -1; + } + return 0; +} diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index df1a51462a37..77b4569b1ad4 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 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