X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=bc27395b209944be8341a8749fa4438a939ccd90;hb=5d77cab91d705fde9a580511732845327cbd0987;hp=69eb2228a194f4323638bf0b32cd6b7b005df6b1;hpb=ab811a0c902225075a9bd69749f65594079433a9;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 69eb2228..bc27395b 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -32,7 +32,6 @@ use DXHash;
 use Route;
 use Route::Node;
 use Script;
-use RouteDB;
 use DXProtHandle;
 
 use strict;
@@ -73,7 +72,7 @@ $pingint = 5*60;
 $obscount = 2;
 $chatdupeage = 20 * 60;
 $chatimportfn = "$main::root/chat_import";
-$pc19_version = 5454;			# the visible version no for outgoing PC19s generated from pc59
+$pc19_version = 5455;			# the visible version no for outgoing PC19s generated from pc59
 $pc92_update_period = 4*60*60;	# the period between outgoing PC92 C updates
 $pc92_short_update_period = 15*60; # shorten the update period after a connection or start up
 $pc92_extnode_update_period = 1*60*60; # the update period for external nodes
@@ -311,7 +310,8 @@ sub start
 	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0);
 	$self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'node_default', 0);
 	$self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'node_default', 0) ;
-	$self->{routefilter} = Filter::read_in('route', $call, 0) || Filter::read_in('route', 'node_default', 0) unless $self->{isolate} ;
+	$self->{routefilter} = Filter::read_in('route', $call, 0) || Filter::read_in('route', 'node_default', 0) unless $self->{isolate};
+	$self->{pc92filter} = Filter::read_in('pc92', $call, 0) || Filter::read_in('pc92', 'node_default', 0) unless $self->{isolate} ;
 
 
 	# get the INPUT filters (these only pertain to Clusters)
@@ -320,12 +320,8 @@ sub start
 	$self->{inwcyfilter} = Filter::read_in('wcy', $call, 1) || Filter::read_in('wcy', 'node_default', 1);
 	$self->{inannfilter} = Filter::read_in('ann', $call, 1) || Filter::read_in('ann', 'node_default', 1);
 	$self->{inroutefilter} = Filter::read_in('route', $call, 1) || Filter::read_in('route', 'node_default', 1) unless $self->{isolate};
-	# if there is no route input filter then specify a default one.
-	# obviously this can be changed later by the sysop.
-	if (!$self->{inroutefilter}) {
-		my $dxcc = $self->dxcc;
-		$Route::filterdef->cmd($self, 'route', 'accept', "input by_dxcc $dxcc" );
-	}
+	$self->{inpc92filter} = Filter::read_in('pc92', $call, 0) || Filter::read_in('pc92', 'node_default', 0) unless $self->{isolate} ;
+
 
 	# set unbuffered and no echo
 	$self->send_now('B',"0");
@@ -1040,19 +1036,6 @@ sub route
 		}
 	}
 
-	# try the backstop method
-	unless ($dxchan) {
-		my $rcall = RouteDB::get($call);
-		if ($rcall) {
-			if ($self && $rcall eq $self->{call}) {
-				dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
-				return;
-			}
-			$dxchan = DXChannel::get($rcall);
-			dbg("route: $call -> $rcall using RouteDB" ) if isdbg('route') && $dxchan;
-		}
-	}
-
 	if ($dxchan) {
 		my $routeit = adjust_hops($dxchan, $line);   # adjust its hop count by node name
 		if ($routeit) {
@@ -1231,7 +1214,7 @@ sub disconnect
 	# do routing stuff, remove me from routing table
 	my $node = Route::Node::get($call);
 
-	RouteDB::delete_interface($call);
+	Route::delete_interface($call);
 
 	# unbusy and stop and outgoing mail
 	my $mref = DXMsg::get_busy($call);