X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=8c605642754cb2076013fbc4883e9119c708f389;hb=2099a0deed84ac53057e4dc4beca262764f862e9;hp=35f91fefb301a56d9334dc59b0f2cd4024550757;hpb=c3c15883cf25add24fc49e32eb0d17dce6839a62;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 35f91fef..8c605642 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -225,6 +225,7 @@ sub init
 	$main::me->{registered} = 1;
 	$main::me->{version} = 5252 + $main::version;
 	$main::me->{build} = $main::build;
+	$main::me->{lastcf} = $main::me->{lasthello} = time;
 }
 
 #
@@ -238,12 +239,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;
-	if ($self->{call} ne $main::mycall) {
-		my $thing = Thingy::Hello->new(user=>$call);
-		$thing->broadcast($self);
-	}
-	
+	$main::routeroot->add($call, '5000', 1) if $call ne $main::mycall;
 	return $self;
 }
 
@@ -313,8 +309,10 @@ sub start
 	$self->state('init');
 	$self->{pc50_t} = $main::systime;
 
-	my $thing = Thingy::Hello->new(origin=>$main::mycall, user=>$call);
+	# ALWAYS output the hello
+	my $thing = Thingy::Hello->new(user => $call, h => $self->{here});
 	$thing->broadcast($self);
+	$self->lasthello($main::systime);
 	
 	# send info to all logged in thingies
 	$self->tell_login('loginn');
@@ -786,18 +784,24 @@ sub handle_16
 		# input filter if required
 		return unless $self->in_filter_route($parent);
 	}
+
+	# is he under the control of the new protocol?
+	if ($parent && $parent->np) {
+		dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr');
+		return;
+	}
 		
-		my $i;
+	my $i;
 	my @rout;
-		for ($i = 2; $i < $#_; $i++) {
-			my ($call, $conf, $here) = $_[$i] =~ /^(\S+) (\S) (\d)/o;
-			next unless $call && $conf && defined $here && is_callsign($call);
-			next if $call eq $main::mycall;
-			
-			eph_del_regex("^PC17\\^$call\\^$ncall");
-				
+	for ($i = 2; $i < $#_; $i++) {
+		my ($call, $conf, $here) = $_[$i] =~ /^(\S+) (\S) (\d)/o;
+		next unless $call && $conf && defined $here && is_callsign($call);
+		next if $call eq $main::mycall;
+		
+		eph_del_regex("^PC17\\^$call\\^$ncall");
+		
 		$conf = $conf eq '*';
-
+		
 		# reject this if we think it is a node already
 		my $r = Route::Node::get($call);
 		my $u = DXUser->get_current($call) unless $r;
@@ -807,20 +811,20 @@ 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);					
 			if ($r->flags != $flags) {
 				$r->flags($flags);
 				$au = $r;
-		}
+			}
 			push @rout, $r if $au;
-	} else {
+		} else {
 			push @rout, $parent->add_user($call, $flags);
 		}
 		
-				
+		
 		# add this station to the user database, if required
 		$call =~ s/-\d+$//o;	# remove ssid for users
 		my $user = DXUser->get_current($call);
@@ -883,6 +887,12 @@ sub handle_17
 		return;
 	}
 
+	# is he under the control of the new protocol?
+	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) {
 #		return unless $self->in_filter_route($parent);	
@@ -911,8 +921,8 @@ sub handle_18
 
 	# record the type and version offered
 	if ($_[1] =~ /DXSpider Version: (\d+\.\d+) Build: (\d+\.\d+)/) {
-		$self->version(52.51 + $1);
-		$self->user->version(52.51 + $1);
+		$self->version(0 + $1);
+		$self->user->version(0 + $1);
 		$self->build(0 + $2);
 		$self->user->build(0 + $2);
 		unless ($self->is_spider) {
@@ -960,7 +970,7 @@ sub handle_19
 	if ($origin ne $self->call) {
 		my $op = Route::Node::get($origin);
 		unless ($op) {
-			$op = $parent->add($origin, 5000, Route::here(1));
+			$op = $parent->add($origin, 5000, 1);
 			my $user = DXUser->get_current($origin);
 			if (!$user) {
 				$user = DXUser->new($origin);
@@ -1034,8 +1044,13 @@ sub handle_19
 		}
 
 		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) {
+			dbg("PCPROT: $call aranea node, ignored") if isdbg('chanerr');
+			next;
+		}
 		# modify the routing table if it is in it, otherwise store it in the pc19list for now
 		if ($r) {
 			my $ar;
@@ -1047,11 +1062,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
@@ -1094,6 +1104,12 @@ sub handle_20
 	$self->send(pc22());
 	$self->state('normal');
 	$self->{lastping} = 0;
+	my $thing = Thingy::Rt->new(user=>$self->{call});
+	my $nref = Route::Node::get($self->{call});
+	$thing->copy_pc16_data($nref);
+	$thing->broadcast;
+	
+	$self->lastcf($main::systime);
 }
 		
 # delete a cluster from the list
@@ -1152,6 +1168,12 @@ sub handle_21
 						
 				# 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);
@@ -1174,6 +1196,11 @@ sub handle_22
 	my $origin = shift;
 	$self->state('normal');
 	$self->{lastping} = 0;
+	my $thing = Thingy::Rt->new(user=>$self->{call});
+	my $nref = Route::Node::get($self->{call});
+	$thing->copy_pc16_data($nref);
+	$thing->broadcast;
+	$self->lastcf($main::systime);
 }
 				
 # WWV info
@@ -1513,70 +1540,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->broadcast($self);
 }
 
 # dunno but route it
@@ -2132,22 +2104,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
@@ -2301,7 +2260,7 @@ sub disconnect
 	}
 
 	# remove outstanding pings
-	delete $pings{$call};
+	Thingy::Ping::forget($call);
 	
 	# I was the last node visited
     $self->user->node($main::mycall);