From 3ed6e722e35eebcf59bdf01b4e72e5da65344e06 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 16 Feb 2024 01:18:01 +0000 Subject: [PATCH] Clean up the implementation. Test: treehugger Change-Id: Ifd8bf344583b74737a05b80e30373ab7bef94f8d --- libc/Android.bp | 5 +- libc/bionic/ether_aton.c | 89 ------------------- .../{ether_ntoa.c => netinet_ether.cpp} | 51 ++++++----- libc/include/netinet/ether.h | 8 +- tests/netinet_ether_test.cpp | 1 + 5 files changed, 36 insertions(+), 118 deletions(-) delete mode 100644 libc/bionic/ether_aton.c rename libc/bionic/{ether_ntoa.c => netinet_ether.cpp} (58%) diff --git a/libc/Android.bp b/libc/Android.bp index 071f309fa..8a88a0e0e 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -819,8 +819,6 @@ cc_library_static { "bionic/dup.cpp", "bionic/environ.cpp", "bionic/error.cpp", - "bionic/ether_aton.c", - "bionic/ether_ntoa.c", "bionic/eventfd.cpp", "bionic/exec.cpp", "bionic/execinfo.cpp", @@ -880,8 +878,9 @@ cc_library_static { "bionic/mknod.cpp", "bionic/mntent.cpp", "bionic/mremap.cpp", - "bionic/net_if.cpp", "bionic/netdb.cpp", + "bionic/net_if.cpp", + "bionic/netinet_ether.cpp", "bionic/netinet_in.cpp", "bionic/nl_types.cpp", "bionic/open.cpp", diff --git a/libc/bionic/ether_aton.c b/libc/bionic/ether_aton.c deleted file mode 100644 index edd6b11b7..000000000 --- a/libc/bionic/ether_aton.c +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#include -#include -#include - -static inline int -xdigit (char c) { - unsigned d; - d = (unsigned)(c-'0'); - if (d < 10) return (int)d; - d = (unsigned)(c-'a'); - if (d < 6) return (int)(10+d); - d = (unsigned)(c-'A'); - if (d < 6) return (int)(10+d); - return -1; -} - -/* - * Convert Ethernet address in the standard hex-digits-and-colons to binary - * representation. - * Re-entrant version (GNU extensions) - */ -struct ether_addr * -ether_aton_r (const char *asc, struct ether_addr * addr) -{ - int i, val0, val1; - for (i = 0; i < ETHER_ADDR_LEN; ++i) { - val0 = xdigit(*asc); - asc++; - if (val0 < 0) - return NULL; - - val1 = xdigit(*asc); - asc++; - if (val1 < 0) - return NULL; - - addr->ether_addr_octet[i] = (u_int8_t)((val0 << 4) + val1); - - if (i < ETHER_ADDR_LEN - 1) { - if (*asc != ':') - return NULL; - asc++; - } - } - if (*asc != '\0') - return NULL; - return addr; -} - -/* - * Convert Ethernet address in the standard hex-digits-and-colons to binary - * representation. - */ -struct ether_addr * -ether_aton (const char *asc) -{ - static struct ether_addr addr; - return ether_aton_r(asc, &addr); -} diff --git a/libc/bionic/ether_ntoa.c b/libc/bionic/netinet_ether.cpp similarity index 58% rename from libc/bionic/ether_ntoa.c rename to libc/bionic/netinet_ether.cpp index 7c31af3b4..7ebceaccf 100644 --- a/libc/bionic/ether_ntoa.c +++ b/libc/bionic/netinet_ether.cpp @@ -26,30 +26,37 @@ * SUCH DAMAGE. */ +#include + #include -#include -#include -/* - * Convert Ethernet address to standard hex-digits-and-colons printable form. - * Re-entrant version (GNU extensions). - */ -char * -ether_ntoa_r (const struct ether_addr *addr, char * buf) -{ - snprintf(buf, 18, "%02x:%02x:%02x:%02x:%02x:%02x", - addr->ether_addr_octet[0], addr->ether_addr_octet[1], - addr->ether_addr_octet[2], addr->ether_addr_octet[3], - addr->ether_addr_octet[4], addr->ether_addr_octet[5]); - return buf; +ether_addr* ether_aton_r(const char* asc, ether_addr* addr) { + int bytes[ETHER_ADDR_LEN], end; + int n = sscanf(asc, "%x:%x:%x:%x:%x:%x%n", + &bytes[0], &bytes[1], &bytes[2], + &bytes[3], &bytes[4], &bytes[5], &end); + if (n != ETHER_ADDR_LEN || asc[end] != '\0') return NULL; + for (int i = 0; i < ETHER_ADDR_LEN; i++) { + if (bytes[i] > 0xff) return NULL; + addr->ether_addr_octet[i] = bytes[i]; + } + return addr; } -/* - * Convert Ethernet address to standard hex-digits-and-colons printable form. - */ -char * -ether_ntoa (const struct ether_addr *addr) -{ - static char buf[18]; - return ether_ntoa_r(addr, buf); +struct ether_addr* ether_aton(const char* asc) { + static ether_addr addr; + return ether_aton_r(asc, &addr); +} + +char* ether_ntoa_r(const ether_addr* addr, char* buf) { + snprintf(buf, 18, "%02x:%02x:%02x:%02x:%02x:%02x", + addr->ether_addr_octet[0], addr->ether_addr_octet[1], + addr->ether_addr_octet[2], addr->ether_addr_octet[3], + addr->ether_addr_octet[4], addr->ether_addr_octet[5]); + return buf; +} + +char* ether_ntoa(const ether_addr* addr) { + static char buf[18]; + return ether_ntoa_r(addr, buf); } diff --git a/libc/include/netinet/ether.h b/libc/include/netinet/ether.h index d570c18b7..4af7edae1 100644 --- a/libc/include/netinet/ether.h +++ b/libc/include/netinet/ether.h @@ -40,7 +40,7 @@ __BEGIN_DECLS /** * [ether_ntoa(3)](http://man7.org/linux/man-pages/man3/ether_ntoa.3.html) returns a string - * representation of the given Ethernet address. + * representation of the given Ethernet (MAC) address. * * Returns a pointer to a static buffer. */ @@ -48,7 +48,7 @@ char* _Nonnull ether_ntoa(const struct ether_addr* _Nonnull __addr); /** * [ether_ntoa_r(3)](http://man7.org/linux/man-pages/man3/ether_ntoa_r.3.html) returns a string - * representation of the given Ethernet address. + * representation of the given Ethernet (MAC) address. * * Returns a pointer to the given buffer. */ @@ -56,7 +56,7 @@ char* _Nonnull ether_ntoa_r(const struct ether_addr* _Nonnull __addr, char* _Non /** * [ether_aton(3)](http://man7.org/linux/man-pages/man3/ether_aton.3.html) returns an `ether_addr` - * corresponding to the given Ethernet address string. + * corresponding to the given Ethernet (MAC) address string. * * Returns a pointer to a static buffer, or NULL if the given string isn't a valid MAC address. */ @@ -64,7 +64,7 @@ struct ether_addr* _Nullable ether_aton(const char* _Nonnull __ascii); /** * [ether_aton_r(3)](http://man7.org/linux/man-pages/man3/ether_aton_r.3.html) returns an - * `ether_addr` corresponding to the given Ethernet address string. + * `ether_addr` corresponding to the given Ethernet (MAC) address string. * * Returns a pointer to the given buffer, or NULL if the given string isn't a valid MAC address. */ diff --git a/tests/netinet_ether_test.cpp b/tests/netinet_ether_test.cpp index af020ec93..d7b81eb8d 100644 --- a/tests/netinet_ether_test.cpp +++ b/tests/netinet_ether_test.cpp @@ -56,4 +56,5 @@ TEST(netinet_ether, ether_aton_r_failures) { ASSERT_TRUE(ether_aton_r("12:34:56:78:9a:bc ", &addr) == nullptr); ASSERT_TRUE(ether_aton_r("g2:34:56:78:9a:bc ", &addr) == nullptr); ASSERT_TRUE(ether_aton_r("1G:34:56:78:9a:bc ", &addr) == nullptr); + ASSERT_TRUE(ether_aton_r("123:34:56:78:9a:bc ", &addr) == nullptr); }