Import ax25-lib 0.0.2 from tarballax25-lib-0.0.2

1 files changed, 14 insertions, 6 deletions

diff --git a/axconfig.c b/axconfig.c
index 4fc10c2..052f7f0 100644
--- a/axconfig.c
+++ b/axconfig.c
@@ -6,15 +6,23 @@
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>
+#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
+#else
+#include "kernel_ax25.h"
+#endif
+#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-
+#else
+#include "kernel_rose.h"
+#endif
 #include "pathnames.h"
 #include "axlib.h"
 #include "axconfig.h"
@@ -38,9 +46,9 @@ static int ax25_hw_cmp(unsigned char *callsign, unsigned char *hw_addr)
 {
 	ax25_address call;
 
-	convert_call_entry(callsign, call.ax25_call);
+	ax25_aton_entry(callsign, call.ax25_call);
 	
-	return ax25cmp(&call, (ax25_address *)hw_addr) == 0;
+	return ax25_cmp(&call, (ax25_address *)hw_addr) == 0;
 }
 
 static AX_Port *ax25_port_ptr(char *name)
@@ -120,13 +128,13 @@ char *ax25_config_get_port(ax25_address *callsign)
 	AX_Port *p = ax25_ports;
 	ax25_address addr;
 
-	if (ax25cmp(callsign, &null_ax25_address) == 0)
+	if (ax25_cmp(callsign, &null_ax25_address) == 0)
 		return "*";
 		
 	while (p != NULL) {
-		convert_call_entry(p->Call, (char *)&addr);
+		ax25_aton_entry(p->Call, (char *)&addr);
 
-		if (ax25cmp(callsign, &addr) == 0)
+		if (ax25_cmp(callsign, &addr) == 0)
 			return p->Name;
 
 		p = p->Next;