Import ax25-tools 0.0.2 from tarballax25-tools-0.0.2

7 files changed, 189 insertions, 11 deletions

diff --git a/rose/Makefile.am b/rose/Makefile.am
index 3cbb2c8..c806d95 100644
--- a/rose/Makefile.am
+++ b/rose/Makefile.am
@@ -11,9 +11,13 @@ installconf:
 
 sbin_PROGRAMS = rsattach rsdwnlnk rsmemsiz rsparms rsuplnk 
 
+LDADD = $(AX25_LIB)
+
+rsmemsiz_LDADD = 
+
 sbin_SCRIPTS = rsusers.sh
 
 
 man_MANS = rose.4 rsports.5 rsattach.8 rsparms.8 rsdwnlnk.8 rsuplnk.8
 
-EXTRA_DIST = $(man_MANS) $(etcfiles)
+EXTRA_DIST = $(man_MANS) $(etcfiles) $(sbin_SCRIPTS)
diff --git a/rose/Makefile.in b/rose/Makefile.in
index 0ded273..8849f25 100644
--- a/rose/Makefile.in
+++ b/rose/Makefile.in
@@ -58,22 +58,30 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 AWK = @AWK@
+AX25IO_LIB = @AX25IO_LIB@
+AX25_LIB = @AX25_LIB@
 CC = @CC@
 MAKEINFO = @MAKEINFO@
 NCURSES_LIB = @NCURSES_LIB@
 PACKAGE = @PACKAGE@
+UTIL_LIB = @UTIL_LIB@
 VERSION = @VERSION@
+Z_LIB = @Z_LIB@
 
 etcfiles = rsports
 etcdir = $(sysconfdir)/ax25
 
 sbin_PROGRAMS = rsattach rsdwnlnk rsmemsiz rsparms rsuplnk 
 
+LDADD = $(AX25_LIB)
+
+rsmemsiz_LDADD = 
+
 sbin_SCRIPTS = rsusers.sh
 
 man_MANS = rose.4 rsports.5 rsattach.8 rsparms.8 rsdwnlnk.8 rsuplnk.8
 
-EXTRA_DIST = $(man_MANS) $(etcfiles)
+EXTRA_DIST = $(man_MANS) $(etcfiles) $(sbin_SCRIPTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -100,7 +108,6 @@ rsdwnlnk_DEPENDENCIES =
 rsdwnlnk_LDFLAGS = 
 rsmemsiz_SOURCES = rsmemsiz.c
 rsmemsiz_OBJECTS =  rsmemsiz.o
-rsmemsiz_LDADD = $(LDADD)
 rsmemsiz_DEPENDENCIES = 
 rsmemsiz_LDFLAGS = 
 rsparms_SOURCES = rsparms.c
diff --git a/rose/rsattach.c b/rose/rsattach.c
index 3d98858..b7323e1 100644
--- a/rose/rsattach.c
+++ b/rose/rsattach.c
@@ -8,6 +8,8 @@
 #include <ctype.h>
 #include <netdb.h>
 
+#include <config.h>
+
 #include <sys/ioctl.h>
 
 #include <sys/socket.h>
@@ -16,11 +18,24 @@
 #include <net/if_arp.h>
 /* #include <linux/sockios.h> */
 
+
+#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
+#else
+#include <netax25/kernel_ax25.h>
+#endif
+#ifdef HAVE_NETROM_NETROM_H
+#include <netrom/netrom.h>
+#else
+#include <netax25/kernel_netrom.h>
+#endif
+#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#include <netax25/axlib.h>
+#else 
+#include <netax25/kernel_rose.h>
+#endif
 
-#include <config.h>
+#include <netax25/axlib.h>
 
 #include "../pathnames.h"
 
diff --git a/rose/rsdwnlnk.c b/rose/rsdwnlnk.c
index 5729d99..d4e4348 100644
--- a/rose/rsdwnlnk.c
+++ b/rose/rsdwnlnk.c
@@ -5,18 +5,26 @@
 #include <signal.h>
 #include <syslog.h>
 
+#include <config.h>
+
 #include <sys/time.h>
 #include <sys/types.h>
 
 #include <sys/socket.h>
+#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
+#else
+#include <netax25/kernel_ax25.h>
+#endif
+#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
+#else 
+#include <netax25/kernel_rose.h>
+#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
 
-#include <config.h>
-
 #define	AX25_HBIT	0x80
 
 void alarm_handler(int sig)
diff --git a/rose/rsparms.c b/rose/rsparms.c
index 86e0935..68e8481 100644
--- a/rose/rsparms.c
+++ b/rose/rsparms.c
@@ -4,19 +4,27 @@
 #include <ctype.h>
 #include <unistd.h>
 
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
 #include <sys/socket.h>
+#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
+#else
+#include <netax25/kernel_ax25.h>
+#endif
+#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
+#else 
+#include <netax25/kernel_rose.h>
+#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
 #include <netax25/rsconfig.h>
 
-#include <config.h>
-
 #include "../pathnames.h"
 
 char nodes_usage[]  = "usage: rsparms -node add|del nodeaddr[/mask] port neighbour [digis...]\n       rsparms -node list\n";
diff --git a/rose/rsuplnk.c b/rose/rsuplnk.c
index a024e20..e9f5ecd 100644
--- a/rose/rsuplnk.c
+++ b/rose/rsuplnk.c
@@ -5,19 +5,27 @@
 #include <signal.h>
 #include <syslog.h>
 
+#include <config.h>
+
 #include <sys/time.h>
 #include <sys/types.h>
 
 #include <sys/socket.h>
+#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
+#else
+#include <netax25/kernel_ax25.h>
+#endif
+#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
+#else 
+#include <netax25/kernel_rose.h>
+#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
 #include <netax25/rsconfig.h>
 
-#include <config.h>
-
 void alarm_handler(int sig)
 {
 }
diff --git a/rose/rsusers.sh b/rose/rsusers.sh
new file mode 100755
index 0000000..09c2e97
--- /dev/null
+++ b/rose/rsusers.sh
@@ -0,0 +1,128 @@
+#! /bin/sh
+
+ALL=n
+
+if [ $# = 1 ]; then
+    ALL=y
+fi
+
+echo -en "Linux/ROSE 001. AX.25, NET/ROM and ROSE Users.\r"
+
+if [ -r /proc/net/ax25 ]; then
+    cat /proc/net/ax25 | awk '
+	BEGIN  {
+		printf "Active AX.25 Sessions\r"
+		printf "Dest       Source     State\r"
+		n = 0
+	       }
+	NR > 1 {
+		if ($4 == 0) {
+		    state = "LISTENING"
+		} else if ($4 == 1) {
+		    state = "CONNECTING"
+		} else if ($4 == 2) {
+		    state = "DISCONNECTING"
+		} else if ($4 == 3) {
+		    state = "CONNECTED"
+		} else {
+		    state = "RECOVERY"
+		}
+		if ($4 != 0) {
+		    printf "%-9s  %-9s  %s\r", $1, $2, state
+		    n++
+		} else {
+		    if (ALL == "y") {
+			printf "%-9s  %-9s  %s\r", $1, $2, state
+			n++
+		    }
+		}
+	       }
+	END    {
+		    if (n == 0) {
+			printf "None active\r"
+		    }
+	       }' ALL=$ALL
+
+	echo -en "\r"
+fi
+
+if [ -r /proc/net/nr ]; then
+    cat /proc/net/nr | awk '
+	BEGIN  {
+		printf "Active NET/ROM Sessions\r"
+		printf "User       Dest       Source     State\r"
+		n = 0
+	       }
+	NR > 1 {
+		if ($7 == 0) {
+		    state = "LISTENING"
+		} else if ($7 == 1) {
+		    state = "CONNECTING"
+		} else if ($7 == 2) {
+		    state = "DISCONNECTING"
+		} else if ($7 == 3) {
+		    state = "CONNECTED"
+		} else {
+		    state = "RECOVERY"
+		}
+		if ($7 != 0) {
+		    printf "%-9s  %-9s  %-9s  %s\r", $1, $2, $3, state
+		    n++
+		} else {
+		    if (ALL == "y") {
+			printf "%-9s  %-9s  %-9s  %s\r", $1, $2, $3, state
+			n++
+		    }
+		}
+	       }
+	END    {
+		    if (n == 0) {
+			printf "None active\r"
+		    }
+	       }' ALL=$ALL
+
+	echo -en "\r"
+fi
+
+if [ -r /proc/net/rose ]; then
+    cat /proc/net/rose | awk '
+	BEGIN  {
+		printf "Active ROSE Sessions\r"
+		printf "Dest                   Source                 State\r"
+		n = 0
+	       }
+	NR > 1 {
+		if ($7 == 0) {
+		    state = "LISTENING"
+		} else if ($7 == 1) {
+		    state = "CONNECTING"
+		} else if ($7 == 2) {
+		    state = "DISCONNECTING"
+		} else if ($7 == 3) {
+		    state = "CONNECTED"
+		} else {
+		    state = "RESETTING"
+		}
+		if ($7 != 0) {
+		    printf "%-10s  %-9s  %-10s  %-9s  %s\r", $1, $2, $3, $4, state
+		    n++
+		} else {
+		    if (ALL == "y") {
+			printf "%-10s  %-9s  %-10s  %-9s  %s\r", $1, $2, $3, $4, state
+			n++
+		    }
+		}
+	       }
+	END    {
+		    if (n == 0) {
+			printf "None active\r"
+		    }
+	       }' ALL=$ALL
+
+	echo -en "\r"
+fi
+
+read
+
+exit 0
+