From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 33607426B2; Tue, 3 Oct 2023 22:29:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7267940A6C; Tue, 3 Oct 2023 22:29:24 +0200 (CEST) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mails.dpdk.org (Postfix) with ESMTP id B5B0F402E1 for ; Tue, 3 Oct 2023 22:29:22 +0200 (CEST) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1c328b53aeaso10854055ad.2 for ; Tue, 03 Oct 2023 13:29:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1696364961; x=1696969761; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sP6/bW96ydkOqViq+9pHtcGmfDIQkWN1rR8Kg+2Xby4=; b=Ep9LYFMTA6dJ4WJbreIE2kFSYMbAEQg6j2HmrGQW7kpnKoCB21GCYCsR2Oc18+vKmO gBj9D1FgOBEqkNlUAx8rZ800aI2sIjhsFCmI5uekIcwzEeXXp6XMGTLYxOxHZtOQ3uYh ITKLOCrmSYM8Rbb3i781yWlpJoXPifN09ezjDu3QUJ21ycaDrrf4ClzDuc4kJY76fCaY +tWi3AJYvUPHYIu/UiTxvOXHT+JaWf+mtyGocb/kdDkMB9OBLV1/Hl0+3gQq4FbexYIm NnpjC4NUXDzFsiSc3my/YL91VOeErl/NCoxRW6Uf+tB1qLHqaFvKpVxTMoiJRUxTBlE5 1u5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696364961; x=1696969761; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sP6/bW96ydkOqViq+9pHtcGmfDIQkWN1rR8Kg+2Xby4=; b=hWqHQZmHkLSoK2M+r/KK3Frg+l3hZeO/J+Zz+dfipuNJmhnpZacGG/DWW3U5JgwJ3d wHpPEwE7pAqxfSmoTqiv06qpkKDyayFNEAPOw5SnewZEw1qlLX7fOzpWVRJEQ297/n1G Y9h5p7/+agbQemaFy+aKk1qOGsdyjpbrSDbd7yBJRN9DKy+xcIkGyK5nhuhod153QsJl xf8M+TF7+KeJWGd/WKuqNFsrpinh6G3Mtjc9ipTBumwc104YzeMI+MtYVDXKfwKADUck TcGiam5fmFp9KB1syom9/jMYg7bZutjlfSTrDhm0JFziefm7uXdmX0r6c9kldzwf6eoe WqsQ== X-Gm-Message-State: AOJu0YzIXY2IMKc4ITtEn7sVrwlIEh8c6mFrLDIVR+zEs6btXSe+0jH/ wv9FhdFiJB/S5pYPRmN4w4klDb7PAV+Rx/0dgYE= X-Google-Smtp-Source: AGHT+IFdeXzSo7oQzD89RwMc0kzx0dLvUnmTj/tG9lhh9cWRDjAHM1KTYQvXd2Qrw/6XdOIxaPsZOA== X-Received: by 2002:a17:902:c412:b0:1bd:aeb3:9504 with SMTP id k18-20020a170902c41200b001bdaeb39504mr925193plk.15.1696364961536; Tue, 03 Oct 2023 13:29:21 -0700 (PDT) Received: from hermes.local (204-195-126-68.wavecable.com. [204.195.126.68]) by smtp.gmail.com with ESMTPSA id a11-20020a1709027d8b00b001c5f62a639asm2014138plm.196.2023.10.03.13.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 13:29:21 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Olivier Matz Subject: [PATCH v3 2/4] rte_ether_unformat: accept more inputs Date: Tue, 3 Oct 2023 13:29:07 -0700 Message-Id: <20231003202909.391330-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003202909.391330-1-stephen@networkplumber.org> References: <20230929163611.62691-1-stephen@networkplumber.org> <20231003202909.391330-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This updates rte_ether_addr_unformat() to accept more types formats for MAC address. It allows IEEE, IETF and Cisco formats. Leading zeros are allowed for byte formats. Acked-by: Morten Brørup Signed-off-by: Stephen Hemminger --- lib/net/rte_ether.c | 85 ++++++++++++++++++++++++++++++++++----------- lib/net/rte_ether.h | 10 ++++-- 2 files changed, 73 insertions(+), 22 deletions(-) diff --git a/lib/net/rte_ether.c b/lib/net/rte_ether.c index 66d9a9d0699a..f59c20289d37 100644 --- a/lib/net/rte_ether.c +++ b/lib/net/rte_ether.c @@ -38,7 +38,8 @@ static int8_t get_xdigit(char ch) } /* Convert 00:11:22:33:44:55 to ethernet address */ -static bool get_ether_addr6(const char *s0, struct rte_ether_addr *ea) +static bool get_ether_addr6(const char *s0, struct rte_ether_addr *ea, + const char sep) { const char *s = s0; int i; @@ -48,25 +49,29 @@ static bool get_ether_addr6(const char *s0, struct rte_ether_addr *ea) x = get_xdigit(*s++); if (x < 0) - return false; + return false; /* not a hex digit */ - ea->addr_bytes[i] = x << 4; - x = get_xdigit(*s++); - if (x < 0) - return false; - ea->addr_bytes[i] |= x; + ea->addr_bytes[i] = x; + if (*s != sep && *s != '\0') { + x = get_xdigit(*s++); + if (x < 0) + return false; /* not a hex digit */ + ea->addr_bytes[i] <<= 4; + ea->addr_bytes[i] |= x; + } if (i < RTE_ETHER_ADDR_LEN - 1 && - *s++ != ':') - return false; + *s++ != sep) + return false; /* premature end of string */ } - /* return true if at end of string */ + /* return true if no trailing characters */ return *s == '\0'; } /* Convert 0011:2233:4455 to ethernet address */ -static bool get_ether_addr3(const char *s, struct rte_ether_addr *ea) +static bool get_ether_addr3(const char *s, struct rte_ether_addr *ea, + const char sep) { int i, j; @@ -78,14 +83,15 @@ static bool get_ether_addr3(const char *s, struct rte_ether_addr *ea) x = get_xdigit(*s++); if (x < 0) - return false; + return false; /* not a hex digit */ w = (w << 4) | x; } + ea->addr_bytes[i] = w >> 8; ea->addr_bytes[i + 1] = w & 0xff; if (i < RTE_ETHER_ADDR_LEN - 2 && - *s++ != ':') + *s++ != sep) return false; } @@ -93,17 +99,56 @@ static bool get_ether_addr3(const char *s, struct rte_ether_addr *ea) } /* - * Like ether_aton_r but can handle either - * XX:XX:XX:XX:XX:XX or XXXX:XXXX:XXXX - * and is more restrictive. + * Scan input to see if separated by dash, colon or period + * Returns separator and number of matches + * If separators are mixed will return + */ +static unsigned int get_ether_sep(const char *s, char *sep) +{ + static const char separators[] = "-:."; + unsigned int count = 0; + const char *cp; + + cp = strpbrk(s, separators); + if (cp == NULL) + return 0; /* no separator found */ + + *sep = *cp; /* return the separator */ + do { + ++count; + /* find next instance of separator */ + cp = strchr(cp + 1, *sep); + } while (cp != NULL); + + return count; +} + +/* + * Be liberal in accepting a wide variety of notational formats + * for MAC address including: + * - Linux format six groups of hexadecimal digits separated by colon + * - Windows format six groups separated by hyphen + * - two groups hexadecimal digits */ int rte_ether_unformat_addr(const char *s, struct rte_ether_addr *ea) { - if (get_ether_addr6(s, ea)) - return 0; - if (get_ether_addr3(s, ea)) - return 0; + unsigned int count; + char sep = '\0'; + + count = get_ether_sep(s, &sep); + switch (count) { + case 5: /* i.e 01:23:45:67:89:AB */ + if (get_ether_addr6(s, ea, sep)) + return 0; + break; + case 2: /* i.e 0123.4567.89AB */ + if (get_ether_addr3(s, ea, sep)) + return 0; + break; + default: + break; + } rte_errno = EINVAL; return -1; diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h index b35c72c7b0e0..ce073ea818a2 100644 --- a/lib/net/rte_ether.h +++ b/lib/net/rte_ether.h @@ -254,9 +254,15 @@ rte_ether_format_addr(char *buf, uint16_t size, * * @param str * A pointer to buffer contains the formatted MAC address. - * The supported formats are: - * XX:XX:XX:XX:XX:XX or XXXX:XXXX:XXXX + * Accepts either byte or word format separated by colon, + * hyphen or period. + * + * The example formats are: + * XX:XX:XX:XX:XX:XX - Canonical form + * XX-XX-XX-XX-XX-XX - Windows and IEEE 802 + * XXXX.XXXX.XXXX - Cisco * where XX is a hex digit: 0-9, a-f, or A-F. + * In the byte format, leading zeros are optional. * @param eth_addr * A pointer to a ether_addr structure. * @return -- 2.39.2