X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=2d43b0f07cae85dc472abeb4f01ec307847fb6fc;hb=8832827e5bec29e9a9e2a62201c6ac7baf9b2fa3;hp=a9dbd86d48eb2de34b2f2646ce14cbef07048568;hpb=0de1a272bd43c887020d9e03a4f56f44ab4bb080;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index a9dbd86d..2d43b0f0 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -80,12 +80,14 @@ $count = 0;
 		  wcyfilter => '5,WCY Filt-out',
 		  spotsfilter => '5,Spot Filt-out',
 		  routefilter => '5,Route Filt-out',
+		  rbnfilter => '5,RBN Filt-out',
 		  pc92filter => '5,PC92 Route Filt-out',
 		  inannfilter => '5,Ann Filt-inp',
 		  inwwvfilter => '5,WWV Filt-inp',
 		  inwcyfilter => '5,WCY Filt-inp',
 		  inspotsfilter => '5,Spot Filt-inp',
 		  inroutefilter => '5,Route Filt-inp',
+		  inrbnfilter => '5,RBN Filt-inp',
 		  inpc92filter => '5,PC92 Route Filt-inp',
 		  passwd => '9,Passwd List,yesno',
 		  pingint => '5,Ping Interval ',
@@ -161,11 +163,12 @@ 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};
 	$self->{func} = "";
+	$self->{width} = 80;
 
 	# add in all the dxcc, itu, zone info
 	my @dxcc = Prefix::extract($call);
@@ -300,62 +303,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
@@ -501,7 +500,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();
 }
@@ -680,7 +679,7 @@ sub broadcast_list
 		
 		if ($sort eq 'dx') {
 		    next unless $dxchan->{dx};
-			($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
+			($filter) = $dxchan->{spotsfilter}->it($fref) if $dxchan->{spotsfilter} && ref $fref;
 			next unless $filter;
 		}
 		next if $sort eq 'ann' && !$dxchan->{ann} && $s !~ /^To\s+LOCAL\s+de\s+(?:$main::myalias|$main::mycall)/i;
@@ -720,6 +719,8 @@ sub process_one
 			$self->enhanced($line);
 		} elsif ($sort eq 'A' || $sort eq 'O' || $sort eq 'W') {
 			$self->start($line, $sort);
+		} elsif ($sort eq 'C') {
+			$self->width($line); # change number of columns
 		} elsif ($sort eq 'Z') {
 			$self->disconnect;
 		} elsif ($sort eq 'D') {