From: djk <djk>
Date: Thu, 15 Jul 1999 08:51:43 +0000 (+0000)
Subject: 1. Changed grepdbg to accept a regexp. More useful (to me anyway).
X-Git-Tag: R_1_31~13
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=118cbdbcf7e06d022a3030670c0e70b05bd8c5b3;p=spider.git

1. Changed grepdbg to accept a regexp. More useful (to me anyway).
2. Altered init command so that it doesn't send PC21s down the initted
channel.
---

diff --git a/Changes b/Changes
index 88cb4b0f..ed3f545e 100644
--- a/Changes
+++ b/Changes
@@ -1,22 +1,27 @@
+15Jul99=======================================================================
+1. Changed grepdbg to accept a regexp. More useful (to me anyway).
+2. Altered init command so that it doesn't send PC21s down the initted 
+channel.
 10Jul99=======================================================================
 1. added an explicit disconnect from my side for already connected calls. This
 appears to have fixed a problem where if two consoles connect at the same time
 with the same (sysop?) callsign the cluster would stop.
 2. added some debugging in the Message handler to allow more state to be seen.
+3. Message handler now seems to work better for longer and doesn't spew out
+PC42 aborts with quite such gay abandon.
 05Jul99=======================================================================
 1. added stat/msg and stat/cluster commands to allow me to poke about inside
 the msg and cluster node tables.
 04Jul99=======================================================================
-1. removed silly 'new message has arrived' to connected nodes if message is
+1. removed silly 'new message has arrived' to connected nodes 
 2. added a ! command to the console.pl program; works like the bash shell.
-addressed to the node call.
 01Jul99=======================================================================
 1. Altered priv to 5 for connect.pl to match disconnect for nodes
 29Jun99=======================================================================
 1. fixed merge command that I broke.
 2. added some randomness in waittimes for aborted outgoing messages 
 3. Message Queuing now only occurs every 5 minutes (configurable if anyone 
-wants to write the command for doing it) nad on receipt of a PC16. This is
+wants to write the command for doing it) and on receipt of a PC16. This is
 a further attempt at sorting the crossing of messages!
 4. a PC33 will cause another attempt at queuing. If you are on a roll, keep
 going!
diff --git a/cmd/init.pl b/cmd/init.pl
index bfcb9bd2..36309e93 100644
--- a/cmd/init.pl
+++ b/cmd/init.pl
@@ -1,6 +1,10 @@
 #
 # reinit a cluster connection
 #
+# Copyright (c) 1999 Dirk Koopman G1TLH
+#
+# $Id$
+#
 my ($self, $line) = @_;
 my @calls = split /\s+/, $line;
 my $call;
@@ -18,12 +22,14 @@ foreach $call (@calls) {
 			# first clear out any nodes on this dxchannel
 			my @gonenodes = map { $_->dxchan == $dxchan ? $_ : () } DXNode::get_all();
 			foreach my $node (@gonenodes) {
-				next if $dxchan == $DXProt::me;
+				next if $node->dxchan == $DXProt::me;
+				next if $node->dxchan == $dxchan;
 				DXProt::broadcast_ak1a(DXProt::pc21($node->call, 'Gone, re-init') , $dxchan) unless $dxchan->{isolate}; 
 				$node->del();
 			}
 			$dxchan->send(DXProt::pc38());
 			$dxchan->send(DXProt::pc18());
+			$dxchan->state('init');
 			push @out, $self->msg('init1', $call);
 		} 
 	} else {
diff --git a/perl/grepdbg b/perl/grepdbg
index c44fc92b..250a898b 100755
--- a/perl/grepdbg
+++ b/perl/grepdbg
@@ -43,7 +43,7 @@ for my $arg (@ARGV) {
 		last;
 	}
 }
-die "usage: dispdbg [[-nnn] ..] <string>\n" unless  $string;
+die "usage: grepdbg [[-nnn] ..] <regexp>\n" unless  $string;
 
 push @list, "0" unless @list;
 for my $entry (@list) {
@@ -54,7 +54,7 @@ for my $entry (@list) {
 		while (<$fh>) {
 			my $line = $_;
 			chomp $line;
-			if ($line =~ m{\Q$string}io) {
+			if ($line =~ m{$string}io) {
 				my @line =  split '\^', $line;
 				my $t = shift @line;
 				print atime($t), ' ', join('^', @line), "\n";