X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=595cfae8246a64d4d7713bb2433a5bdb3940a54c;hb=2841b340579dae85808c5a571df3140b736c2fb2;hp=b8123bfecd44c8c153c61f89fabcc568efec791e;hpb=89e4fd14125a1eb60cfd9ad2938614083ddaeb67;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index b8123bfe..595cfae8 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -223,8 +223,9 @@ sub init
 	$main::me->{metric} = 0;
 	$main::me->{pingave} = 0;
 	$main::me->{registered} = 1;
-	$main::me->{version} = 5251 + $main::version;
+	$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,6 +309,11 @@ sub start
 	$self->state('init');
 	$self->{pc50_t} = $main::systime;
 
+	# 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');
 
@@ -438,8 +439,8 @@ sub handle_10
 #	RouteDB::update($to, $_[6]);
 
 	# it is here and logged on
-	$dxchan = DXChannel->get($main::myalias) if $to eq $main::mycall;
-	$dxchan = DXChannel->get($to) unless $dxchan;
+	$dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall;
+	$dxchan = DXChannel::get($to) unless $dxchan;
 	if ($dxchan && $dxchan->is_user) {
 		$_[3] =~ s/\%5E/^/g;
 		$dxchan->talk($from, $to, $via, $_[3]);
@@ -637,7 +638,7 @@ sub handle_12
 
 	my $dxchan;
 	
-	if ((($dxchan = DXChannel->get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){
+	if ((($dxchan = DXChannel::get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){
 		$self->send_chat($line, @_[1..6]);
 	} elsif ($_[2] eq '*' || $_[2] eq $main::mycall) {
 
@@ -697,15 +698,14 @@ sub handle_16
 		return;
 	}
 
-
-	RouteDB::update($ncall, $origin);
+	RouteDB::update($ncall, $self->{call});
 
 	# do we believe this call? 
-	unless ($ncall eq $origin || $self->is_believed($ncall)) {
-		if (my $ivp = Investigate::get($ncall, $origin)) {
+	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 $origin") if isdbg('chanerr');
+			dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
 		}
 		return;
 	}
@@ -719,40 +719,122 @@ 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 $origin trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+			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);
+	}
+
+	# 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 $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");
-				
-			my $flags = $here ? 1 : 0;
-			$rout .= "$flags$call:";
+	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");
+		
+		$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;
+		if ($r || ($u && $u->is_node)) {
+			dbg("PCPROT: $call is a node") if isdbg('chanerr');
+			next;
 		}
 		
-
-		if ($rout) {
-			chop $rout;
-			my $thing = Thingy::Rt->new(origin=>$main::mycall, user=>$self->{call});
-			$thing->from_DXProt(t=>'au', $ncall eq $self->{call} ? () : ('n', "1$ncall"), u=>$rout, DXProt=>$line);
-			$thing->process($self);
+		$r = Route::User::get($call);
+		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 {
-			dbg("PCPROT: No usable users") if isdbg('chanerr');
+			push @rout, $parent->add_user($call, $flags);
 		}
-	} else {
-		dbg("PCPROT: no PC19 seen for $ncall" ) if isdbg('chanerr');
+		
+		
+		# add this station to the user database, if required
+		$call =~ s/-\d+$//o;	# remove ssid for users
+		my $user = DXUser->get_current($call);
+		$user = DXUser->new($call) if !$user;
+		$user->homenode($parent->call) if !$user->homenode;
+		$user->node($parent->call);
+		$user->lastin($main::systime) unless DXChannel::get($call);
+		$user->put;
 	}
+	$self->route_pc16($origin, $line, $parent, @rout) if @rout;
 }
 		
 # remove a user
@@ -770,7 +852,7 @@ sub handle_17
 			
 	# do I want users from this channel?
 	unless ($self->user->wantpc16) {
-		dbg("PCPROT: don't send users to $origin") if isdbg('chanerr');
+		dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr');
 		return;
 	}
 	if ($ncall eq $main::mycall) {
@@ -778,14 +860,14 @@ sub handle_17
 		return;
 	}
 
-	RouteDB::delete($ncall, $origin);
+	RouteDB::delete($ncall, $self->{call});
 
 	# do we believe this call? 
-	unless ($ncall eq $origin || $self->is_believed($ncall)) {
-		if (my $ivp = Investigate::get($ncall, $origin)) {
+	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 $origin") if isdbg('chanerr');
+			dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
 		}
 		return;
 	}
@@ -801,19 +883,31 @@ sub handle_17
 
 	$dxchan = $parent->dxchan if $parent;
 	if ($dxchan && $dxchan ne $self) {
-		dbg("PCPROT: PC17 from $origin trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+		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;
 	}
 
+	# input filter if required and then remove user if present
+	if ($parent) {
+#		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
-	my $thing = Thingy::Rt->new(origin=>$main::mycall, user=>$self->{call});
-	$thing->from_DXProt(t=>'du', $ncall eq $self->{call} ? () : ('n', "1$ncall"), u=>"1$ucall", DXProt=>$line);
-	$thing->process($self);
+	$self->route_pc17($origin, $line, $parent, $uref);
 }
 		
 # link request
@@ -827,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) {
@@ -876,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);
@@ -909,7 +1003,7 @@ sub handle_19
 		next if $call eq $main::mycall;
 
 		# check that this PC19 isn't trying to alter the wrong dxchan
-		my $dxchan = DXChannel->get($call);
+		my $dxchan = DXChannel::get($call);
 		if ($dxchan && $dxchan != $self) {
 			dbg("PCPROT: PC19 from $origin trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr');
 			next;
@@ -950,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;
@@ -991,7 +1090,7 @@ sub handle_19
 		my $mref = DXMsg::get_busy($call);
 		$mref->stop_msg($call) if $mref;
 				
-		$user->lastin($main::systime) unless DXChannel->get($call);
+		$user->lastin($main::systime) unless DXChannel::get($call);
 		$user->put;
 	}
 
@@ -1010,6 +1109,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
@@ -1060,7 +1165,7 @@ sub handle_21
 			my $node = Route::Node::get($call);
 			if ($node) {
 						
-				my $dxchan = DXChannel->get($call);
+				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;
@@ -1068,6 +1173,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);
@@ -1090,6 +1201,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
@@ -1442,10 +1558,10 @@ sub handle_51
 			# it's a reply, look in the ping list for this one
 			my $ref = $pings{$from};
 			if ($ref) {
-				my $tochan =  DXChannel->get($from);
+				my $tochan =  DXChannel::get($from);
 				while (@$ref) {
 					my $r = shift @$ref;
-					my $dxchan = DXChannel->get($r->{call});
+					my $dxchan = DXChannel::get($r->{call});
 					next unless $dxchan;
 					my $t = tv_interval($r->{t}, [ gettimeofday ]);
 					if ($dxchan->is_user) {
@@ -1593,7 +1709,7 @@ sub handle_default
 sub process
 {
 	my $t = time;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my $pc50s;
 	
@@ -1675,7 +1791,7 @@ sub send_wwv_spot
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my @dxcc = ((Prefix::cty_data($_[6]))[0..2], (Prefix::cty_data($_[7]))[0..2]);
 
@@ -1709,7 +1825,7 @@ sub send_wcy_spot
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my @dxcc = ((Prefix::cty_data($_[10]))[0..2], (Prefix::cty_data($_[11]))[0..2]);
 	
@@ -1742,7 +1858,7 @@ sub send_announce
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my $target;
 	my $to = 'To ';
@@ -1807,7 +1923,7 @@ sub send_chat
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my $target = $_[3];
 	my $text = unpad($_[2]);
@@ -1903,7 +2019,7 @@ sub send_local_config
         # don't appear outside of this node
 
 		# send locally connected nodes
-		my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
+		my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && ($_->is_node || $_->is_aranea) } DXChannel::get_all();
 		@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
 		$self->send_route($main::mycall, \&pc19, scalar(@localnodes)+1, $main::routeroot, @localnodes);
 
@@ -1948,7 +2064,7 @@ sub route
 	}
 
 	# always send it down the local interface if available
-	my $dxchan = DXChannel->get($call);
+	my $dxchan = DXChannel::get($call);
 	if ($dxchan) {
 		dbg("route: $call -> $dxchan->{call} direct" ) if isdbg('route');
 	} else {
@@ -1971,7 +2087,7 @@ sub route
 				dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
 				return;
 			}
-			$dxchan = DXChannel->get($rcall);
+			$dxchan = DXChannel::get($rcall);
 			dbg("route: $call -> $rcall using RouteDB" ) if isdbg('route') && $dxchan;
 		}
 	}
@@ -2052,7 +2168,7 @@ sub addping
 	my $r = {};
 	$r->{call} = $from;
 	$r->{t} = [ gettimeofday ];
-	if ($via && (my $dxchan = DXChannel->get($via))) {
+	if ($via && (my $dxchan = DXChannel::get($via))) {
 		$dxchan->send(pc51($to, $main::mycall, 1));
 	} else {
 		route(undef, $to, pc51($to, $main::mycall, 1));
@@ -2104,13 +2220,13 @@ sub process_rcmd_reply
 	if ($tonode eq $main::mycall) {
 		my $s = $rcmds{$fromnode};
 		if ($s) {
-			my $dxchan = DXChannel->get($s->{call});
-			my $ref = $user eq $tonode ? $dxchan : (DXChannel->get($user) || $dxchan);
+			my $dxchan = DXChannel::get($s->{call});
+			my $ref = $user eq $tonode ? $dxchan : (DXChannel::get($user) || $dxchan);
 			$ref->send($line) if $ref;
 			delete $rcmds{$fromnode} if !$dxchan;
 		} else {
 			# send unsolicited ones to the sysop
-			my $dxchan = DXChannel->get($main::myalias);
+			my $dxchan = DXChannel::get($main::myalias);
 			$dxchan->send($line) if $dxchan;
 		}
 	} else {