X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=30a7897092e20a61f50fddf8807bf268075a6c7e;hb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;hp=3e32f429cfe39e745bae74f3f3283ce160a342d4;hpb=586cbb347e7639f5575b48572e75140501a109c0;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 3e32f429..30a78970 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -31,11 +31,13 @@ use DXUtil;
 use DXVars;
 use DXDebug;
 use Filter;
+use Prefix;
 
 use strict;
-use vars qw(%channels %valid @ISA);
+use vars qw(%channels %valid @ISA $count);
 
 %channels = ();
+$count = 0;
 
 %valid = (
 		  call => '0,Callsign',
@@ -57,7 +59,7 @@ use vars qw(%channels %valid @ISA);
 		  talk => '0,Want Talk,yesno',
 		  ann => '0,Want Announce,yesno',
 		  here => '0,Here?,yesno',
-		  confmode => '0,In Conference?,yesno',
+		  conf => '0,In Conference?,yesno',
 		  dx => '0,DX Spots,yesno',
 		  redirect => '0,Redirect messages to',
 		  lang => '0,Language',
@@ -76,10 +78,12 @@ use vars qw(%channels %valid @ISA);
 		  wwvfilter => '5,WWV Filter',
 		  wcyfilter => '5,WCY Filter',
 		  spotsfilter => '5,Spot Filter',
+		  routefilter => '5,route Filter',
 		  inannfilter => '5,Input Ann Filter',
 		  inwwvfilter => '5,Input WWV Filter',
 		  inwcyfilter => '5,Input WCY Filter',
 		  inspotsfilter => '5,Input Spot Filter',
+		  inroutefilter => '5,Input Route Filter',
 		  passwd => '9,Passwd List,parray',
 		  pingint => '5,Ping Interval ',
 		  nopings => '5,Ping Obs Count',
@@ -90,26 +94,32 @@ use vars qw(%channels %valid @ISA);
 		  talklist => '0,Talk List,parray',
 		  cluster => '5,Cluster data',
 		  isbasic => '9,Internal Connection', 
+		  errors => '9,Errors',
+		  route => '9,Route Data',
+		  dxcc => '0,Country Code',
+		  itu => '0,ITU Zone',
+		  cq => '0,CQ Zone',
+		  enhanced => '5,Enhanced Client,yesno',
+		  senddbg => '8,Sending Debug,yesno',
 		 );
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 # object destruction
 sub DESTROY
 {
 	my $self = shift;
-	undef $self->{user};
-	undef $self->{conn};
-	undef $self->{loc};
-	undef $self->{pagedata};
-	undef $self->{group};
-	undef $self->{delayed};
-	undef $self->{annfilter};
-	undef $self->{wwvfilter};
-	undef $self->{spotsfilter};
-	undef $self->{inannfilter};
-	undef $self->{inwwvfilter};
-	undef $self->{inspotsfilter};
-	undef $self->{passwd};
-	undef $self->{node};
+	for (keys %$self) {
+		if (ref($self->{$_})) {
+			delete $self->{$_};
+		}
+	}
+	dbg("DXChannel $self->{call} destroyed ($count)") if isdbg('chan');
+	$count--;
 }
 
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
@@ -135,6 +145,16 @@ sub alloc
 	$self->{lang} = $main::lang if !$self->{lang};
 	$self->{func} = "";
 
+	# add in all the dxcc, itu, zone info
+	my @dxcc = Prefix::extract($call);
+	if (@dxcc > 0) {
+		$self->{dxcc} = $dxcc[1]->dxcc;
+		$self->{itu} = $dxcc[1]->itu;
+		$self->{cq} = $dxcc[1]->cq;						
+	}
+
+	$count++;
+	dbg("DXChannel $self->{call} created ($count)") if isdbg('chan');
 	bless $self, $pkg; 
 	return $channels{$call} = $self;
 }
@@ -285,7 +305,30 @@ sub send_now
         my @lines = split /\n/;
 		for (@lines) {
 			$conn->send_now("$sort$call|$_");
-			dbg('chan', "-> $sort $call $_");
+			dbg("-> $sort $call $_") if isdbg('chan');
+		}
+	}
+	$self->{t} = time;
+}
+
+#
+# send later with letter (more control)
+#
+
+sub send_later
+{
+	my $self = shift;
+	my $conn = $self->{conn};
+	return unless $conn;
+	my $sort = shift;
+	my $call = $self->{call};
+	
+	for (@_) {
+#		chomp;
+        my @lines = split /\n/;
+		for (@lines) {
+			$conn->send_later("$sort$call|$_");
+			dbg("-> $sort $call $_") if isdbg('chan');
 		}
 	}
 	$self->{t} = time;
@@ -306,7 +349,7 @@ sub send						# this is always later and always data
         my @lines = split /\n/;
 		for (@lines) {
 			$conn->send_later("D$call|$_");
-			dbg('chan', "-> D $call $_");
+			dbg("-> D $call $_") if isdbg('chan');
 		}
 	}
 	$self->{t} = time;
@@ -354,7 +397,7 @@ sub state
 		$self->{oldstate} = $self->{state};
 		$self->{state} = shift;
 		$self->{func} = '' unless defined $self->{func};
-		dbg('state', "$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n");
+		dbg("$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n") if isdbg('state');
 
 		# if there is any queued up broadcasts then splurge them out here
 		if ($self->{delayed} && ($self->{state} eq 'prompt' || $self->{state} eq 'talk')) {
@@ -370,9 +413,7 @@ sub disconnect
 {
 	my $self = shift;
 	my $user = $self->{user};
-	my $call = $self->{call};
 	
-	$self->finish;
 	$user->close() if defined $user;
 	$self->{conn}->disconnect;
 	$self->del();
@@ -443,12 +484,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('err', "DUFF Line on $chcall: $data");
+		dbg("DUFF Line on $chcall: $data") if isdbg('err');
 		return ();
 	}
 
 	if(ref($dxchan) && $call ne $chcall) {
-		dbg('err', "DUFF Line come in for $call on wrong channel $chcall" );
+		dbg("DUFF Line come in for $call on wrong channel $chcall") if isdbg('err');
 		return();
 	}