X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=05111d40ba11e2456635fdbf14f4281782030365;hb=393e17fd3a08dd94596f1c02d4d20f6f9a44954f;hp=508303bdcfb604d6dc1cdd14a50cc74fefafbd97;hpb=3bc72037db6b4f78ddd46e1f6bc806f6a2075029;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 508303bd..05111d40 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -44,10 +44,8 @@ use Thingy::T;
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))?$/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 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
@@ -739,7 +737,7 @@ sub handle_16
 
 		
 		my $i;
-		my @rout;
+		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);
@@ -747,40 +745,20 @@ sub handle_16
 			
 			eph_del_regex("^PC17\\^$call\\^$ncall");
 				
-			$conf = 1;
-				
-			my $r = Route::User::get($call);
-			my $flags = Route::here($here)|Route::conf($conf);
-				
-			if ($r) {
-				my $au = $r->addparent($parent);					
-				if ($r->flags != $flags) {
-					$r->flags($flags);
-					$au = $r;
-				}
-				push @rout, $r if $au;
-			} 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);
-			$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;
+			my $flags = $here ? 1 : 0;
+			$rout .= ":U$flags$call";
 		}
+		
 
-		if (@rout) {
-			my $thing = Thingy::Rt->new(origin=>$main::mycall);
-			$thing->from_DXProt(t=>'ea', n=>$ncall, u=>join(':',map {"$_->{flags}$_->{call}"} @rout), DXProt=>$line);
+		if ($rout) {
+			my $thing = Thingy::Rt->new(origin=>$main::mycall, user=>$self->{call});
+			$thing->from_DXProt(t=>'eau', d=>"N1$ncall$rout", DXProt=>$line);
 			$thing->queue($self);
 		} else {
 			dbg("PCPROT: No usable users") if isdbg('chanerr');
 		}
+	} else {
+		dbg("PCPROT: no PC19 seen for $ncall" ) if isdbg('chanerr');
 	}
 }
 		
@@ -840,8 +818,8 @@ sub handle_17
 	}
 
 	$uref = Route->new($ucall) unless $uref; # throw away
-	my $thing = Thingy::Rt->new(origin=>$main::mycall);
-	$thing->from_DXProt(t=>'ed', n=>$ncall, u=>"1$ucall", DXProt=>$line);
+	my $thing = Thingy::Rt->new(origin=>$main::mycall, user=>$self->{call});
+	$thing->from_DXProt(t=>'edu', d=>"N1$ncall:U1$ucall", DXProt=>$line);
 	$thing->queue($self);
 }