From: minima <minima>
Date: Sun, 4 Nov 2001 16:35:08 +0000 (+0000)
Subject: fix K1XX's problem with node eq user callsigns on PC11s
X-Git-Tag: R_1_49~24
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6ca67477693e7f808e972df82b860398ee8706df;p=spider.git

fix K1XX's problem with node eq user callsigns on PC11s
---

diff --git a/Changes b/Changes
index a16c7ca3..0140f812 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+04Nov01=======================================================================
+1. Allow the user to equal the node in RSPF checks (this allows spots and 
+stuff with the origin and spotter to be the same (although it is STRONGLY 
+recommended that they are NOT!!! [hint hint]).
 02Nov01=======================================================================
 1. fixed some Aliasing problems, but this whole area will have to be addressed
 more comprehensively.
diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 58401551..8dae7cd6 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -493,12 +493,12 @@ sub decode_input
 	# the above regexp must work
 	unless (defined $sort && defined $call && defined $line) {
 #		$data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
-		dbg("DUFF Line on $chcall: $data") if isdbg('err');
+		dbg("DUFF Line on $chcall: $data");
 		return ();
 	}
 
 	if(ref($dxchan) && $call ne $chcall) {
-		dbg("DUFF Line come in for $call on wrong channel $chcall") if isdbg('err');
+		dbg("DUFF Line come in for $call on wrong channel $chcall");
 		return();
 	}
 	
@@ -513,15 +513,16 @@ sub rspfcheck
 	if ($nref && $dxchan) {
 	    if ($dxchan == $self) {
 			return 1 unless $user;
+			return 1 if $user eq $node;
 			my @users = $nref->users;
 			return 1 if @users == 0 || grep $user eq $_, @users;
-			dbg("RSPF: $user not on $node") if isdbg('rspf');
+			dbg("RSPF: $user not on $node") if isdbg('chanerr');
 		} else {
-			dbg("RSPF: Shortest path for $node is " . $nref->dxchan->{call}) if isdbg('rspf');
+			dbg("RSPF: Shortest path for $node is " . $nref->dxchan->{call}) if isdbg('chanerr');
 		}
 	} else {
 		return 1 if $flag;
-		dbg("RSPF: required $node not found" ) if isdbg('rspf');
+		dbg("RSPF: required $node not found" ) if isdbg('chanerr');
 	}
 	return 0;
 }