link_addr: New function

diff --git a/ChangeLog b/ChangeLog
index c9163fad02c3d3be920de04e0de5ddbf9fc115dc..648a51b6c94ad272d80446ffd6e3aa49a65cef99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-08  Aurelien Jarno  <aurelien@aurel32.net>
+
+       * src/link_addr.c: New file.
+       * include/bsd/if_dl.h: Add link_addr.c declarations.
+       * Makefile (LIB_SRCS): Add link_addr.c.
+       * Versions: add link_addr and link_ntoa
+
 2006-08-25  Petr Salinger  <Petr.Salinger@seznam.cz>
 
        * src/humanize_number.c: New file.

diff --git a/Makefile b/Makefile
index 560f6602b8fa31b2be84af19817bff344101cfaf..a7dcb1db51a162233ced230eac3f6befc203ff09 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,12 @@
 #
 
 LIB_SRCS := arc4random.c bsd_getopt.c err.c fgetln.c heapsort.c \
-           humanize_number.c inet_net_pton.c \
+           linkaddr.c humanize_number.c inet_net_pton.c \
            strlcat.c strlcpy.c md5c.c fmtcheck.c progname.c vis.c unvis.c
 LIB_SRCS := $(patsubst %,src/%,$(LIB_SRCS))
 
 LIB_INCLUDES := bsd/err.h bsd/getopt.h bsd/ip_icmp.h bsd/random.h bsd/queue.h bsd/md5.h bsd/string.h \
-               bsd/bsd.h bsd/cdefs.h bsd/stdlib.h vis.h libutil.h
+               bsd/bsd.h bsd/cdefs.h bsd/stdlib.h bsd/if_dl.h vis.h libutil.h
 
 LIB_MANS := arc4random.3 strlcpy.3 fgetln.3 fmtcheck.3
 LIB_MANS := $(patsubst %,man/%,$(LIB_MANS))

diff --git a/Versions b/Versions
index 56786227e7f5bb6c77b68199e0049ce470b29815..0f05abf95f80490b9693e31cea86a1d4724f67ed 100644 (file)
--- a/Versions
+++ b/Versions
@@ -9,6 +9,7 @@ LIBBSD_0.0 {
     heapsort;
     humanize_number;
     inet_net_pton;
+    link_addr; link_ntoa;
     getprogname; setprogname;
     strlcpy;
     strlcat;

diff --git a/src/linkaddr.c b/src/linkaddr.c
new file mode 100644 (file)
index 0000000..0161558
--- /dev/null
+++ b/src/linkaddr.c
@@ -0,0 +1,160 @@
+/*-
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)linkaddr.c 8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/libc/net/linkaddr.c,v 1.3 2002/03/21 18:49:23 obrien Exp $");
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if_dl.h>
+#include <string.h>
+
+/* States*/
+#define NAMING 0
+#define GOTONE 1
+#define GOTTWO 2
+#define RESET  3
+/* Inputs */
+#define        DIGIT   (4*0)
+#define        END     (4*1)
+#define DELIM  (4*2)
+#define LETTER (4*3)
+
+void
+link_addr(addr, sdl)
+       const char *addr;
+       struct sockaddr_dl *sdl;
+{
+       char *cp = sdl->sdl_data;
+       char *cplim = sdl->sdl_len + (char *)sdl;
+       int byte = 0, state = NAMING, new;
+
+       bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1);
+       sdl->sdl_family = AF_LINK;
+       do {
+               state &= ~LETTER;
+               if ((*addr >= '0') && (*addr <= '9')) {
+                       new = *addr - '0';
+               } else if ((*addr >= 'a') && (*addr <= 'f')) {
+                       new = *addr - 'a' + 10;
+               } else if ((*addr >= 'A') && (*addr <= 'F')) {
+                       new = *addr - 'A' + 10;
+               } else if (*addr == 0) {
+                       state |= END;
+               } else if (state == NAMING &&
+                          (((*addr >= 'A') && (*addr <= 'Z')) ||
+                          ((*addr >= 'a') && (*addr <= 'z'))))
+                       state |= LETTER;
+               else
+                       state |= DELIM;
+               addr++;
+               switch (state /* | INPUT */) {
+               case NAMING | DIGIT:
+               case NAMING | LETTER:
+                       *cp++ = addr[-1];
+                       continue;
+               case NAMING | DELIM:
+                       state = RESET;
+                       sdl->sdl_nlen = cp - sdl->sdl_data;
+                       continue;
+               case GOTTWO | DIGIT:
+                       *cp++ = byte;
+                       /* FALLTHROUGH */
+               case RESET | DIGIT:
+                       state = GOTONE;
+                       byte = new;
+                       continue;
+               case GOTONE | DIGIT:
+                       state = GOTTWO;
+                       byte = new + (byte << 4);
+                       continue;
+               default: /* | DELIM */
+                       state = RESET;
+                       *cp++ = byte;
+                       byte = 0;
+                       continue;
+               case GOTONE | END:
+               case GOTTWO | END:
+                       *cp++ = byte;
+                       /* FALLTHROUGH */
+               case RESET | END:
+                       break;
+               }
+               break;
+       } while (cp < cplim);
+       sdl->sdl_alen = cp - LLADDR(sdl);
+       new = cp - (char *)sdl;
+       if (new > sizeof(*sdl))
+               sdl->sdl_len = new;
+       return;
+}
+
+static char hexlist[] = "0123456789abcdef";
+
+char *
+link_ntoa(sdl)
+       const struct sockaddr_dl *sdl;
+{
+       static char obuf[64];
+       char *out = obuf;
+       int i;
+       u_char *in = (u_char *)LLADDR(sdl);
+       u_char *inlim = in + sdl->sdl_alen;
+       int firsttime = 1;
+
+       if (sdl->sdl_nlen) {
+               bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
+               out += sdl->sdl_nlen;
+               if (sdl->sdl_alen)
+                       *out++ = ':';
+       }
+       while (in < inlim) {
+               if (firsttime)
+                       firsttime = 0;
+               else
+                       *out++ = '.';
+               i = *in++;
+               if (i > 0xf) {
+                       out[1] = hexlist[i & 0xf];
+                       i >>= 4;
+                       out[0] = hexlist[i];
+                       out += 2;
+               } else
+                       *out++ = hexlist[i];
+       }
+       *out = 0;
+       return (obuf);
+}