add an RBN line to progress

[spider.git] / perl / DXChannel.pm

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index f8af917e7e3241b43b5e3b03a8c802355fa735c0..2c82b1371fd31c4367e05521c1eab1fb4876777a 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -125,7 +125,7 @@ $count = 0;
                  inqueue => '9,Input Queue,parray',
                  next_pc92_update => '9,Next PC92 Update,atime',
                  next_pc92_keepalive => '9,Next PC92 KeepAlive,atime',
-                 hostname => '0,(Proxied)Hostname',
+                 hostname => '0,Hostname',
                 );
 
 $maxerrors = 20;                               # the maximum number of concurrent errors allowed before disconnection
@@ -161,7 +161,7 @@ sub alloc
                $self->{group} = $user->group;
                $self->{sort} = $user->sort;
        }
-       $self->{startt} = $self->{t} = time;
+       $self->{startt} = $self->{t} = $main::systime;
        $self->{state} = 0;
        $self->{oldstate} = 0;
        $self->{lang} = $main::lang if !$self->{lang};
@@ -300,62 +300,58 @@ sub del
 # is it a bbs
 sub is_bbs
 {
-       my $self = shift;
-       return $self->{sort} eq 'B';
+       return $_[0]->{sort} eq 'B';
 }
 
 sub is_node
 {
-       my $self = shift;
-       return $self->{sort} =~ /^[ACRSX]$/;
+       return $_[0]->{sort} =~ /^[ACRSX]$/;
 }
 # is it an ak1a node ?
 sub is_ak1a
 {
-       my $self = shift;
-       return $self->{sort} eq 'A';
+       return $_[0]->{sort} eq 'A';
 }
 
 # is it a user?
 sub is_user
 {
-       my $self = shift;
-       return $self->{sort} =~ /^[UW]$/;
+       return $_[0]->{sort} =~ /^[UW]$/;
 }
 
 # is it a clx node
 sub is_clx
 {
-       my $self = shift;
-       return $self->{sort} eq 'C';
+       return $_[0]->{sort} eq 'C';
 }
 
 # it is a Web connected user
 sub is_web
 {
-       my $self = shift;
-       return $self->{sort} eq 'W';
+       return $_[0]->{sort} eq 'W';
 }
 
 # is it a spider node
 sub is_spider
 {
-       my $self = shift;
-       return $self->{sort} eq 'S';
+       return $_[0]->{sort} eq 'S';
 }
 
 # is it a DXNet node
 sub is_dxnet
 {
-       my $self = shift;
-       return $self->{sort} eq 'X';
+       return $_[0]->{sort} eq 'X';
 }
 
 # is it a ar-cluster node
 sub is_arcluster
 {
-       my $self = shift;
-       return $self->{sort} eq 'R';
+       return $_[0]->{sort} eq 'R';
+}
+
+sub is_rbn
+{
+       return $_[0]->{sort} eq 'N';
 }
 
 # for perl 5.004's benefit
@@ -431,7 +427,7 @@ sub send                                            # this is always later and always data
        my $call = $self->{call};
 
        foreach my $l (@_) {
-               for (ref $l ? @$l : $l) {
+               for (ref($l) eq 'ARRAY' ? @$l : $l) {
                        my @lines = split /\n/;
                        for (@lines) {
                                $conn->send_later("D$call|$_");
@@ -501,7 +497,7 @@ sub disconnect
        my $self = shift;
        my $user = $self->{user};
        
-       $user->close() if defined $user;
+       $user->close($self->{startt}, $self->{hostname}) if defined $user;
        $self->{conn}->disconnect if $self->{conn};
        $self->del();
 }
@@ -683,6 +679,11 @@ sub broadcast_list
                        ($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
                        next unless $filter;
                }
+               if ($sort eq 'rbn') {
+                   next unless $dxchan->{dx}; # this is deliberate!
+                       ($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
+                       next unless $filter;
+               }
                next if $sort eq 'ann' && !$dxchan->{ann} && $s !~ /^To\s+LOCAL\s+de\s+(?:$main::myalias|$main::mycall)/i;
                next if $sort eq 'wwv' && !$dxchan->{wwv};
                next if $sort eq 'wcy' && !$dxchan->{wcy};