X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=d26795c406a3921c3387a2e6e08f87b4992ac6d2;hb=61148e50735498a356ffd95b5a79faf1dc6b9d82;hp=30fd979073680473a33fa010e893ba7dee337a60;hpb=f3b790031ac6a43912e3bc20c6e97f2f65501094;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 30fd9790..d26795c4 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -42,12 +42,11 @@ $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
-use vars qw($me $pc11_max_age $pc23_max_age $last_pc50
+use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
 			$last_hour $last10 %eph  %pings %rcmds $ann_to_talk
-			%nodehops $baddx $badspotter $badnode $censorpc
+			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
 			$allowzero $decode_dk0wcy $send_opernam @checklist);
 
-$me = undef;					# the channel id for this cluster
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
 $pc23_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc23
 
@@ -62,6 +61,10 @@ $badspotter = new DXHash "badspotter";
 $badnode = new DXHash "badnode";
 $last10 = $last_pc50 = time;
 $ann_to_talk = 1;
+$rspfcheck = 1;
+$eph_restime = 180;
+$eph_info_restime = 60*60;
+$eph_pc34_restime = 30;
 
 @checklist = 
 (
@@ -184,14 +187,17 @@ sub init
 {
 	my $user = DXUser->get($main::mycall);
 	$DXProt::myprot_version += $main::version*100;
-	$me = DXProt->new($main::mycall, 0, $user); 
-	$me->{here} = 1;
-	$me->{state} = "indifferent";
+	$main::me = DXProt->new($main::mycall, 0, $user); 
+	$main::me->{here} = 1;
+	$main::me->{state} = "indifferent";
 	do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
 	confess $@ if $@;
-	$me->{sort} = 'S';    # S for spider
-	$me->{priv} = 9;
-#	$Route::Node::me->adddxchan($me);
+	$main::me->{sort} = 'S';    # S for spider
+	$main::me->{priv} = 9;
+	$main::me->{metric} = 0;
+	$main::me->{pingave} = 0;
+	
+#	$Route::Node::me->adddxchan($main::me);
 }
 
 #
@@ -205,7 +211,7 @@ sub new
 	# add this node to the table, the values get filled in later
 	my $pkg = shift;
 	my $call = shift;
-	$main::routeroot->add($call, '0000', Route::here(1)) if $call ne $main::mycall;
+	$main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
 
 	return $self;
 }
@@ -235,6 +241,9 @@ sub start
 	$self->{here} = 1;
 	$self->{width} = 80;
 
+	# sort out registration
+	$self->{registered} = 1;
+
 	# get the output filters
 	$self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
 	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0);
@@ -253,6 +262,7 @@ sub start
 	# set unbuffered and no echo
 	$self->send_now('B',"0");
 	$self->send_now('E',"0");
+	$self->conn->echo(0) if $self->conn->can('echo');
 	
 	# ping neighbour node stuff
 	my $ping = $user->pingint;
@@ -261,6 +271,7 @@ sub start
 	$self->{nopings} = $user->nopings || 2;
 	$self->{pingtime} = [ ];
 	$self->{pingave} = 999;
+	$self->{metric} ||= 100;
 	$self->{lastping} = $main::systime;
 
 	# send initialisation string
@@ -275,7 +286,7 @@ sub start
 	$self->tell_login('loginn');
 
 	# run a script send the output to the debug file
-	my $script = new Script(lc $call);
+	my $script = new Script(lc $call) || new Script('node_default');
 	$script->run($self) if $script;
 }
 
@@ -316,6 +327,9 @@ sub normal
  SWITCH: {
 		if ($pcno == 10) {		# incoming talk
 
+			# rsfp check
+			return if $rspfcheck and !$self->rspfcheck(0, $field[6], $field[1]);
+			
 			# will we allow it at all?
 			if ($censorpc) {
 				my @bad;
@@ -384,6 +398,9 @@ sub normal
 				}
 			}
 			
+			# rsfp check
+#			return if $rspfcheck and !$self->rspfcheck(1, $field[7], $field[6]);
+
 			# if this is a 'nodx' node then ignore it
 			if ($badnode->in($field[7])) {
 				dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
@@ -405,7 +422,7 @@ sub normal
 			}
 
 			# is it 'baddx'
-			if ($baddx->in($field[2])) {
+			if ($baddx->in($field[2]) || BadWords::check($field[2]) || $field[2] =~ /COCK/) {
 				dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
 				return;
 			}
@@ -417,10 +434,6 @@ sub normal
 				dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chanerr');
 				return;
 			}
-			if (Spot::dup($field[1], $field[2], $d, $field[5])) {
-				dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
-				return;
-			}
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[5])) {
@@ -439,6 +452,11 @@ sub normal
 				}
 			}
 			
+			if (Spot::dup($field[1], $field[2], $d, $field[5])) {
+				dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
+				return;
+			}
+
 			# add it 
 			Spot::add(@spot);
 
@@ -513,12 +531,11 @@ sub normal
 		}
 		
 		if ($pcno == 12) {		# announces
+
+#			return if $rspfcheck and !$self->rspfcheck(1, $field[5], $field[1]);
+
 			# announce duplicate checking
 			$field[3] =~ s/^\s+//;  # remove leading blanks
-			if (AnnTalk::dup($field[1], $field[2], $field[3])) {
-				dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
-				return;
-			}
 
 			if ($censorpc) {
 				my @bad;
@@ -565,6 +582,11 @@ sub normal
 		
 		if ($pcno == 16) {		# add a user
 
+			if (eph_dup($line)) {
+				dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
+				return;
+			}
+
 			# general checks
 			my $dxchan;
 			my $ncall = $field[1];
@@ -574,17 +596,17 @@ sub normal
 				dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
 				return;
 			}
-			$dxchan = DXChannel->get($ncall);
-			if ($dxchan && $dxchan ne $self) {
-				dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
-				return;
-			}
 			my $parent = Route::Node::get($ncall); 
 			unless ($parent) {
 				dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
 				return;
 			}
-			
+			$dxchan = $parent->dxchan;
+			if ($dxchan && $dxchan ne $self) {
+				dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+				return;
+			}
+
 			# input filter if required
 			return unless $self->in_filter_route($parent);
 			
@@ -629,11 +651,6 @@ sub normal
 				$user->lastin($main::systime) unless DXChannel->get($call);
 				$user->put;
 			}
-
-			if (eph_dup($line)) {
-				dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
-				return;
-			}
 			
 			# queue up any messages (look for privates only)
 			DXMsg::queue_msg(1) if $self->state eq 'normal';     
@@ -647,17 +664,17 @@ sub normal
 			my $ncall = $field[2];
 			my $ucall = $field[1];
 
+			if (eph_dup($line)) {
+				dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
+				return;
+			}
+
 			eph_del_regex("^PC16.*$ncall.*$ucall");
 			
 			if ($ncall eq $main::mycall) {
 				dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
 				return;
 			}
-			$dxchan = DXChannel->get($ncall);
-			if ($dxchan && $dxchan ne $self) {
-				dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
-				return;
-			}
 
 			my $uref = Route::User::get($ucall);
 			unless ($uref) {
@@ -670,17 +687,17 @@ sub normal
 				return;
 			}			
 
-			# input filter if required
-			return unless $self->in_filter_route($parent);
-			
-			my @rout = $parent->del_user($uref);
-
-			if (eph_dup($line)) {
-				dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
+			$dxchan = $parent->dxchan;
+			if ($dxchan && $dxchan ne $self) {
+				dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
 				return;
 			}
 
-			$self->route_pc17($parent, @rout) if @rout;
+			# input filter if required
+			return unless $self->in_filter_route($parent);
+			
+			$parent->del_user($uref);
+			$self->route_pc17($parent, $uref);
 			return;
 		}
 		
@@ -700,6 +717,11 @@ sub normal
 			my $i;
 			my $newline = "PC19^";
 
+			if (eph_dup($line)) {
+				dbg("PCPROT: dup PC19 detected") if isdbg('chanerr');
+				return;
+			}
+
 			# new routing list
 			my @rout;
 			my $parent = Route::Node::get($self->{call});
@@ -720,11 +742,18 @@ sub normal
 				eph_del_regex("^PC(?:21\^$call|17\^[^\^]+\^$call)");
 				
 				# check for sane parameters
-				$ver = 5000 if $ver eq '0000';
+#				$ver = 5000 if $ver eq '0000';
 				next if $ver < 5000; # only works with version 5 software
 				next if length $call < 3; # min 3 letter callsigns
 				next if $call eq $main::mycall;
 
+				# check that this PC19 isn't trying to alter the wrong dxchan
+				my $dxchan = DXChannel->get($call);
+				if ($dxchan && $dxchan != $self) {
+					dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr');
+					return;
+				}
+
 				# update it if required
 				my $r = Route::Node::get($call);
 				my $flags = Route::here($here)|Route::conf($conf);
@@ -776,10 +805,6 @@ sub normal
 				$user->put;
 			}
 
-			if (eph_dup($line)) {
-				dbg("PCPROT: dup PC19 detected") if isdbg('chanerr');
-				return;
-			}
 
 			$self->route_pc19(@rout) if @rout;
 			return;
@@ -796,6 +821,19 @@ sub normal
 		if ($pcno == 21) {		# delete a cluster from the list
 			my $call = uc $field[1];
 
+			if (eph_dup($line)) {
+				dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
+				return;
+			}
+
+			# if I get a PC21 from the same callsign as self then treat it
+			# as a PC39: I have gone away
+			if ($call eq $self->call) {
+				$self->disconnect(1);
+				eph_del_regex("^PC(?:1[679]|21).*$field[1]");
+				return;
+			}
+
 			eph_del_regex("^PC1[79].*$call");
 			
 			my @rout;
@@ -805,14 +843,16 @@ sub normal
 				$self->disconnect;
 				return;
 			}
-			my $node = Route::Node::get($call);
 			if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
-				if ($call eq $self->{call}) {
-					dbg("PCPROT: Trying to disconnect myself with PC21") if isdbg('chanerr');
-					return;
-				}
-
+				my $node = Route::Node::get($call);
 				if ($node) {
+
+					my $dxchan = DXChannel->get($call);
+					if ($dxchan && $dxchan != $self) {
+						dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr');
+						return;
+					}
+
 					# input filter it
 					return unless $self->in_filter_route($node);
 
@@ -824,11 +864,6 @@ sub normal
 				return;
 			}
 
-			if (eph_dup($line)) {
-				dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
-				return;
-			}
-
 			$self->route_pc21(@rout) if @rout;
 			return;
 		}
@@ -849,6 +884,8 @@ sub normal
 				}
 			}
 
+			return if $rspfcheck and !$self->rspfcheck(1, $field[8], $field[7]);
+
 			# do some de-duping
 			my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
 			my $sfi = unpad($field[3]);
@@ -933,6 +970,7 @@ sub normal
 		}
 
 		if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
+			return if $pcno == 49 && eph_dup($line);
 			if ($pcno == 49 || $field[1] eq $main::mycall) {
 				DXMsg::process($self, $line);
 			} else {
@@ -942,11 +980,16 @@ sub normal
 		}
 		
 		if ($pcno == 34 || $pcno == 36) { # remote commands (incoming)
-			$self->process_rcmd($field[1], $field[2], $field[2], $field[3]);
+			if (eph_dup($line, $eph_pc34_restime)) {
+				dbg("PCPROT: dupe") if isdbg('chanerr');
+			} else {
+				$self->process_rcmd($field[1], $field[2], $field[2], $field[3]);
+			}
 			return;
 		}
 		
 		if ($pcno == 35) {		# remote command replies
+			eph_del_regex("^PC35\^$field[2]\^$field[1]\^");
 			$self->process_rcmd_reply($field[1], $field[2], $field[1], $field[3]);
 			return;
 		}
@@ -970,6 +1013,11 @@ sub normal
 		if ($pcno == 41) {		# user info
 			my $call = $field[1];
 
+			if (eph_dup($line, $eph_info_restime)) {
+				dbg("PCPROT: dupe") if isdbg('chanerr');
+				return;
+			}
+			
 			# input filter if required
 #			my $ref = Route::get($call) || Route->new($call);
 #			return unless $self->in_filter_route($ref);
@@ -1000,11 +1048,11 @@ sub normal
 			} elsif ($field[2] == 4) {
 				$user->homenode($field[3]);
 			} elsif ($field[2] == 5) {
-				if (is_qra($field[3])) {
-					my ($lat, $long) = DXBearing::qratoll($field[3]);
+				if (is_qra(uc $field[3])) {
+					my ($lat, $long) = DXBearing::qratoll(uc $field[3]);
 					$user->lat($lat);
 					$user->long($long);
-					$user->qra($field[3]);
+					$user->qra(uc $field[3]);
 				} else {
 					dbg('PCPROT: not a valid QRA locator') if isdbg('chanerr');
 					return;
@@ -1013,9 +1061,13 @@ sub normal
 			$user->lastoper($main::systime);   # to cut down on excessive for/opers being generated
 			$user->put;
 
+			unless ($self->{isolate}) {
+				DXChannel::broadcast_nodes($line, $self); # send it to everyone but me
+			}
+
 #  perhaps this IS what we want after all
 #			$self->route_pc41($ref, $call, $field[2], $field[3], $field[4]);
-#			return;
+			return;
 		}
 
 		if ($pcno == 43) {
@@ -1123,7 +1175,7 @@ sub normal
 				return;
 			}
 			@field = map { unpad($_) } @field;
-			if (WCY::dup($d,@field[3..7])) {
+			if (WCY::dup($d)) {
 				dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chanerr');
 				return;
 			}
@@ -1132,7 +1184,7 @@ sub normal
 
 			my $rep;
 			eval {
-				$rep = Local::wwv($self, @field[1..12]);
+				$rep = Local::wcy($self, @field[1..12]);
 			};
 			# dbg("Local::wcy error $@") if isdbg('local') if $@;
 			return if $rep;
@@ -1166,7 +1218,7 @@ sub normal
 		dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
 	} else {
 		unless ($self->{isolate}) {
-			broadcast_ak1a($line, $self); # send it to everyone but me
+			DXChannel::broadcast_nodes($line, $self); # send it to everyone but me
 		}
 	}
 }
@@ -1184,14 +1236,14 @@ sub process
 	
 	# send out a pc50 on EVERY channel all at once
 	if ($t >= $last_pc50 + $DXProt::pc50_interval) {
-		$pc50s = pc50($me, scalar DXChannel::get_all_users);
+		$pc50s = pc50($main::me, scalar DXChannel::get_all_users);
 		eph_dup($pc50s);
 		$last_pc50 = $t;
 	}
 
 	foreach $dxchan (@dxchan) {
 		next unless $dxchan->is_node();
-		next if $dxchan == $me;
+		next if $dxchan == $main::me;
 
 		# send the pc50
 		$dxchan->send($pc50s) if $pc50s;
@@ -1240,7 +1292,7 @@ sub send_dx_spot
 	# 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) {
-		next if $dxchan == $me;
+		next if $dxchan == $main::me;
 		next if $dxchan == $self && $self->is_node;
 		$dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call});
 	}
@@ -1303,7 +1355,7 @@ sub send_wwv_spot
 	# 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) {
-		next if $dxchan == $me;
+		next if $dxchan == $main::me;
 		next if $dxchan == $self && $self->is_node;
 		my $routeit;
 		my ($filter, $hops);
@@ -1350,7 +1402,7 @@ sub send_wcy_spot
 	# 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) {
-		next if $dxchan == $me;
+		next if $dxchan == $main::me;
 		next if $dxchan == $self;
 
 		$dxchan->wcy($line, $self->{isolate}, @_, $self->{call}, $wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq);
@@ -1422,12 +1474,17 @@ sub send_announce
 		}
 	}
 
+	if (AnnTalk::dup($_[0], $_[1], $_[2])) {
+		dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+		return;
+	}
+
 	Log('ann', $target, $_[0], $text);
 
 	# 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) {
-		next if $dxchan == $me;
+		next if $dxchan == $main::me;
 		next if $dxchan == $self && $self->is_node;
 		$dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
 	}
@@ -1520,103 +1577,13 @@ sub route
 	if ($dxchan) {
 		my $routeit = adjust_hops($dxchan, $line);   # adjust its hop count by node name
 		if ($routeit) {
-			$dxchan->send($routeit) unless $dxchan == $me;
+			$dxchan->send($routeit) unless $dxchan == $main::me;
 		}
 	} else {
 		dbg("PCPROT: No route available, dropped") if isdbg('chanerr');
 	}
 }
 
-# broadcast a message to all clusters taking into account isolation
-# [except those mentioned after buffer]
-sub broadcast_ak1a
-{
-	my $s = shift;				# the line to be rebroadcast
-	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = DXChannel::get_all_nodes();
-	my $dxchan;
-	
-	# send it if it isn't the except list and isn't isolated and still has a hop count
-	foreach $dxchan (@dxchan) {
-		next if grep $dxchan == $_, @except;
-		next if $dxchan == $me;
-		
-		my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
-		$dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit;
-	}
-}
-
-# broadcast a message to all clusters ignoring isolation
-# [except those mentioned after buffer]
-sub broadcast_all_ak1a
-{
-	my $s = shift;				# the line to be rebroadcast
-	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = DXChannel::get_all_nodes();
-	my $dxchan;
-	
-	# send it if it isn't the except list and isn't isolated and still has a hop count
-	foreach $dxchan (@dxchan) {
-		next if grep $dxchan == $_, @except;
-		next if $dxchan == $me;
-
-		my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
-		$dxchan->send($routeit);
-	}
-}
-
-# broadcast to all users
-# storing the spot or whatever until it is in a state to receive it
-sub broadcast_users
-{
-	my $s = shift;				# the line to be rebroadcast
-	my $sort = shift;           # the type of transmission
-	my $fref = shift;           # a reference to an object to filter on
-	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = DXChannel::get_all_users();
-	my $dxchan;
-	my @out;
-	
-	foreach $dxchan (@dxchan) {
-		next if grep $dxchan == $_, @except;
-		push @out, $dxchan;
-	}
-	broadcast_list($s, $sort, $fref, @out);
-}
-
-# broadcast to a list of users
-sub broadcast_list
-{
-	my $s = shift;
-	my $sort = shift;
-	my $fref = shift;
-	my $dxchan;
-	
-	foreach $dxchan (@_) {
-		my $filter = 1;
-		next if $dxchan == $me;
-		
-		if ($sort eq 'dx') {
-		    next unless $dxchan->{dx};
-			($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};
-		next if $sort eq 'wx' && !$dxchan->{wx};
-
-		$s =~ s/\a//og unless $dxchan->{beep};
-
-		if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
-			$dxchan->send($s);	
-		} else {
-			$dxchan->delay($s);
-		}
-	}
-}
-
-
 #
 # obtain the hops from the list for this callsign and pc no 
 #
@@ -1835,7 +1802,7 @@ sub talk
 	
 	$line =~ s/\^/\\5E/g;			# remove any ^ characters
 	$self->send(DXProt::pc10($from, $to, $via, $line, $origin));
-	Log('talk', $self->call, $from, $via?$via:$main::mycall, $line) unless $origin && $origin ne $main::mycall;
+	Log('talk', $to, $from, $via?$via:$self->call, $line) unless $origin && $origin ne $main::mycall;
 }
 
 # send it if it isn't the except list and isn't isolated and still has a hop count
@@ -1893,7 +1860,7 @@ sub broadcast_route
 	unless ($self->{isolate}) {
 		foreach $dxchan (@dxchan) {
 			next if $dxchan == $self;
-			next if $dxchan == $me;
+			next if $dxchan == $main::me;
 			$dxchan->send_route($generate, @_);
 		}
 	}
@@ -1957,12 +1924,13 @@ sub in_filter_route
 sub eph_dup
 {
 	my $s = shift;
+	my $t = shift || $eph_restime;
 	my $r;
 
 	# chop the end off
 	$s =~ s/\^H\d\d?\^?\~?$//;
 	$r = 1 if exists $eph{$s};    # pump up the dup if it keeps circulating
-	$eph{$s} = $main::systime;
+	$eph{$s} = $main::systime + $t;
 	return $r;
 }
 
@@ -1982,11 +1950,26 @@ sub eph_clean
 	my ($key, $val);
 	
 	while (($key, $val) = each %eph) {
-		if ($main::systime - $val > 180) {
+		if ($main::systime >= $val) {
 			delete $eph{$key};
 		}
 	}
 }
 
+sub eph_list
+{
+	my ($key, $val);
+	my @out;
+
+	while (($key, $val) = each %eph) {
+		push @out, $key, $val;
+	}
+	return @out;
+}
+
+sub run_cmd
+{
+	goto &DXCommandmode::run_cmd;
+}
 1;
 __END__