remove warnings from $BRANCH lines for 5.8.0

[spider.git] / perl / DXChannel.pm

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 01d2135e657e834eac2bf100d5e61f2e443f6036..e6e0d1b42634e365022c66650788ce979c36e862 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -85,7 +85,7 @@ $count = 0;
                  inwcyfilter => '5,WCY Filt-inp',
                  inspotsfilter => '5,Spot Filt-inp',
                  inroutefilter => '5,Route Filt-inp',
-                 passwd => '9,Passwd List,parray',
+                 passwd => '9,Passwd List,yesno',
                  pingint => '5,Ping Interval ',
                  nopings => '5,Ping Obs Count',
                  lastping => '5,Ping last sent,atime',
@@ -106,11 +106,17 @@ $count = 0;
                  disconnecting => '9,Disconnecting,yesno',
                  ann_talk => '0,Suppress Talk Anns,yesno',
                  metric => '1,Route metric',
+                 badcount => '1,Bad Word Count',
+                 edit => '7,Edit Function',
+                 registered => '9,Registered?,yesno',
+                 prompt => '0,Required Prompt',
+                 version => '1,Node Version',
+                 build => '1,Node Build',
                 );
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -490,12 +496,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();
        }
        
@@ -506,18 +512,20 @@ sub rspfcheck
 {
        my ($self, $flag, $node, $user) = @_;
        my $nref = Route::Node::get($node);
-       if ($nref) {
-           if ($nref->dxchan == $self) {
+       my $dxchan = $nref->dxchan if $nref;
+       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;
 }
@@ -544,7 +552,7 @@ sub broadcast_nodes
 
 # broadcast a message to all clusters ignoring isolation
 # [except those mentioned after buffer]
-sub broadcast_all_ak1a
+sub broadcast_all_nodes
 {
        my $s = shift;                          # the line to be rebroadcast
        my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)