From 41e533af4a2720c1dc228ba40b6582ca53085c3a Mon Sep 17 00:00:00 2001 From: Szymon Jakubczak Date: Wed, 9 Jun 2010 15:53:28 -0400 Subject: [PATCH] added missing ether_aton and ether_ntoa Change-Id: I32ee448abde4d5693d393030ed77ddc6d2ad1dfc --- libc/Android.mk | 2 + libc/include/net/if_ether.h | 2 + libc/inet/ether_aton.c | 89 +++++++++++++++++++++++++++++++++++++ libc/inet/ether_ntoa.c | 55 +++++++++++++++++++++++ 4 files changed, 148 insertions(+) create mode 100644 libc/inet/ether_aton.c create mode 100644 libc/inet/ether_ntoa.c diff --git a/libc/Android.mk b/libc/Android.mk index b3f95c55b..32bf9322e 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -240,6 +240,8 @@ libc_common_src_files := \ inet/inet_ntoa.c \ inet/inet_ntop.c \ inet/inet_pton.c \ + inet/ether_aton.c \ + inet/ether_ntoa.c \ tzcode/asctime.c \ tzcode/difftime.c \ tzcode/localtime.c \ diff --git a/libc/include/net/if_ether.h b/libc/include/net/if_ether.h index 121f9ac97..8daa16b6c 100644 --- a/libc/include/net/if_ether.h +++ b/libc/include/net/if_ether.h @@ -34,6 +34,8 @@ #ifndef _NET_IF_ETHER_H_ #define _NET_IF_ETHER_H_ +#include + #ifdef _KERNEL #ifdef _KERNEL_OPT #include "opt_mbuftrace.h" diff --git a/libc/inet/ether_aton.c b/libc/inet/ether_aton.c new file mode 100644 index 000000000..6540c0736 --- /dev/null +++ b/libc/inet/ether_aton.c @@ -0,0 +1,89 @@ +/* + * 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 +#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/inet/ether_ntoa.c b/libc/inet/ether_ntoa.c new file mode 100644 index 000000000..f56e48b24 --- /dev/null +++ b/libc/inet/ether_ntoa.c @@ -0,0 +1,55 @@ +/* + * 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 + +/* + * 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; +} + +/* + * 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); +}