From 2ace214a9f5d6a6d229558849ed77063d7cb89c0 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 10 Jan 2003 03:07:38 +0000 Subject: Patch from Nick Fedchik to support ether_aton --- libc/inet/Makefile | 2 +- libc/inet/ether_addr.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 libc/inet/ether_addr.c (limited to 'libc/inet') diff --git a/libc/inet/Makefile b/libc/inet/Makefile index 80848517d..bc29ec74f 100644 --- a/libc/inet/Makefile +++ b/libc/inet/Makefile @@ -51,7 +51,7 @@ MOBJ3= accept.o bind.o connect.o getpeername.o getsockname.o getsockopt.o \ CSRC =getservice.c getproto.c hostid.c getnetent.c getnetbynm.c getnetbyad.c \ inet_net.c ntop.c herror.c if_nametoindex.c gai_strerror.c getaddrinfo.c \ - in6_addr.c + in6_addr.c ether_addr.c COBJS=$(patsubst %.c,%.o, $(CSRC)) diff --git a/libc/inet/ether_addr.c b/libc/inet/ether_addr.c new file mode 100644 index 000000000..172bf9f81 --- /dev/null +++ b/libc/inet/ether_addr.c @@ -0,0 +1,83 @@ +/* +* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. +* This file was assembled from parts of the GNU C Library. +* Contributed by Ulrich Drepper , 1996. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +/* +* 2002-12-24 Nick Fedchik +* - initial uClibc port +*/ + + +#include +#include +#include +#include +#include + +#define __FORCE_GLIBC +struct ether_addr *ether_aton(const char *asc) +{ + static struct ether_addr result; + + return ether_aton_r(asc, &result); +} + +struct ether_addr *ether_aton_r(const char *asc, struct ether_addr *addr) +{ + size_t cnt; + + for (cnt = 0; cnt < 6; ++cnt) { + unsigned int number; + char ch; + + ch = _tolower(*asc++); + if ((ch < '0' || ch > '9') && (ch < 'a' || ch > 'f')) + return NULL; + number = isdigit(ch) ? (ch - '0') : (ch - 'a' + 10); + + ch = _tolower(*asc); + if ((cnt < 5 && ch != ':') + || (cnt == 5 && ch != '\0' && !isspace(ch))) { + ++asc; + if ((ch < '0' || ch > '9') && (ch < 'a' || ch > 'f')) + return NULL; + number <<= 4; + number += isdigit(ch) ? (ch - '0') : (ch - 'a' + 10); + + ch = *asc; + if (cnt < 5 && ch != ':') + return NULL; + } + + /* Store result. */ + addr->ether_addr_octet[cnt] = (unsigned char) number; + + /* Skip ':'. */ + ++asc; + } + + return addr; +} + +char *ether_ntoa(const struct ether_addr *addr) +{ + static char asc[18]; + + return ether_ntoa_r(addr, asc); +} + +char *ether_ntoa_r(const struct ether_addr *addr, char *buf) +{ + sprintf(buf, "%x:%x:%x:%x:%x:%x", + 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; +} -- cgit v1.2.3