summaryrefslogtreecommitdiffstats
path: root/ax25
diff options
context:
space:
mode:
Diffstat (limited to 'ax25')
-rw-r--r--ax25/Makefile.am20
-rw-r--r--ax25/Makefile.in20
-rw-r--r--ax25/ax25d.c2
-rw-r--r--ax25/axctl.c2
-rw-r--r--ax25/axports.562
-rw-r--r--ax25/axspawn.c2
-rw-r--r--ax25/mheardd.c12
7 files changed, 32 insertions, 88 deletions
diff --git a/ax25/Makefile.am b/ax25/Makefile.am
index 6bfe46a..bb78855 100644
--- a/ax25/Makefile.am
+++ b/ax25/Makefile.am
@@ -3,15 +3,15 @@ etcfiles = ax25.profile ax25d.conf axspawn.conf rxecho.conf
varfiles = mheard.dat
installconf:
- $(mkinstalldirs) $(DESTDIR)$(etcdir)
+ $(mkinstalldirs) $(DESTDIR)$(AX25_SYSCONFDIR)
@list='$(etcfiles)'; for p in $$list; do \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p; \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(AX25_SYSCONFDIR)/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(AX25_SYSCONFDIR)/$$p; \
done
- $(mkinstalldirs) $(DESTDIR)$(vardir)
+ $(mkinstalldirs) $(DESTDIR)$(AX25_LOCALSTATEDIR)/mheard
@list='$(varfiles)'; for p in $$list; do \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(vardir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(vardir)/$$p; \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(AX25_LOCALSTATEDIR)/mheard/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(AX25_LOCALSTATEDIR)/mheard/$$p; \
done
@@ -22,7 +22,13 @@ bin_PROGRAMS = mheard
LDADD = $(AX25_LIB)
axspawn_LDADD = $(AX25_LIB) $(UTIL_LIB)
-man_MANS = ax25.4 ax25d.conf.5 axports.5 axspawn.conf.5 rxecho.conf.5 \
+INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \
+ -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\"
+
+AX25_SYSCONFDIR=$(sysconfdir)/ax25/
+AX25_LOCALSTATEDIR=$(localstatedir)/ax25/
+
+man_MANS = ax25.4 ax25d.conf.5 axspawn.conf.5 rxecho.conf.5 \
ax25d.8 axctl.8 axparms.8 axspawn.8 beacon.8 bpqparms.8 \
mheard.1 mheardd.8 rxecho.8
diff --git a/ax25/Makefile.in b/ax25/Makefile.in
index 2331d82..5117b0a 100644
--- a/ax25/Makefile.in
+++ b/ax25/Makefile.in
@@ -78,7 +78,13 @@ bin_PROGRAMS = mheard
LDADD = $(AX25_LIB)
axspawn_LDADD = $(AX25_LIB) $(UTIL_LIB)
-man_MANS = ax25.4 ax25d.conf.5 axports.5 axspawn.conf.5 rxecho.conf.5 ax25d.8 axctl.8 axparms.8 axspawn.8 beacon.8 bpqparms.8 mheard.1 mheardd.8 rxecho.8
+INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\"
+
+
+AX25_SYSCONFDIR = $(sysconfdir)/ax25/
+AX25_LOCALSTATEDIR = $(localstatedir)/ax25/
+
+man_MANS = ax25.4 ax25d.conf.5 axspawn.conf.5 rxecho.conf.5 ax25d.8 axctl.8 axparms.8 axspawn.8 beacon.8 bpqparms.8 mheard.1 mheardd.8 rxecho.8
EXTRA_DIST = $(man_MANS) $(etcfiles) $(varfiles)
@@ -553,15 +559,15 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
installconf:
- $(mkinstalldirs) $(DESTDIR)$(etcdir)
+ $(mkinstalldirs) $(DESTDIR)$(AX25_SYSCONFDIR)
@list='$(etcfiles)'; for p in $$list; do \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p; \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(AX25_SYSCONFDIR)/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(AX25_SYSCONFDIR)/$$p; \
done
- $(mkinstalldirs) $(DESTDIR)$(vardir)
+ $(mkinstalldirs) $(DESTDIR)$(AX25_LOCALSTATEDIR)/mheard
@list='$(varfiles)'; for p in $$list; do \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(vardir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(vardir)/$$p; \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(AX25_LOCALSTATEDIR)/mheard/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(AX25_LOCALSTATEDIR)/mheard/$$p; \
done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/ax25/ax25d.c b/ax25/ax25d.c
index 86d3895..9be7d34 100644
--- a/ax25/ax25d.c
+++ b/ax25/ax25d.c
@@ -679,7 +679,7 @@ static int ReadConfig(void)
int af_type = 0; /* Keep GCC happy */
int line = 0;
int hunt = TRUE, error = FALSE;
- int iamdigi = FALSE, yes;
+ int iamdigi = FALSE;
int parameters = 0;
memset(&axl_defaults, 0, sizeof(axl_defaults));
diff --git a/ax25/axctl.c b/ax25/axctl.c
index 3d7c780..3b453c3 100644
--- a/ax25/axctl.c
+++ b/ax25/axctl.c
@@ -89,6 +89,8 @@ int main(int argc, char **argv)
else if (strcmp(argv[4], "-paclen") == 0)
ax25_ctl.cmd = AX25_PACLEN;
}
+
+ ax25_ctl.digi_count = 0;
if (ioctl(s, SIOCAX25CTLCON, &ax25_ctl) != 0) {
perror("axctl: SIOAX25CTLCON");
diff --git a/ax25/axports.5 b/ax25/axports.5
deleted file mode 100644
index fc61a47..0000000
--- a/ax25/axports.5
+++ /dev/null
@@ -1,62 +0,0 @@
-.TH AXPORTS 5 "15 October 1996" Linux "Linux Programmer's Manual"
-.SH NAME
-axports \- AX.25 port configuration file.
-.SH DESCRIPTION
-.LP
-.B Axports
-is an ASCII file that contains information about each of the physical AX.25
-ports that are to be used. When dealing with an AX.25 utility such as
-.B call,
-it takes an optional argument that is the port name. This port name is a
-reference to the line within
-.B axports,
-which has that name as its first argument. The information on each line
-contains enough information to bind the command to a particular physical AX.25
-interface, this binding is done by matching the callsign on the line in
-.B axports
-with the callsign of the port set by
-.B kissattach.
-.LP
-The lines within
-.B axports
-must either be a comment line, which starts with a # in the first column, or
-a port description in the following format, each field being delimited by
-white space:
-.sp
-.RS
-name callsign speed paclen window description
-.RE
-.sp
-The field descriptions are:
-.sp
-.RS
-.TP 14
-.B name
-is the unique identifier of the port. This is the name given as the port
-argument of many of the AX.25 support programs.
-.TP 14
-.B callsign
-the callsign of the physical interface to bind to.
-.TP 14
-.B speed
-this is the speed of interface, a value of zero means that no speed will be
-set by kissattach(8).
-.TP 14
-.B paclen
-is the default maximum packet size for this interface.
-.TP 14
-.B window
-the default window size for this interface.
-.TP 14
-.B description
-a free format description of this interface, this field extends to the end
-of the line. This field may contain spaces.
-.RE
-.SH FILES
-.LP
-/etc/ax25/axports
-.SH "SEE ALSO"
-.BR call (1),
-.BR ax25 (4),
-.BR axparms (8),
-.BR kissattach (8).
diff --git a/ax25/axspawn.c b/ax25/axspawn.c
index 35724a4..ab5ab92 100644
--- a/ax25/axspawn.c
+++ b/ax25/axspawn.c
@@ -113,7 +113,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
-#include <strings.h>
+#include <string.h>
#include <ctype.h>
#include <termios.h>
#include <unistd.h>
diff --git a/ax25/mheardd.c b/ax25/mheardd.c
index a2b3b21..2d98fad 100644
--- a/ax25/mheardd.c
+++ b/ax25/mheardd.c
@@ -8,8 +8,6 @@
#include <errno.h>
#include <fcntl.h>
-#include <config.h>
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/param.h>
@@ -19,22 +17,16 @@
#include <net/ethernet.h>
#include <netinet/in.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/daemon.h>
#include <netax25/mheard.h>
+#include <config.h>
+
#include "../pathnames.h"
#define KISS_MASK 0x0F
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 04:29:08 +0000