libtap: remove external header (useless really)

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
kronosnet · Sep 15, 2012 · ee1fe09 · ee1fe09
1 parent 5d10d0d
commit ee1fe09
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 41 deletions.
diff --git a/libtap/Makefile.am b/libtap/Makefile.am
@@ -9,8 +9,6 @@ LIBS			= -lpthread
 
 include_HEADERS		= libtap.h
 
-noinst_HEADERS		= libtap-private.h
-
 pkgconfigdir		= $(libdir)/pkgconfig
 
 pkgconfig_DATA		= libtap.pc

diff --git a/libtap/libtap-private.h b/libtap/libtap-private.h
diff --git a/libtap/libtap.c b/libtap/libtap.c
@@ -17,15 +17,39 @@
 #include <pthread.h>
 #include <limits.h>
 #include <stdio.h>
-
-#ifdef TEST
 #include <net/if.h>
 #include <ifaddrs.h>
 #include <stdint.h>
-#endif
 
 #include "libtap.h"
-#include "libtap-private.h"
+
+#define MAX_IP_CHAR	128
+#define MAX_PREFIX_CHAR	4
+#define MAX_MAC_CHAR	18
+
+struct _ip {
+	char ip_addr[MAX_IP_CHAR];
+	char prefix[MAX_PREFIX_CHAR];
+	struct _ip *next;
+};
+
+struct _iface {
+	struct ifreq ifr;
+	int fd;
+	char default_mac[MAX_MAC_CHAR];
+	int default_mtu;
+	char updownpath[PATH_MAX];
+	int hasupdown;
+	int up;
+	struct _ip *ip;
+	struct _iface *next;
+};
+#define ifname ifr.ifr_name
+
+struct _config {
+	struct _iface *head;
+	int sockfd;
+};
 
 static int lib_init = 0;
 static struct _config lib_cfg;