X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=d8dad2c3280ad54b6716dedf6e57aa968515ba59;hb=86c5d79248c5e263a20e39c85610d531bbb3b37d;hp=f00a436adea5184da5c1e5f9ac79fd4e62ebd5bb;hpb=cce337f777f0b7668cceebb40527fd1e106729c9;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index f00a436a..d8dad2c3 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -214,7 +214,6 @@ sub init
 	my $user = DXUser->get($main::mycall);
 	die "User $main::mycall not setup or disappeared RTFM" unless $user;
 	
-	$myprot_version += $main::version*100;
 	$main::me = DXProt->new($main::mycall, 0, $user); 
 	$main::me->{here} = 1;
 	$main::me->{state} = "indifferent";
@@ -223,7 +222,7 @@ sub init
 	$main::me->{metric} = 0;
 	$main::me->{pingave} = 0;
 	$main::me->{registered} = 1;
-	$main::me->{version} = 5252 + $main::version;
+	$main::me->{version} = $myprot_version + int ($main::version * 100);
 	$main::me->{build} = $main::build;
 	$main::me->{lastcf} = $main::me->{lasthello} = time;
 }
@@ -239,7 +238,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, '5000', Route::here(1)) if $call ne $main::mycall;
+	$main::routeroot->add($call, '5000', 1) if $call ne $main::mycall;
 	return $self;
 }
 
@@ -701,14 +700,14 @@ sub handle_16
 	RouteDB::update($ncall, $self->{call});
 
 	# do we believe this call? 
-	unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
-		if (my $ivp = Investigate::get($ncall, $self->{call})) {
-			$ivp->store_pcxx($pcno,$line,$origin,@_);
-		} else {
-			dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
-		}
-		return;
-	}
+#	unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
+#		if (my $ivp = Investigate::get($ncall, $self->{call})) {
+#			$ivp->store_pcxx($pcno,$line,$origin,@_);
+#		} else {
+#			dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
+#		}
+#		return;
+#	}
 
 	if (eph_dup($line)) {
 		dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
@@ -719,62 +718,7 @@ sub handle_16
 
 	# if there is a parent, proceed, otherwise if there is a latent PC19 in the PC19list, 
 	# fix it up in the routing tables and issue it forth before the PC16
-	unless ($parent) {
-		my $nl = $pc19list{$ncall};
-
-		if ($nl && @_ > 3) { # 3 because of the hop count!
-
-			# this is a new (remembered) node, now attach it to me if it isn't in filtered
-			# and we haven't disallowed it
-			my $user = DXUser->get_current($ncall);
-			if (!$user) {
-				$user = DXUser->new($ncall);
-				$user->sort('A');
-				$user->priv(1);	# I have relented and defaulted nodes
-				$user->lockout(1);
-				$user->homenode($ncall);
-				$user->node($ncall);
-			}
-
-			my $wantpc19 = $user->wantroutepc19;
-			if ($wantpc19 || !defined $wantpc19) {
-				my $new = Route->new($ncall); # throw away
-				if ($self->in_filter_route($new)) {
-					my @nrout;
-					for (@$nl) {
-						$parent = Route::Node::get($_->[0]);
-						$dxchan = $parent->dxchan if $parent;
-						if ($dxchan && $dxchan ne $self) {
-							dbg("PCPROT: PC19 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
-							$parent = undef;
-						}
 	if ($parent) {
-							my $r = $parent->add($ncall, $_->[1], $_->[2]);
-							push @nrout, $r unless @nrout;
-						}
-					}
-					$user->wantroutepc19(1) unless defined $wantpc19; # for now we work on the basis that pc16 = real route 
-					$user->lastin($main::systime) unless DXChannel::get($ncall);
-					$user->put;
-						
-					# route the pc19 - this will cause 'stuttering PC19s' for a while
-					$self->route_pc19($origin, $line, @nrout) if @nrout ;
-					$parent = Route::Node::get($ncall);
-					unless ($parent) {
-						dbg("PCPROT: lost $ncall after sending PC19 for it?");
-						return;
-					}
-				} else {
-					return;
-				}
-				delete $pc19list{$ncall};
-			}
-		} else {
-			dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
-			return;
-		}
-	} else {
-
 		$dxchan = $parent->dxchan;
 		if ($dxchan && $dxchan ne $self) {
 			dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
@@ -783,13 +727,16 @@ sub handle_16
 
 		# input filter if required
 		return unless $self->in_filter_route($parent);
+	} else {
+		dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
+		return;
 	}
 
 	# is he under the control of the new protocol?
-	if ($parent && $parent->np) {
-		dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr');
-		return;
-	}
+#	if ($parent && $parent->np) {
+#		dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr');
+#		return;
+#	}
 		
 	my $i;
 	my @rout;
@@ -811,7 +758,7 @@ sub handle_16
 		}
 		
 		$r = Route::User::get($call);
-		my $flags = Route::here($here)|Route::conf($conf);
+		my $flags = $here;
 		
 		if ($r) {
 			my $au = $r->addparent($parent);					
@@ -834,7 +781,7 @@ sub handle_16
 		$user->lastin($main::systime) unless DXChannel::get($call);
 		$user->put;
 	}
-	$self->route_pc16($origin, $line, $parent, @rout) if @rout;
+	$self->route_pc16($origin, $line, $parent, @rout) if @rout && (DXChannel::get($parent->call) || $parent->np);
 }
 		
 # remove a user
@@ -863,51 +810,50 @@ sub handle_17
 	RouteDB::delete($ncall, $self->{call});
 
 	# do we believe this call? 
-	unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
-		if (my $ivp = Investigate::get($ncall, $self->{call})) {
-			$ivp->store_pcxx($pcno,$line,$origin,@_);
-		} else {
-			dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
-		}
-		return;
-	}
+#	unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
+#		if (my $ivp = Investigate::get($ncall, $self->{call})) {
+#			$ivp->store_pcxx($pcno,$line,$origin,@_);
+#		} else {
+#			dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
+#		}
+#		return;
+#	}
 
 	my $uref = Route::User::get($ucall);
 	unless ($uref) {
 		dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
+		return;
 	}
 	my $parent = Route::Node::get($ncall);
 	unless ($parent) {
 		dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr');
+		return;
 	}			
 
-	$dxchan = $parent->dxchan if $parent;
+	$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;
 	}
 
 	# is he under the control of the new protocol?
-	if ($parent && $parent->np) {
-		dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr');
-		return;
-	}
+#	if ($parent && $parent->np) {
+#		dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr');
+#		return;
+#	}
 
 	# input filter if required and then remove user if present
-	if ($parent) {
+	if ($parent && !$parent->np) {
 #		return unless $self->in_filter_route($parent);	
 		$parent->del_user($uref) if $uref;
-	} else {
-		$parent = Route->new($ncall);  # throw away
-	}
+	} 
 
 	if (eph_dup($line)) {
 		dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
 		return;
 	}
 
-	$uref = Route->new($ucall) unless $uref; # throw away
-	$self->route_pc17($origin, $line, $parent, $uref);
+	$self->route_pc17($origin, $line, $parent, $uref) if (DXChannel::get($parent->call) || $parent->np);
 }
 		
 # link request
@@ -966,26 +912,6 @@ sub handle_19
 		return;
 	}
 
-	# if the origin isn't the same as the INTERFACE, then reparent, creating nodes as necessary
-	if ($origin ne $self->call) {
-		my $op = Route::Node::get($origin);
-		unless ($op) {
-			$op = $parent->add($origin, 5000, Route::here(1));
-			my $user = DXUser->get_current($origin);
-			if (!$user) {
-				$user = DXUser->new($origin);
-				$user->priv(1);		# I have relented and defaulted nodes
-				$user->lockout(1);
-				$user->homenode($origin);
-				$user->node($origin);
-				$user->wantroutepc19(1);
-			}
-			$user->sort('A') unless $user->is_node;
-			$user->put;
-		}
-		$parent = $op;
-	}
-
 	# parse the PC19
 	for ($i = 1; $i < $#_-1; $i += 4) {
 		my $here = $_[$i];
@@ -998,7 +924,7 @@ sub handle_19
 				
 		# check for sane parameters
 		#				$ver = 5000 if $ver eq '0000';
-		next if $ver < 5000;	# only works with version 5 software
+		next unless $ver > 5000;	# only works with version 5 software that isn't a passive node
 		next if length $call < 3; # min 3 letter callsigns
 		next if $call eq $main::mycall;
 
@@ -1022,32 +948,17 @@ sub handle_19
 
 		RouteDB::update($call, $origin);
 
-		# do we believe this call?
 		my $genline = "PC19^$here^$call^$conf^$ver^$_[-1]^"; 
-		unless ($call eq $origin || $self->is_believed($call)) {
-			my $pt = $user->lastping($origin) || 0;
-			if ($pt+$investigation_int < $main::systime && !Investigate::get($call, $origin)) {
-				my $ivp  = Investigate->new($call, $origin);
-				$ivp->version($ver);
-				$ivp->here($here);
-				$ivp->store_pcxx($pcno,$genline,$origin,'PC19',$here,$call,$conf,$ver,$_[-1]);
-			} else {
-				dbg("PCPROT: We don't believe $call on $origin") if isdbg('chanerr');
-			}
-			$user->put;
-			next;
-		}
-
 		if (eph_dup($genline)) {
 			dbg("PCPROT: dup PC19 for $call detected") if isdbg('chanerr');
 			next;
 		}
 
 		my $r = Route::Node::get($call);
-		my $flags = Route::here($here)|Route::conf($conf);
+		my $flags = $here;
 
-		# is he under the control of the new protocol?
-		if ($r && $r->np) {
+		# is he under the control of the new protocol and not my interface call?
+		if ($call ne $origin && $r && $r->np) {
 			dbg("PCPROT: $call aranea node, ignored") if isdbg('chanerr');
 			next;
 		}
@@ -1062,11 +973,6 @@ sub handle_19
 					next;
 				}
 			}
-			if ($r->version ne $ver || $r->flags != $flags) {
-				$r->version($ver);
-				$r->flags($flags);
-				push @rout, $r unless $ar;
-			}
 		} else {
 
 			# if he is directly connected or allowed then add him, otherwise store him up for later
@@ -1079,10 +985,6 @@ sub handle_19
 				} else {
 					next;
 				}
-			} else {
-				$pc19list{$call} = [] unless exists $pc19list{$call};
-				my $nl = $pc19list{$call};
-				push @{$pc19list{$call}}, [$origin, $ver, $flags] unless grep $_->[0] eq $origin, @$nl;
 			}
 		}
 
@@ -1094,7 +996,8 @@ sub handle_19
 		$user->put;
 	}
 
-
+	# we only output information that we regard as reliable
+	@rout = grep {$_ && (DXChannel::get($_->{call}) || $_->np) } @rout;
 	$self->route_pc19($origin, $line, @rout) if @rout;
 }
 		
@@ -1112,8 +1015,7 @@ sub handle_20
 	my $thing = Thingy::Rt->new(user=>$self->{call});
 	my $nref = Route::Node::get($self->{call});
 	$thing->copy_pc16_data($nref);
-	$thing->broadcast;
-	
+	$thing->broadcast($self);
 	$self->lastcf($main::systime);
 }
 		
@@ -1138,57 +1040,53 @@ sub handle_21
 	RouteDB::delete($call, $origin);
 
 	# check if we believe this
-	unless ($call eq $origin || $self->is_believed($call)) {
-		if (my $ivp = Investigate::get($call, $origin)) {
-			$ivp->store_pcxx($pcno,$line,$origin,@_);
-		} else {
-			dbg("PCPROT: We don't believe $call on $origin") if isdbg('chanerr');
-		}
-		return;
-	}
+#	unless ($call eq $origin || $self->is_believed($call)) {
+#		if (my $ivp = Investigate::get($call, $origin)) {
+#			$ivp->store_pcxx($pcno,$line,$origin,@_);
+#		} else {
+#			dbg("PCPROT: We don't believe $call on $origin") if isdbg('chanerr');
+#		}
+#		return;
+#	}
 
 	# check to see if we are in the pc19list, if we are then don't bother with any of
 	# this routing table manipulation, just remove it from the list and dump it
 	my @rout;
-	if (my $nl = $pc19list{$call}) {
-		$pc19list{$call} = [ grep {$_->[0] ne $origin} @$nl ];
-		delete $pc19list{$call} unless @{$pc19list{$call}};
-	} else {
-				
-		my $parent = Route::Node::get($origin);
-		unless ($parent) {
-			dbg("DXPROT: my parent $origin has disappeared");
-			$self->disconnect;
-			return;
-		}
-		if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
-			my $node = Route::Node::get($call);
-			if ($node) {
-						
-				my $dxchan = DXChannel::get($call);
-				if ($dxchan && $dxchan != $self) {
-					dbg("PCPROT: PC21 from $origin trying to alter locally connected $call, ignored!") if isdbg('chanerr');
-					return;
-				}
-						
-				# input filter it
-				return unless $self->in_filter_route($node);
 
-				# is he under the control of the new protocol?
-				if ($node->np) {
-					dbg("PCPROT: $call aranea node, ignored") if isdbg('chanerr');
-					return;
-				}
-						
-				# routing objects
-				push @rout, $node->del($parent);
+	my $parent = Route::Node::get($origin);
+	unless ($parent) {
+		dbg("DXPROT: my parent $origin has disappeared");
+		$self->disconnect;
+		return;
+	}
+	if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
+		my $node = Route::Node::get($call);
+		if ($node) {
+			
+			my $dxchan = DXChannel::get($call);
+			if ($dxchan && $dxchan != $self) {
+				dbg("PCPROT: PC21 from $origin trying to alter locally connected $call, ignored!") if isdbg('chanerr');
+				return;
 			}
-		} else {
-			dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr');
-			return;
+			
+			# input filter it
+			return unless $self->in_filter_route($node);
+			
+			# is he under the control of the new protocol?
+			if ($node->np) {
+				dbg("PCPROT: $call aranea node, ignored") if isdbg('chanerr');
+				return;
+			}
+			
+			# routing objects
+			push @rout, $node->del($parent);
 		}
+	} else {
+		dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr');
+		return;
 	}
 
+	@rout = grep {$_ && (DXChannel::get($_->{call}) || $_->np) } @rout;
 	$self->route_pc21($origin, $line, @rout) if @rout;
 }
 		
@@ -1204,7 +1102,7 @@ sub handle_22
 	my $thing = Thingy::Rt->new(user=>$self->{call});
 	my $nref = Route::Node::get($self->{call});
 	$thing->copy_pc16_data($nref);
-	$thing->broadcast;
+	$thing->broadcast($self);
 	$self->lastcf($main::systime);
 }
 				
@@ -1545,70 +1443,15 @@ sub handle_51
 	my $pcno = shift;
 	my $line = shift;
 	my $origin = shift;
-	my $to = $_[1];
-	my $from = $_[2];
-	my $flag = $_[3];
 
-			
-	# is it for us?
-	if ($to eq $main::mycall) {
-		if ($flag == 1) {
-			$self->send(pc51($from, $to, '0'));
-		} else {
-			# it's a reply, look in the ping list for this one
-			my $ref = $pings{$from};
-			if ($ref) {
-				my $tochan =  DXChannel::get($from);
-				while (@$ref) {
-					my $r = shift @$ref;
-					my $dxchan = DXChannel::get($r->{call});
-					next unless $dxchan;
-					my $t = tv_interval($r->{t}, [ gettimeofday ]);
-					if ($dxchan->is_user) {
-						my $s = sprintf "%.2f", $t; 
-						my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
-						$dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
-					} elsif ($dxchan->is_node) {
-						if ($tochan) {
-							my $nopings = $tochan->user->nopings || $obscount;
-							push @{$tochan->{pingtime}}, $t;
-							shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
-							
-							# cope with a missed ping, this means you must set the pingint large enough
-							if ($t > $tochan->{pingint}  && $t < 2 * $tochan->{pingint} ) {
-								$t -= $tochan->{pingint};
-							}
-							
-							# calc smoothed RTT a la TCP
-							if (@{$tochan->{pingtime}} == 1) {
-								$tochan->{pingave} = $t;
-							} else {
-								$tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
-							}
-							$tochan->{nopings} = $nopings; # pump up the timer
-							if (my $ivp = Investigate::get($from, $origin)) {
-								$ivp->handle_ping;
-							}
-						} elsif (my $rref = Route::Node::get($r->{call})) {
-							if (my $ivp = Investigate::get($from, $origin)) {
-								$ivp->handle_ping;
-							}
-						}
-					}
-				}
-			}
-		}
-	} else {
-
-		RouteDB::update($from, $origin);
-
-		if (eph_dup($line)) {
-			dbg("PCPROT: dup PC51 detected") if isdbg('chanerr');
-			return;
-		}
-		# route down an appropriate thingy
-		$self->route($to, $line);
+	if (eph_dup($line, 60)) {
+		dbg("PCPROT: dup PC51 detected") if isdbg('chanerr');
+		return;
 	}
+
+	my $thing = Thingy::Ping->new(origin=>$main::mycall);
+	$thing->from_DXProt($self, $line, @_);
+	$thing->handle($self);
 }
 
 # dunno but route it
@@ -1739,7 +1582,7 @@ sub process
 		}
 	}
 
-	Investigate::process();
+#	Investigate::process();
 
 	# every ten seconds
 	if ($t - $last10 >= 10) {	
@@ -2034,6 +1877,7 @@ sub send_local_config
 		for $node (@intcalls) {
 			push @remotenodes, Route::Node::get($node) unless grep $node eq $_, @rnodes, @remotenodes;
 		}
+		@remotenodes = grep {$_ && (DXChannel::get($_->{call}) || $_->np) } @remotenodes;
 		$self->send_route($main::mycall, \&pc19, scalar(@remotenodes), @remotenodes);
 	}
 	
@@ -2164,22 +2008,9 @@ sub load_hops
 sub addping
 {
 	my ($from, $to, $via) = @_;
-	my $ref = $pings{$to} || [];
-	my $r = {};
-	$r->{call} = $from;
-	$r->{t} = [ gettimeofday ];
-	if ($via && (my $dxchan = DXChannel::get($via))) {
-		$dxchan->send(pc51($to, $main::mycall, 1));
-	} else {
-		route(undef, $to, pc51($to, $main::mycall, 1));
-	}
-	push @$ref, $r;
-	$pings{$to} = $ref;
-	my $u = DXUser->get_current($to);
-	if ($u) {
-		$u->lastping(($via || $from), $main::systime);
-		$u->put;
-	}
+	my $thing = Thingy::Ping->new_ping($from eq $main::mycall ? () : (user=>$from), $via ? (touser=> $to, group => $via) : (group => $to));
+	$thing->remember;
+	$thing->broadcast;
 }
 
 sub process_rcmd
@@ -2333,7 +2164,7 @@ sub disconnect
 	}
 
 	# remove outstanding pings
-	delete $pings{$call};
+	Thingy::Ping::forget($call);
 	
 	# I was the last node visited
     $self->user->node($main::mycall);