bump to latest stable and change repository layout

[iproute2.git] / lib / ll_addr.c

diff --git a/lib/ll_addr.c b/lib/ll_addr.c
deleted file mode 100644 (file)
index 581487d..0000000
--- a/lib/ll_addr.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * ll_addr.c
- *
- *             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.
- *
- * Authors:    Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <string.h>
-
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
-#include <linux/sockios.h>
-
-#include "rt_names.h"
-#include "utils.h"
-
-
-const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen)
-{
-       int i;
-       int l;
-
-       if (alen == 4 &&
-           (type == ARPHRD_TUNNEL || type == ARPHRD_SIT || type == ARPHRD_IPGRE)) {
-               return inet_ntop(AF_INET, addr, buf, blen);
-       }
-       l = 0;
-       for (i=0; i<alen; i++) {
-               if (i==0) {
-                       snprintf(buf+l, blen, "%02x", addr[i]);
-                       blen -= 2;
-                       l += 2;
-               } else {
-                       snprintf(buf+l, blen, ":%02x", addr[i]);
-                       blen -= 3;
-                       l += 3;
-               }
-       }
-       return buf;
-}
-
-/*NB: lladdr is char * (rather than u8 *) because sa_data is char * (1003.1g) */
-int ll_addr_a2n(char *lladdr, int len, char *arg)
-{
-       if (strchr(arg, '.')) {
-               inet_prefix pfx;
-               if (get_addr_1(&pfx, arg, AF_INET)) {
-                       fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg);
-                       return -1;
-               }
-               if (len < 4)
-                       return -1;
-               memcpy(lladdr, pfx.data, 4);
-               return 4;
-       } else {
-               int i;
-
-               for (i=0; i<len; i++) {
-                       int temp;
-                       char *cp = strchr(arg, ':');
-                       if (cp) {
-                               *cp = 0;
-                               cp++;
-                       }
-                       if (sscanf(arg, "%x", &temp) != 1) {
-                               fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg);
-                               return -1;
-                       }
-                       if (temp < 0 || temp > 255) {
-                               fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg);
-                               return -1;
-                       }
-                       lladdr[i] = temp;
-                       if (!cp)
-                               break;
-                       arg = cp;
-               }
-               return i+1;
-       }
-}