X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FPing.pm;h=de295c556c939909dbe062793842867e9942ba2a;hb=f942dabdab73e5841f16ead2a41a52d6b5b05eb8;hp=902347dc30ec3a8f176bf9c30189d56407acc7b0;hpb=d0b280ab098497a7013807e869e4c641cbfcfc94;p=spider.git

diff --git a/perl/Thingy/Ping.pm b/perl/Thingy/Ping.pm
index 902347dc..de295c55 100644
--- a/perl/Thingy/Ping.pm
+++ b/perl/Thingy/Ping.pm
@@ -55,14 +55,20 @@ sub gen_DXProt
 		# {user} as well as a true user and also it may not
 		# have originated here.
 
-		my $from = $thing->{o} if $thing->{out};
-	    $from ||= $thing->{user} if Route::Node::get($thing->{user});
-		$from ||= $thing->{origin};
-		my $to = $thing->{o} unless $thing->{out};
-		$to ||= $thing->{touser} unless Route::User::get($thing->{touser});
-		$to ||= $thing->{group};
-
-		
+		my ($from, $to);
+		if ($thing->{out}) {
+			$from = $thing->{o};
+			$from ||= $thing->{user} unless Route::User::get($thing->{user});
+			$from ||= $thing->{origin};
+			$to = $thing->{touser} unless Route::User::get($thing->{touser});
+			$to ||= $thing->{group};
+		} else {
+			$from ||= $thing->{user} unless Route::User::get($thing->{user});
+			$from ||= $thing->{origin};
+			$to = $thing->{o};
+			$to ||= $thing->{touser} unless Route::User::get($thing->{touser});
+			$to ||= $thing->{group};
+		}
 		$thing->{DXProt} = DXProt::pc51($to, $from, $thing->{out});
 	}
 	return $thing->{DXProt};
@@ -111,8 +117,9 @@ sub handle
 		} else {
 
 			# it's a reply, look in the ping list for this one
-			my $ref = $ping{$thing->{id}} if exists $thing->{id};
-			$ref ||= find(($thing->{user}||$thing->{origin}), ($thing->{touser}||$thing->{group}));
+			my $ref;
+			$ref = $ping{$thing->{id}} if exists $thing->{id};
+			$ref = find(($thing->{user}||$thing->{origin}), ($thing->{touser}||$thing->{group})) unless $ref;
 			if ($ref) {
 				my $t = tv_interval($ref->{t}, [ gettimeofday ]);
 				my $tochan = DXChannel::get($ref->{touser} || $ref->{group});