From: djk <djk>
Date: Mon, 19 Jun 2000 11:33:51 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: R_1_43~43
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=840ace66681d2d615ff412e1197fa613f262c1f2;p=spider.git

*** empty log message ***
---

diff --git a/Changes b/Changes
index ca70e71c..48c55d35 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+19Jun00=======================================================================
+1. move ann_dup, spot_dup etc to dup_ann, dup_spots etc
+2. made mode 3 the default line ending convention for all out going connects
+via telnet in client.pl
 18Jun00=======================================================================
 1. fixed line ending ambiguities (I think) for telnet connections. Well 
 actually only really band aided it. It works but isn't how I want it. 
diff --git a/cmd/Aliases b/cmd/Aliases
index 8b006a98..7b3d1a50 100644
--- a/cmd/Aliases
+++ b/cmd/Aliases
@@ -26,9 +26,9 @@ package CmdAlias;
 	  '^\?', 'apropos', 'apropos',
 	],
     'a' => [
-	  '^ann.*/full', 'announce full', 'announce', 
-	  '^ann.*/sysop', 'announce sysop', 'announce',
-	  '^ann.*/(.*)$', 'announce $1', 'announce',
+	  '^ann\w*/full', 'announce full', 'announce', 
+	  '^ann\w*/sysop', 'announce sysop', 'announce',
+	  '^ann\w*/(.*)$', 'announce $1', 'announce',
 	],
 	'b' => [
 	],
diff --git a/cmd/show/ann_dups.pl b/cmd/show/ann_dups.pl
deleted file mode 100644
index 26428c1b..00000000
--- a/cmd/show/ann_dups.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# show a list of all the outstanding spot dups
-# for debugging really
-#
-# Copyright (c) 2000 Dirk Koopman G1TLH
-#
-# $Id$
-#
-my $self = shift;
-return (1, $self->msg('e5')) unless $self->priv >= 9; 
-return (1, AnnTalk::listdups);
diff --git a/cmd/show/dup_ann.pl b/cmd/show/dup_ann.pl
new file mode 100644
index 00000000..e065fbc9
--- /dev/null
+++ b/cmd/show/dup_ann.pl
@@ -0,0 +1,11 @@
+#
+# show a list of all the outstanding announce dups
+# for debugging really
+#
+# Copyright (c) 2000 Dirk Koopman G1TLH
+#
+# $Id$
+#
+my $self = shift;
+return (1, $self->msg('e5')) unless $self->priv >= 9; 
+return (1, AnnTalk::listdups);
diff --git a/cmd/show/dup_spots.pl b/cmd/show/dup_spots.pl
new file mode 100644
index 00000000..5bd9b174
--- /dev/null
+++ b/cmd/show/dup_spots.pl
@@ -0,0 +1,11 @@
+#
+# show a list of all the outstanding spot dups
+# for debugging really
+#
+# Copyright (c) 2000 Dirk Koopman G1TLH
+#
+# $Id$
+#
+my $self = shift;
+return (1, $self->msg('e5')) unless $self->priv >= 9; 
+return (1, Spot::listdups);
diff --git a/cmd/show/dup_wcy.pl b/cmd/show/dup_wcy.pl
new file mode 100644
index 00000000..a493b7f2
--- /dev/null
+++ b/cmd/show/dup_wcy.pl
@@ -0,0 +1,11 @@
+#
+# show a list of all the outstanding wcy dups
+# for debugging really
+#
+# Copyright (c) 2000 Dirk Koopman G1TLH
+#
+# $Id$
+#
+my $self = shift;
+return (1, $self->msg('e5')) unless $self->priv >= 9; 
+return (1, WCY::listdups);
diff --git a/cmd/show/dup_wwv.pl b/cmd/show/dup_wwv.pl
new file mode 100644
index 00000000..4bd5ad3f
--- /dev/null
+++ b/cmd/show/dup_wwv.pl
@@ -0,0 +1,11 @@
+#
+# show a list of all the outstanding wwv dups
+# for debugging really
+#
+# Copyright (c) 2000 Dirk Koopman G1TLH
+#
+# $Id$
+#
+my $self = shift;
+return (1, $self->msg('e5')) unless $self->priv >= 9; 
+return (1, Geomag::listdups);
diff --git a/cmd/show/spot_dups.pl b/cmd/show/spot_dups.pl
deleted file mode 100644
index 5bd9b174..00000000
--- a/cmd/show/spot_dups.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# show a list of all the outstanding spot dups
-# for debugging really
-#
-# Copyright (c) 2000 Dirk Koopman G1TLH
-#
-# $Id$
-#
-my $self = shift;
-return (1, $self->msg('e5')) unless $self->priv >= 9; 
-return (1, Spot::listdups);
diff --git a/cmd/show/wwv_dups.pl b/cmd/show/wwv_dups.pl
deleted file mode 100644
index bf0cbe75..00000000
--- a/cmd/show/wwv_dups.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# show a list of all the outstanding spot dups
-# for debugging really
-#
-# Copyright (c) 2000 Dirk Koopman G1TLH
-#
-# $Id$
-#
-my $self = shift;
-return (1, $self->msg('e5')) unless $self->priv >= 9; 
-return (1, Geomag::listdups);
diff --git a/perl/client.pl b/perl/client.pl
index 611c313d..7a539cf2 100755
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -229,7 +229,7 @@ sub doconnect
 		$sock->option_accept(Dont => TELOPT_ECHO, Wont => TELOPT_ECHO);
 		$sock->open($host) or die "Can't connect to $host port $port $!";
 		$sock->binmode(1);
-		$mode = ($port == 23) ? 2 : 3;
+		$mode = 3;
 	} elsif ($sort eq 'ax25' || $sort eq 'prog') {
 		my @args = split /\s+/, $line;
 		$rfh = new IO::File;
diff --git a/perl/cluster.pl b/perl/cluster.pl
index 4da018b0..b96cf370 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -71,7 +71,7 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.42";				# the version no of the software
+$version = "1.43";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
 @outstanding_connects = ();     # list of outstanding connects