X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=e7bda8bc5f5fe9ce82c1b9660813da17d3fea980;hb=4a653ce0cd9140d4a7878cdf8ee835841ca039eb;hp=15f92c477e8aaf6d5cb2919aecd456d42c876177;hpb=7ab16be46aa296e9fba7b063c074bb020a9eb462;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 15f92c47..e7bda8bc 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -848,7 +848,7 @@ sub normal
 			} else {
 				my $ref = DXUser->get_current($field[1]);
 				if ($ref && $ref->is_clx) {
-					route($field[1], pc84($field[2], $field[1], $field[2], $field[3]));
+					$self->route($field[1], pc84($field[2], $field[1], $field[2], $field[3]));
 				} else {
 					$self->route($field[1], $line);
 				}
@@ -871,7 +871,7 @@ sub normal
 			} else {
 				my $ref = DXUser->get_current($field[1]);
 				if ($ref && $ref->is_clx) {
-					route($field[1], pc85($field[2], $field[1], $field[2], $field[3]));
+					$self->route($field[1], pc85($field[2], $field[1], $field[2], $field[3]));
 				} else {
 					$self->route($field[1], $line);
 				}
@@ -1040,7 +1040,7 @@ sub normal
 				if ($ref && $ref->is_clx) {
 					$self->route($field[1], $line);
 				} else {
-					route($field[1], pc34($field[2], $field[1], $field[4]));
+					$self->route($field[1], pc34($field[2], $field[1], $field[4]));
 				}
 			}
 			return;
@@ -1068,7 +1068,7 @@ sub normal
 				if ($ref && $ref->is_clx) {
 					$self->route($field[1], $line);
 				} else {
-					route($field[1], pc35($field[2], $field[1], $field[4]));
+					$self->route($field[1], pc35($field[2], $field[1], $field[4]));
 				}
 			}
 			return;
@@ -1225,6 +1225,19 @@ sub send_wwv_spot
 	my $line = shift;
 	my @dxchan = DXChannel->get_all();
 	my $dxchan;
+	my ($wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
+	my @dxcc = Prefix::extract($_[7]);
+	if (@dxcc > 0) {
+		$wwv_dxcc = $dxcc[1]->dxcc;
+		$wwv_itu = $dxcc[1]->itu;
+		$wwv_cq = $dxcc[1]->cq;						
+	}
+	@dxcc = Prefix::extract($_[8]);
+	if (@dxcc > 0) {
+		$org_dxcc = $dxcc[1]->dxcc;
+		$org_itu = $dxcc[1]->itu;
+		$org_cq = $dxcc[1]->cq;						
+	}
 	
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
@@ -1233,7 +1246,7 @@ sub send_wwv_spot
 		my ($filter, $hops);
 
 		if ($dxchan->{wwvfilter}) {
-			 ($filter, $hops) = $dxchan->{wwvfilter}->it(@_, $self->{call} );
+			($filter, $hops) = $dxchan->{wwvfilter}->it(@_, $self->{call}, $wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq);
 			 next unless $filter;
 		}
 		if ($dxchan->is_node) {
@@ -1269,6 +1282,19 @@ sub send_wcy_spot
 	my $line = shift;
 	my @dxchan = DXChannel->get_all();
 	my $dxchan;
+	my ($wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
+	my @dxcc = Prefix::extract($_[11]);
+	if (@dxcc > 0) {
+		$wcy_dxcc = $dxcc[1]->dxcc;
+		$wcy_itu = $dxcc[1]->itu;
+		$wcy_cq = $dxcc[1]->cq;						
+	}
+	@dxcc = Prefix::extract($_[12]);
+	if (@dxcc > 0) {
+		$org_dxcc = $dxcc[1]->dxcc;
+		$org_itu = $dxcc[1]->itu;
+		$org_cq = $dxcc[1]->cq;						
+	}
 	
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
@@ -1277,7 +1303,7 @@ sub send_wcy_spot
 		my ($filter, $hops);
 
 		if ($dxchan->{wcyfilter}) {
-			 ($filter, $hops) = $dxchan->{wcyfilter}->it(@_, $self->{call} );
+			($filter, $hops) = $dxchan->{wcyfilter}->it(@_, $self->{call}, $wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq);
 			 next unless $filter;
 		}
 		if ($dxchan->is_clx || $dxchan->is_spider || $dxchan->is_dxnet) {
@@ -1332,6 +1358,21 @@ sub send_announce
 	
 	Log('ann', $target, $_[0], $text);
 
+	# obtain country codes etc 
+	my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
+	my @dxcc = Prefix::extract($_[0]);
+	if (@dxcc > 0) {
+		$ann_dxcc = $dxcc[1]->dxcc;
+		$ann_itu = $dxcc[1]->itu;
+		$ann_cq = $dxcc[1]->cq;						
+	}
+	@dxcc = Prefix::extract($_[4]);
+	if (@dxcc > 0) {
+		$org_dxcc = $dxcc[1]->dxcc;
+		$org_itu = $dxcc[1]->itu;
+		$org_cq = $dxcc[1]->cq;						
+	}
+
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
 	foreach $dxchan (@dxchan) {
@@ -1339,19 +1380,6 @@ sub send_announce
 		my ($filter, $hops);
 
 		if ($dxchan->{annfilter}) {
-			my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-			my @dxcc = Prefix::extract($_[0]);
-			if (@dxcc > 0) {
-				$ann_dxcc = $dxcc[1]->dxcc;
-				$ann_itu = $dxcc[1]->itu;
-				$ann_cq = $dxcc[1]->cq;						
-			}
-			@dxcc = Prefix::extract($_[4]);
-			if (@dxcc > 0) {
-				$org_dxcc = $dxcc[1]->dxcc;
-				$org_itu = $dxcc[1]->itu;
-				$org_cq = $dxcc[1]->cq;						
-			}
 			($filter, $hops) = $dxchan->{annfilter}->it(@_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
 			next unless $filter;
 		} 
@@ -1447,12 +1475,20 @@ sub route
 	unless ($dxchan) {
 		my $cl = DXCluster->get_exact($call);
 		$dxchan = $cl->dxchan if $cl;
+		if (ref $dxchan) {
+			if (ref $self && $dxchan eq $self) {
+				dbg('chan', "PCPROT: Trying to route back to source, dropped");
+				return;
+			}
+		}
 	}
 	if ($dxchan) {
 		my $routeit = adjust_hops($dxchan, $line);   # adjust its hop count by node name
 		if ($routeit) {
 			$dxchan->send($routeit);
 		}
+	} else {
+		dbg('chan', "PCPROT: No route available, dropped");
 	}
 }