9 files changed, 24 insertions, 14 deletions
diff --git a/tcpip/Makefile.am b/tcpip/Makefile.am
index 88e07fd..e0835e3 100644
--- a/tcpip/Makefile.am
+++ b/tcpip/Makefile.am
@@ -1,5 +1,5 @@
 
-etcfiles = rip98.conf ttylinkd.conf
+etcfiles = rip98d.conf ttylinkd.conf
 
 installconf:
 	$(mkinstalldirs) $(DESTDIR)$(AX25_SYSCONFDIR)
@@ -10,7 +10,7 @@ installconf:
 
 sbin_PROGRAMS = rip98d ttylinkd
 
-man_MANS = rip98.conf.5 rip98d.8 ttylinkd.conf.5 ttylinkd.8
+man_MANS = rip98d.conf.5 rip98d.8 ttylinkd.conf.5 ttylinkd.8
 
 docdir=${prefix}/doc/ax25-tools
 doc_DATA= ttylinkd.README ttylinkd.INSTALL
diff --git a/tcpip/Makefile.in b/tcpip/Makefile.in
index e1f5cdb..8237541 100644
--- a/tcpip/Makefile.in
+++ b/tcpip/Makefile.in
@@ -61,7 +61,9 @@ AWK = @AWK@
 AX25IO_LIB = @AX25IO_LIB@
 AX25_LIB = @AX25_LIB@
 CC = @CC@
+CXX = @CXX@
 DMASCC = @DMASCC@
+FLTK_LIB = @FLTK_LIB@
 MAKEINFO = @MAKEINFO@
 NCURSES_LIB = @NCURSES_LIB@
 PACKAGE = @PACKAGE@
@@ -69,11 +71,11 @@ UTIL_LIB = @UTIL_LIB@
 VERSION = @VERSION@
 Z_LIB = @Z_LIB@
 
-etcfiles = rip98.conf ttylinkd.conf
+etcfiles = rip98d.conf ttylinkd.conf
 
 sbin_PROGRAMS = rip98d ttylinkd
 
-man_MANS = rip98.conf.5 rip98d.8 ttylinkd.conf.5 ttylinkd.8
+man_MANS = rip98d.conf.5 rip98d.8 ttylinkd.conf.5 ttylinkd.8
 
 docdir = ${prefix}/doc/ax25-tools
 doc_DATA = ttylinkd.README ttylinkd.INSTALL
@@ -100,6 +102,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_LIBS = @X_LIBS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
 rip98d_OBJECTS =  rip98d.o rip98r.o rip98t.o
 rip98d_DEPENDENCIES = 
 rip98d_LDFLAGS = 
diff --git a/tcpip/rip98d.8 b/tcpip/rip98d.8
index 0ee12dc..9c67c58 100644
--- a/tcpip/rip98d.8
+++ b/tcpip/rip98d.8
@@ -16,7 +16,7 @@ In operation
 that each neighbour that also uses RIP98 must be listed. RIP98 is not a
 broadcast protocol and each neighbour is individually contacted. Any
 incoming RIP98 message is also validated against this list. The list of
-neighbours is held in /etc/ax25/rip98.conf, and each line is
+neighbours is held in /etc/ax25/rip98d.conf, and each line is
 either the name or the dotted decimal IP address of the neighbour.
 .LP
 The time interval between RIP98 transmissions is set to one hour by default
@@ -48,7 +48,7 @@ Display the version.
 .nf
 /proc/net/route
 .br
-/etc/ax25/rip98.conf
+/etc/ax25/rip98d.conf
 .fi
 .SH "SEE ALSO"
 .BR rip98.conf (5),
diff --git a/tcpip/rip98.conf b/tcpip/rip98d.conf
index 3574d56..3574d56 100644
--- a/tcpip/rip98.conf
+++ b/tcpip/rip98d.conf
diff --git a/tcpip/rip98.conf.5 b/tcpip/rip98d.conf.5
index 7e2d3a4..77d15e2 100644
--- a/tcpip/rip98.conf.5
+++ b/tcpip/rip98d.conf.5
@@ -1,9 +1,9 @@
 .TH RIP98.CONF 5 "2 August 1996" Linux "Linux Programmer's Manual"
 .SH NAME
-rip98.conf \- control RIP98 routing messages.
+rip98d.conf \- control RIP98 routing messages.
 .SH DESCRIPTION
 .LP
-.B Rip98.conf
+.B Rip98d.conf
 controls the transmission of RIP98 routing messages. RIP98 is not a
 broadcast protocol but instead is transmitted individually to each other
 known RIP98 capable system. The list of these systems is kept in the RIP98
@@ -11,7 +11,7 @@ configuration file as a list of host names or IP numbers that are to be
 transmitted to, and messages received from.
 .SH FILES
 .LP
-/etc/ax25/rip98.conf
+/etc/ax25/rip98d.conf
 .SH "SEE ALSO"
 .BR arp (8),
 .BR ifconfig (8),
diff --git a/tcpip/ttylinkd.8 b/tcpip/ttylinkd.8
index 7b2379f..bd427b6 100644
--- a/tcpip/ttylinkd.8
+++ b/tcpip/ttylinkd.8
@@ -49,5 +49,8 @@ There is still some need for some checking of who is still logged on.
 The daemon may hang if you disconnect from it strangely.
 .LP
 There is no real way of working out what is going on with talkd.
+.LP
+If you do not have a talk daemon going on the specified host then the program
+will tend to sit there and do nothing.
 .SH AUTHOR
-Craig Small VK2XLZ <csmall@gonzo.triode.net.au>
+Craig Small VK2XLZ <csmall@small.dropbear.id.au>
diff --git a/tcpip/ttylinkd.README b/tcpip/ttylinkd.README
index 40d8003..eecdf0c 100644
--- a/tcpip/ttylinkd.README
+++ b/tcpip/ttylinkd.README
@@ -28,7 +28,7 @@ BUGS / TO DO
 CREDITS
 =======
 This program and documentation Copyright (C) 1997 Craig Small VK2XLZ
-(csmall@gonzo.triode.net.au), (csmall@gonzo.vk2xlz.ampr.org).
+<csmall@small.dropbear.id.au>
 Please read the file ttylinkd.c for full notice.
 Thanks to Tomi Manninen OH2BNS for the AX.25 patches in 0.02
-Thanks to Tomi again for the short callsign fix in 0.03
-\ No newline at end of file
+Thanks to Tomi again for the short callsign fix in 0.03
diff --git a/tcpip/ttylinkd.c b/tcpip/ttylinkd.c
index aeef59a..69642c5 100644
--- a/tcpip/ttylinkd.c
+++ b/tcpip/ttylinkd.c
@@ -1,6 +1,6 @@
 /*
  * ttylinkd:  A ttylink daemon using the ntalkd protocol.
- * Copyright (C) 1996,1197 Craig Small (csmall@gonzo.triode.net.au)
+ * Copyright (C) 1996,1197,2000 Craig Small (csmall@small.dropbear.id.au)
  *
  * 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
@@ -24,6 +24,7 @@
   *  04/03/97   cs  Added config file, no more defines.
   *  09/03/97   tjd Enhanced to allow specifying user@hostname.wherever.
   *                 rather than be confined to localhost.
+  *  04/01/00   cs  Minor stuff with email addresses
   */
 #include <ctype.h>
 #include <signal.h>
diff --git a/tcpip/ttylinkd.conf.5 b/tcpip/ttylinkd.conf.5
index ecba3a1..7af2dd8 100644
--- a/tcpip/ttylinkd.conf.5
+++ b/tcpip/ttylinkd.conf.5
@@ -18,5 +18,5 @@ launched. If you do not supply a hostname then the local host will be assumed.
 .SH SEE ALSO
 .BR ttylinkd (8).
 .SH AUTHOR
-Craig Small VK2XLZ <csmall@gonzo.triode.net.au>
+Craig Small VK2XLZ <csmall@small.dropbear.id.au>