[uClibc]ether_addr patch

[Nick Fedchik]

Hi All!

I made a patch for uClibc-0.9.16 to add next functions:
struct ether_addr *ether_aton(const char *asc)
struct ether_addr *ether_aton_r(const char *asc, struct ether_addr *addr)
char *ether_ntoa(const struct ether_addr *addr)
char *ether_ntoa_r(const struct ether_addr *addr, char *buf)

They just sticked from some glibc files (inet/ether_*.c) to one file.
Note that definitions of this functions has already present in the
uClibc-0.9.16/include/netinet/ether.h

I tested patched library with ebtables, f.e.

Is it possible to include patched files in future library releases?

-- 
Nick Fedchik <fnm at fusion.ukrsat.com>
FNM3-RIPE (-UANIC), UkrSat ISP
-------------- next part --------------
diff -urN uClibc-0.9.16/libc/inet/Makefile uClibc-0.9.16-fnm/libc/inet/Makefile
--- uClibc-0.9.16/libc/inet/Makefile	Thu Oct 31 20:19:25 2002
+++ uClibc-0.9.16-fnm/libc/inet/Makefile	Fri Nov 22 10:19:36 2002
@@ -50,7 +50,8 @@
 	setsockopt.o shutdown.o socket.o socketpair.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 
+	inet_net.c ntop.c herror.c if_nametoindex.c gai_strerror.c getaddrinfo.c \
+	ether_addr.c
 
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 
diff -urN uClibc-0.9.16/libc/inet/ether_addr.c uClibc-0.9.16-fnm/libc/inet/ether_addr.c
--- uClibc-0.9.16/libc/inet/ether_addr.c	Thu Jan  1 03:00:00 1970
+++ uClibc-0.9.16-fnm/libc/inet/ether_addr.c	Fri Nov 22 10:06:08 2002
@@ -0,0 +1,92 @@
+/*
+*  Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+*   This file was assembled from parts of the GNU C Library.
+*   Contributed by Ulrich Drepper <drepper at cygnus.com>, 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.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+*  2002-11-22  Nick Fedchik <fnm at ukrsat.com>
+* 	- initial uClibc port
+*/
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <netinet/ether.h>
+#include <netinet/if_ether.h>
+
+#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;
+}