Merge "Clean up the <netinet/ether.h> implementation." into main
This commit is contained in:
Elliott Hughes
Gerrit Code Review
commit
9a7da857a7
5 changed files with 36 additions and 118 deletions
|
|
@ -820,8 +820,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",
|
||||
|
|
@ -881,8 +879,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",
|
||||
|
|
|
|||
|
|
@ -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 <net/ethernet.h>
|
||||
|
||||
#include <ctype.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
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);
|
||||
}
|
||||
|
|
@ -26,30 +26,37 @@
|
|||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <netinet/ether.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <net/ethernet.h>
|
||||
|
||||
/*
|
||||
* 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);
|
||||
}
|
||||
|
|
@ -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.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue