X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=65ad93f930a1bcb164ea623c1fe4f15be8ed19a1;hb=329702a31bd4a526077c713b12ede457276c79db;hp=50765e14a54be2b5f1912d7e82619db0c1002cf0;hpb=654c9b77424b948f88816e0ef28bf4a27331afdb;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 50765e14..65ad93f9 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -96,8 +96,8 @@ sub start
 	# remember type of connection
 	$self->{consort} = $line;
 	$self->{outbound} = $sort eq 'O';
-	$self->{priv} = $user->priv;
-	$self->{lang} = $user->lang;
+	$self->{priv} = $user->priv || 1;     # other clusters can always be 'normal' users
+	$self->{lang} = $user->lang || 'en';
 	$self->{isolate} = $user->{isolate};
 	$self->{consort} = $line;	# save the connection type
 	$self->{here} = 1;
@@ -271,6 +271,15 @@ sub normal
 						} else {
 							route(undef, $to, pc34($main::mycall, $to, $cmd));
 						}
+						if ($to ne $field[7]) {
+							$to = $field[7];
+							$node = DXCluster->get_exact($to);
+							if ($node && $node->dxchan && $node->dxchan->is_clx) {
+								route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd));
+							} else {
+								route(undef, $to, pc34($main::mycall, $to, $cmd));
+							}
+						}
 						$user->lastoper($main::systime);
 						$user->put;
 					}
@@ -647,6 +656,10 @@ sub normal
 					my $dxchan = DXChannel->get($s->{call});
 					$dxchan->send($field[3]) if $dxchan;
 					delete $rcmds{$field[2]} if !$dxchan;
+				} else {
+					# send unsolicited ones to the sysop
+					my $dxchan = DXChannel->get($main::myalias);
+					$dxchan->send($field[3]) if $dxchan;
 				}
 			} else {
 				my $ref = DXUser->get_current($field[1]);
@@ -688,9 +701,7 @@ sub normal
 				my ($lat, $long) = DXBearing::stoll($field[3]);
 				$user->lat($lat);
 				$user->long($long);
-				my $qra = $user->qra || DXBearing::lltoqra($lat, $long);
-				$qra = DXBearing::lltoqra($lat, $long) unless $qra && DXBearing::is_qra($qra);
-				$user->qra($qra) if $qra ne $user->qra;
+				$user->qra(DXBearing::lltoqra($lat, $long)) unless $user->qra && DXBearing::is_qra($user->qra);
 			} elsif ($field[2] == 4) {
 				$user->homenode($field[3]);
 			}
@@ -833,6 +844,10 @@ sub normal
 						$dxchan = DXChannel->get($s->{call});
 						$dxchan->send($field[4]) if $dxchan;
 						delete $rcmds{$field[2]} if !$dxchan;
+					} else {
+						# send unsolicited ones to the sysop
+						my $dxchan = DXChannel->get($main::myalias);
+						$dxchan->send($field[4]) if $dxchan;
 					}
 				}
 			} else {
@@ -981,7 +996,7 @@ sub send_dx_spot
 		} elsif ($dxchan->is_user && $dxchan->{dx}) {
 			my $buf = Spot::formatb($dxchan->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
 			$buf .= "\a\a" if $dxchan->{beep};
-			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
 				$dxchan->send($buf);
 			} else {
 				$dxchan->delay($buf);
@@ -1025,7 +1040,7 @@ sub send_wwv_spot
 		} elsif ($dxchan->is_user && $dxchan->{wwv}) {
 			my $buf = "WWV de $_[6] <$_[1]>:   SFI=$_[2], A=$_[3], K=$_[4], $_[5]";
 			$buf .= "\a\a" if $dxchan->{beep};
-			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
 				$dxchan->send($buf);
 			} else {
 				$dxchan->delay($buf);
@@ -1068,7 +1083,7 @@ sub send_wcy_spot
 		} elsif ($dxchan->is_user && $dxchan->{wcy}) {
 			my $buf = "WCY de $_[10] <$_[1]> : K=$_[4] expK=$_[5] A=$_[3] R=$_[6] SFI=$_[2] SA=$_[7] GMF=$_[8] Au=$_[9]";
 			$buf .= "\a\a" if $dxchan->{beep};
-			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
 				$dxchan->send($buf);
 			} else {
 				$dxchan->delay($buf);
@@ -1132,7 +1147,7 @@ sub send_announce
 			next if $target eq 'SYSOP' && $dxchan->{priv} < 5;
 			my $buf = "$to$target de $_[0]: $text";
 			$buf .= "\a\a" if $dxchan->{beep};
-			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
 				$dxchan->send($buf);
 			} else {
 				$dxchan->delay($buf);
@@ -1283,7 +1298,7 @@ sub broadcast_list
 
 		$s =~ s/\a//og unless $dxchan->{beep};
 
-		if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+		if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
 			$dxchan->send($s);	
 		} else {
 			$dxchan->delay($s);
@@ -1393,5 +1408,17 @@ sub disconnect
 
 	$self->SUPER::disconnect;
 }
+
+# 
+# send a talk message to this thingy
+#
+sub talk
+{
+	my ($self, $from, $to, $via, $line) = @_;
+	
+	$line =~ s/\^/\\5E/g;			# remove any ^ characters
+	$self->send(DXProt::pc10($from, $to, $via, $line));
+	Log('talk', $self->call, $from, $via?$via:$main::mycall, $line);
+}
 1;
 __END__