From patchwork Mon Oct 2 18:37:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 132267 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 73515426A5; Mon, 2 Oct 2023 20:37:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D4BD402DB; Mon, 2 Oct 2023 20:37:45 +0200 (CEST) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mails.dpdk.org (Postfix) with ESMTP id 2822840294 for ; Mon, 2 Oct 2023 20:37:43 +0200 (CEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1c737d61a00so826635ad.3 for ; Mon, 02 Oct 2023 11:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1696271862; x=1696876662; 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=IBNHHv5J5if2zN/gmjlGq0NY5Upn+ZeyxK9edcmwPuo=; b=YB8LgHlB0jV0QA0uVkoEQqCi7E0OVECJi/R5gh7I+mKjfbkPncLrtdUm7Bpd/Sxf6H P97L80J5Dr6aRXLRWo8pcgc8mSWp0juQVsHXg/Q/CkuROjA8hUdZEQa35faO4hMkMucA I3CK+lRhzP9yM5H5EiUVIQ/1TYdtFvS4hKKZVtoqYRuDt75d24Za6eljatjX/zj02hTq 4xnw9dzVF7sfCRqHGfIiWWvmzm3+pCoZici+nqFTny/c2vHQ/bjq7WnbSrbItEdD5KZm fFyg6Yor4Qr/+64TKrMApz5EwB6OwXbgAFQggFCi7e1RnBMcAzmQXl3ARDcuerVMSYrx 37mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696271862; x=1696876662; 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=IBNHHv5J5if2zN/gmjlGq0NY5Upn+ZeyxK9edcmwPuo=; b=LHvy6QXY3cX632MpBQrzJEAy9/4hqBNUvvVWZ88IDYKrVGTdq82p0G0gqvuk66qb4z 24hmbTrvGbfbskMBXYmJk0q8mWstsZHR+DIP01W1kQJ/aKNX4xiyLEJJ7Nd74Blt+wJn fKvlXdlRrwWN1T76ORcKKwRQ7PAizHwwzkIG3n38eJtR0h5KbabATUBwa3sHKdJqxZcg m2SShJakX9GaAMJrK8ij5CNw2Hzoh6+3jL1ERNrzRU2nVuTPFXcnCUdewPw5Z85lkGwk YjCgJVgmledZleO8DbCcgnfIRmkP8WgPET97FxkxCyo3NGGHC8TTaZavzlsgDCOWdscZ 30hA== X-Gm-Message-State: AOJu0YzYFL0JKOz/bw5mFi/B5VNrvihVoM+RUvVAXv8AMlAHZ1bj7vES SUiQ0Dx7Ez+wG5zVwZJrrMM81nMHLHXGu8UDti0= X-Google-Smtp-Source: AGHT+IEA7W82fnDgMwf6n5qNuZwI+NWajeOjfp4HGT06Om412GDO7uVC7BBFq9t7ePNXksCMZkfREg== X-Received: by 2002:a17:903:22cd:b0:1c6:2dbb:e5f4 with SMTP id y13-20020a17090322cd00b001c62dbbe5f4mr13783943plg.26.1696271862069; Mon, 02 Oct 2023 11:37:42 -0700 (PDT) Received: from hermes.local (204-195-126-68.wavecable.com. [204.195.126.68]) by smtp.gmail.com with ESMTPSA id iz7-20020a170902ef8700b001b9f7bc3e77sm12546595plb.189.2023.10.02.11.37.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 11:37:41 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v2 1/3] test: remove some strings from cmdline_etheraddr tests Date: Mon, 2 Oct 2023 11:37:28 -0700 Message-Id: <20231002183730.301163-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231002183730.301163-1-stephen@networkplumber.org> References: <20230929163611.62691-1-stephen@networkplumber.org> <20231002183730.301163-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Some of the ethernet address formats which were invalid will now become valid inputs when rte_ether_unformat_addr is modified to allow leading zeros. Also, make local variables static. Signed-off-by: Stephen Hemminger --- app/test/test_cmdline_etheraddr.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/test/test_cmdline_etheraddr.c b/app/test/test_cmdline_etheraddr.c index 9691c32ba250..166c5716ba9b 100644 --- a/app/test/test_cmdline_etheraddr.c +++ b/app/test/test_cmdline_etheraddr.c @@ -20,7 +20,7 @@ struct ether_addr_str { }; /* valid strings */ -const struct ether_addr_str ether_addr_valid_strs[] = { +static const struct ether_addr_str ether_addr_valid_strs[] = { {"01:23:45:67:89:AB", 0xAB8967452301ULL}, {"4567:89AB:CDEF", 0xEFCDAB896745ULL}, }; @@ -30,7 +30,7 @@ const struct ether_addr_str ether_addr_valid_strs[] = { * end of token, which is either space chars, null char or * a hash sign. */ -const char * ether_addr_garbage_strs[] = { +static const char * const ether_addr_garbage_strs[] = { "00:11:22:33:44:55\0garbage", "00:11:22:33:44:55#garbage", "00:11:22:33:44:55 garbage", @@ -46,14 +46,13 @@ const char * ether_addr_garbage_strs[] = { #define GARBAGE_ETHERADDR 0x554433221100ULL /* corresponding address */ -const char * ether_addr_invalid_strs[] = { +static const char * const ether_addr_invalid_strs[] = { /* valid chars, invalid syntax */ "0123:45:67:89:AB", "01:23:4567:89:AB", "01:23:45:67:89AB", "012:345:678:9AB", "01:23:45:67:89:ABC", - "01:23:45:67:89:A", "01:23:45:67:89", "01:23:45:67:89:AB:CD", /* invalid chars, valid syntax */ @@ -61,10 +60,8 @@ const char * ether_addr_invalid_strs[] = { "INVA:LIDC:HARS", /* misc */ "01 23 45 67 89 AB", - "01.23.45.67.89.AB", "01,23,45,67,89,AB", - "01:23:45\0:67:89:AB", - "01:23:45#:67:89:AB", + "01:23:45:67#:89:AB", "random invalid text", "random text", "", From patchwork Mon Oct 2 18:37:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 132268 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6E5B4426A5; Mon, 2 Oct 2023 20:37:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 59392402E6; Mon, 2 Oct 2023 20:37:46 +0200 (CEST) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mails.dpdk.org (Postfix) with ESMTP id 0BC5E40262 for ; Mon, 2 Oct 2023 20:37:44 +0200 (CEST) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1c60a514f3aso821125ad.3 for ; Mon, 02 Oct 2023 11:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1696271863; x=1696876663; 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=QgzAUgb634wFXn1aAuxin4P9Z47Vd+GEEggy/N4IhWE=; b=jfbgTg/iA4FPfJVNi+fP1OQi7E1drPCFWfYIquDvclM78NX2hG0o+v/ICcJy6mE+04 oxbMLXK8bPmSIxJ+hQpMucp42A2F+2sJw4Y/tWgzRs6P/C91KO/RbdSGsgvvqeJz22Xo JzUCIF6dvSIOVGu+pP+ZLxuXmIMegMit85G9/oOcxkWJ/DX0qR7US2gopkF9AftvdSF7 oo8o6iEApn91tNb/NdVjcozYj3QlbH3/BFwUfGRd7Ogq6OX4RCuEi4JbiCbfOhPN5cL7 w7Nw7CmAsCd3tpmvRUEAaeNyEQPWoOeccdd2HaLhoS3SF8zV58D2bxLCFSMEB0q7bJEd Xs9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696271863; x=1696876663; 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=QgzAUgb634wFXn1aAuxin4P9Z47Vd+GEEggy/N4IhWE=; b=sNw+iA0Jnf+QvDsmF1Y0MShNReVzdzlpL8+mOstdjYcshQTIGOO4bW1gPMMxHfjaLE aYTXqNJm5tQEejh23BeWWFp6DssvLToY55LbeJAy0zxtIB49LHugI8CmUjvrn5vgDkF3 fAKJE4+0vbbXL3DKDf8qKsffhHV6CbFrEXaO96AvG0lVX9O6sz4cq890H+q+MjRJTkjR x8BvgHjpWKXMUvwWW6VJA3+bRjPKTY8waFcQmHfgxQ0m/gIbMU0kxF15BWD8SNMs8/AA PHXXckSGzV03lKIPB5pxBracMxoAATvXsV7Y/LiT895hbnD66Hf3B/4Q3gBxKDgwhgfo Nbiw== X-Gm-Message-State: AOJu0YwqH2HSyAz0cGPIqoevbyQdW+TFcLruThkXXYXSA1DlEwB3o/P9 oHHBoe9rwQvVJ+TIxTZQ/hSMAGgas1UeFloiUFs= X-Google-Smtp-Source: AGHT+IEe6+4Ol3g56LCp7oxLah5PIpUS2/7gEd0hQODi7K1v1EORy1CQMGAow5mREcFudMC+JI2Srw== X-Received: by 2002:a17:903:26c6:b0:1b8:66f6:87a3 with SMTP id jg6-20020a17090326c600b001b866f687a3mr11146073plb.52.1696271862881; Mon, 02 Oct 2023 11:37:42 -0700 (PDT) Received: from hermes.local (204-195-126-68.wavecable.com. [204.195.126.68]) by smtp.gmail.com with ESMTPSA id iz7-20020a170902ef8700b001b9f7bc3e77sm12546595plb.189.2023.10.02.11.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 11:37:42 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v2 2/3] rte_ether_unformat: accept more inputs Date: Mon, 2 Oct 2023 11:37:29 -0700 Message-Id: <20231002183730.301163-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231002183730.301163-1-stephen@networkplumber.org> References: <20230929163611.62691-1-stephen@networkplumber.org> <20231002183730.301163-1-stephen@networkplumber.org> MIME-Version: 1.0 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 with leading zeros as well. Signed-off-by: Stephen Hemminger --- lib/net/rte_ether.c | 87 ++++++++++++++++++++++++++++++++++----------- lib/net/rte_ether.h | 9 +++-- 2 files changed, 74 insertions(+), 22 deletions(-) diff --git a/lib/net/rte_ether.c b/lib/net/rte_ether.c index 66d9a9d0699a..de3f456207e8 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,17 @@ 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; + if (*s == sep || *s == '\0') + break; } + 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 +101,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..097aedcf21eb 100644 --- a/lib/net/rte_ether.h +++ b/lib/net/rte_ether.h @@ -254,8 +254,13 @@ 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. * @param eth_addr * A pointer to a ether_addr structure. From patchwork Mon Oct 2 18:37:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 132269 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 23F08426A5; Mon, 2 Oct 2023 20:38:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D637402EA; Mon, 2 Oct 2023 20:37:47 +0200 (CEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mails.dpdk.org (Postfix) with ESMTP id 07460402D5 for ; Mon, 2 Oct 2023 20:37:45 +0200 (CEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1bf55a81eeaso1081875ad.0 for ; Mon, 02 Oct 2023 11:37:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1696271864; x=1696876664; 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=h5MS8SMAbT7v9isRW24gI7PqH+NVxcBjHc33IbSMo/0=; b=CHyV/eFAb2udc+ISX8M9v7DmsL4VuvLUZgBDlo+cPT70D0PSzZqzwi209ix6M4yUQl 3JeSNm9nFAPEd0jJ8tHE2mkyMOp5OUJgJg2NGxDg5R1S7PrbdqA0SUPFxLzXhg/ilAMa mhSiKR1PeeaPRTB2ljxccrjyn1ehNfJ3hUk3jmESfNBBrLmle6UByuJKgay5DrUh0UPU OiyYUNIu+e3fMM1YbJiHGrN9Ny39KBY/ookR8wTj8qmp+smjUPnsn2jL6oXqPTrsi42u mUO3Uz705DycRmkWT5eVqL3HKEnj9zTHStDnrDCVdwD66wO7PjRiqKdviRVqVBXldEkr yA5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696271864; x=1696876664; 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=h5MS8SMAbT7v9isRW24gI7PqH+NVxcBjHc33IbSMo/0=; b=TTFsiHj/izvgpDqh4JivZCfnUD3TwArx6IHD7tlimiesVJzhATT/FilOC7x79DpYza h7KEP96JX7zZqgnSmKYaRd6JJ7hBohMvLd7k9pUWYHMYBIbKj+xcYVflwXerkLHrcUpM MSB2TLjbJPldekwKyCL3uY/8hFIMlsjRO+y0rATl+IE7y3k3BhOucxAABGdr5zujAmPG B23nAsZdRdCkvZPeGmA4VIo8mmoFfhE0MZv/S5DJaZOB6NbyHDKgSNtwtcPtHqQUEQ1k 4IdDxGHn3C1rbdqi1FKzbz+M+rZlZVLu3lYMn2J+O4ZnwCuRRltdAeWz10sqlGuPvva2 1RRg== X-Gm-Message-State: AOJu0YwJYgMhVnJWlodyWm6I6z/sZzxWowFCyEwfye+eSrAnfAifNQ3l iCnkCi9CBh6nCgLixiR6zl12v4ICp6D2vbkKgAg= X-Google-Smtp-Source: AGHT+IGL1fDFGE+Gav50bXoCgUMfHWEkvE80IOmSFngRi8ujjVS73HOJB64Uk9JGtub7qNSkzF6/qw== X-Received: by 2002:a17:902:f812:b0:1c6:1ddf:5c3b with SMTP id ix18-20020a170902f81200b001c61ddf5c3bmr9725036plb.28.1696271863814; Mon, 02 Oct 2023 11:37:43 -0700 (PDT) Received: from hermes.local (204-195-126-68.wavecable.com. [204.195.126.68]) by smtp.gmail.com with ESMTPSA id iz7-20020a170902ef8700b001b9f7bc3e77sm12546595plb.189.2023.10.02.11.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 11:37:43 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v2 3/3] test: add tests for rte_ether routines Date: Mon, 2 Oct 2023 11:37:30 -0700 Message-Id: <20231002183730.301163-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231002183730.301163-1-stephen@networkplumber.org> References: <20230929163611.62691-1-stephen@networkplumber.org> <20231002183730.301163-1-stephen@networkplumber.org> MIME-Version: 1.0 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 add some basic tests for rte_unformat_ether_addr and other functions in rte_ether. Signed-off-by: Stephen Hemminger --- app/test/meson.build | 1 + app/test/test_net_ether.c | 169 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+) create mode 100644 app/test/test_net_ether.c diff --git a/app/test/meson.build b/app/test/meson.build index bf9fc906128f..20a9333c726d 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -124,6 +124,7 @@ source_file_deps = { 'test_meter.c': ['meter'], 'test_metrics.c': ['metrics'], 'test_mp_secondary.c': ['hash', 'lpm'], + 'test_net_ether.c': ['net'], 'test_pcapng.c': ['ethdev', 'net', 'pcapng'], 'test_pdcp.c': ['eventdev', 'pdcp', 'net', 'timer', 'security'], 'test_pdump.c': ['pdump'] + sample_packet_forward_deps, diff --git a/app/test/test_net_ether.c b/app/test/test_net_ether.c new file mode 100644 index 000000000000..a6d38cc2ffa0 --- /dev/null +++ b/app/test/test_net_ether.c @@ -0,0 +1,169 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2023 Stephen Hemminger + */ + +#include + +#include +#include "test.h" + +#define N 1000000 + +static const struct rte_ether_addr zero_ea; +static const struct rte_ether_addr bcast_ea = { + .addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, +}; + +static int +test_ether_addr(void) +{ + struct rte_ether_addr rand_ea = { }; + unsigned int i; + + RTE_TEST_ASSERT(rte_is_zero_ether_addr(&zero_ea), "Zero address is not zero"); + RTE_TEST_ASSERT(!rte_is_zero_ether_addr(&bcast_ea), "Broadcast is zero"); + + for (i = 0; i < N; i++) { + rte_eth_random_addr(rand_ea.addr_bytes); + RTE_TEST_ASSERT(!rte_is_zero_ether_addr(&rand_ea), + "Random address is zero"); + RTE_TEST_ASSERT(rte_is_unicast_ether_addr(&rand_ea), + "Random addrss is not unicast"); + RTE_TEST_ASSERT(rte_is_local_admin_ether_addr(&rand_ea), + "Random address is not local admin"); + } + + return 0; +} + +static int +test_format_addr(void) +{ + struct rte_ether_addr rand_ea = { }; + char buf[RTE_ETHER_ADDR_FMT_SIZE]; + unsigned int i; + + for (i = 0; i < N; i++) { + struct rte_ether_addr result = { }; + int ret; + + rte_eth_random_addr(rand_ea.addr_bytes); + + rte_ether_format_addr(buf, sizeof(buf), &rand_ea); + + ret = rte_ether_unformat_addr(buf, &result); + if (ret != 0) { + fprintf(stderr, "rte_ether_unformat_addr(%s) failed\n", buf); + return -1; + } + RTE_TEST_ASSERT(rte_is_same_ether_addr(&rand_ea, &result), + "rte_ether_format/unformat mismatch"); + } + return 0; + +} + +static int +test_unformat_addr(void) +{ + const struct rte_ether_addr expected = { + .addr_bytes = { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc }, + }; + const struct rte_ether_addr nozero_ea = { + .addr_bytes = { 1, 2, 3, 4, 5, 6 }, + }; + struct rte_ether_addr result; + int ret; + + /* Test IETF format */ + memset(&result, 0, sizeof(result)); + ret = rte_ether_unformat_addr("12:34:56:78:9a:bc", &result); + RTE_TEST_ASSERT(ret == 0, "IETF unformat failed"); + RTE_TEST_ASSERT(rte_is_same_ether_addr(&expected, &result), + "IETF unformat mismatch"); + + /* Test IEEE format */ + memset(&result, 0, sizeof(result)); + ret = rte_ether_unformat_addr("12-34-56-78-9A-BC", &result); + RTE_TEST_ASSERT(ret == 0, "IEEE unformat failed"); + RTE_TEST_ASSERT(rte_is_same_ether_addr(&expected, &result), + "IEEE unformat mismatch"); + + /* Test Cisco format */ + memset(&result, 0, sizeof(result)); + ret = rte_ether_unformat_addr("1234.5678.9ABC", &result); + RTE_TEST_ASSERT(ret == 0, "Cisco unformat failed"); + RTE_TEST_ASSERT(rte_is_same_ether_addr(&expected, &result), + "Cisco unformat mismatch"); + + /* Test no leading zeros - IETF */ + memset(&result, 0, sizeof(result)); + ret = rte_ether_unformat_addr("1:2:3:4:5:6", &result); + RTE_TEST_ASSERT(ret == 0, "IETF leading zero failed"); + RTE_TEST_ASSERT(rte_is_same_ether_addr(&nozero_ea, &result), + "IETF leading zero mismatch"); + + /* Test no-leading zero - IEEE format */ + memset(&result, 0, sizeof(result)); + ret = rte_ether_unformat_addr("1-2-3-4-5-6", &result); + RTE_TEST_ASSERT(ret == 0, "IEEE leading zero failed"); + RTE_TEST_ASSERT(rte_is_same_ether_addr(&nozero_ea, &result), + "IEEE leading zero mismatch"); + + /* Test no-leading zero - Cisco format */ + memset(&result, 0, sizeof(result)); + ret = rte_ether_unformat_addr("102.304.506", &result); + RTE_TEST_ASSERT(ret == 0, "Cisco leading zero failed"); + RTE_TEST_ASSERT(rte_is_same_ether_addr(&nozero_ea, &result), + "Cisco leading zero mismatch"); + + return 0; +} + +static int +test_invalid_addr(void) +{ + static const char * const invalid[] = { + "NO:ADDRESS", + "123", + "12:34:56:78:9a:gh", + "12:34:56:78:9a", + "100:34:56:78:9a:bc", + "34-56-78-9a-bc", + "12:34:56-78:9a:bc", + "12:34:56.78:9a:bc", + "123:456:789:abc", + "", + }; + struct rte_ether_addr result; + unsigned int i; + + for (i = 0; i < RTE_DIM(invalid); ++i) { + if (!rte_ether_unformat_addr(invalid[i], &result)) { + fprintf(stderr, "rte_ether_unformat_addr(%s) succeeded!\n", + invalid[i]); + return -1; + } + } + return 0; +} + +static int +test_net_ether(void) +{ + if (test_ether_addr()) + return -1; + + if (test_format_addr()) + return -1; + + if (test_unformat_addr()) + return -1; + + if (test_invalid_addr()) + return -1; + + return 0; +} + +REGISTER_FAST_TEST(net_ether_autotest, true, true, test_net_ether);