X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=d1352b8c6f1bac886960dd04925e684c23f9357b;hb=cce345b95c555a0b45218c5b452bc0f5f4f13bab;hp=627356823274c7fe1d5aee98935b3693d7858d3e;hpb=602b16e109137598da1bb8a363c0bfb4028701b3;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 62735682..d1352b8c 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -18,6 +18,7 @@ use DXM;
 use DXCluster;
 use DXProtVars;
 use DXCommandmode;
+use DXLog;
 use Spot;
 use DXProtout;
 use Carp;
@@ -54,20 +55,29 @@ sub new
 # all the crap that comes between).
 sub start
 {
-  my ($self, $line) = shift;
-  my $call = $self->call;
-  
+  my ($self, $line, $sort) = @_;
+  my $call = $self->{call};
+  my $user = $self->{user};
+      
   # remember type of connection
   $self->{consort} = $line;
-
+  $self->{outbound} = $sort eq 'O';
+  $self->{priv} = $user->priv;
+  $self->{lang} = $user->lang;
+  $self->{consort} = $line;                # save the connection type
+  $self->{here} = 1;
+  
   # set unbuffered
   $self->send_now('B',"0");
   
   # send initialisation string
-  $self->send(pc38()) if DXNode->get_all();
-  $self->send(pc18());
+  if (!$self->{outbound}) {
+	  $self->send(pc38()) if DXNode->get_all();
+	  $self->send(pc18());
+  }
   $self->state('init');
   $self->pc50_t(time);
+  Log('DXProt', "$call connected");
 }
 
 #
@@ -96,6 +106,7 @@ sub normal
 		my $text = unpad($field[3]);
 		my $ref = DXChannel->get($call);
 		$ref->send("$call de $field[1]: $text") if $ref;
+		Log('talk', $call, $field[1], $field[6], $text);
 	  } else {
 	    route($field[2], $line);       # relay it on its way
 	  }
@@ -141,24 +152,29 @@ sub normal
         # strip leading and trailing stuff
 	    my $text = unpad($field[3]);
 		my $target;
+		my $to = 'To ';
 		my @list;
 		
 	    if ($field[4] eq '*') {          # sysops
-		  $target = "To Sysops";
+		  $target = "Sysops";
 		  @list = map { $_->priv >= 5 ? $_ : () } get_all_users();
 		} elsif ($field[4] gt ' ') {     # speciality list handling
 		  my ($name) = split /\./, $field[4]; 
-          $target = "To $name";          # put the rest in later (if bothered) 
+          $target = "$name";          # put the rest in later (if bothered) 
         } 
 		
-        $target = "WX" if $field[6] eq '1';
-		$target = "To All" if !$target;
+		if ($field[6] eq '1') {
+			$target = "WX"; 
+			$to = '';
+		}
+		$target = "All" if !$target;
 		
 		if (@list > 0) {
-		  broadcast_list("$target de $field[1]: $text", @list);
+		  broadcast_list("$to$target de $field[1]: $text", @list);
 		} else {
 		  broadcast_users("$target de $field[1]: $text");
 		}
+		Log('ann', $target, $field[1], $text);
 		
 		return if $field[2] eq $main::mycall;   # it's routed to me
 	  } else {
@@ -233,6 +249,13 @@ sub normal
         # unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect)
 		my $mref = DXMsg::get_busy($call);
 		$mref->stop_msg($self) if $mref;
+
+		# add this station to the user database, if required
+		my $user = DXUser->get_current($call);
+		$user = DXUser->new($call) if !$user;
+		$user->node($call) if !$user->node;
+		$user->sort('A');
+		$user->put;
 	  }
 	  
 	  # queue up any messages
@@ -262,6 +285,7 @@ sub normal
     if ($pcno == 22) {last SWITCH;}
 
     if ($pcno == 23 || $pcno == 27) {  # WWV info
+	  Geomag::update(@field[1..$#field]);
       last SWITCH;
 	}
 
@@ -276,16 +300,43 @@ sub normal
     if ($pcno == 25) {last SWITCH;}
 
     if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42) {   # mail/file handling
-	  DXMsg::process($self, $line);
-	  return;
+		DXMsg::process($self, $line);
+		return;
 	}
 	
     if ($pcno == 34 || $pcno == 36) {   # remote commands (incoming)
-	  last SWITCH;
+		if ($field[1] eq $main::mycall) {
+			my $ref = DXUser->get_current($field[2]);
+			Log('rcmd', 'in', $ref->{priv}, $field[2], $field[3]);
+			if ($ref->{priv}) {        # you have to have SOME privilege, the commands have further filtering
+				$self->{remotecmd} = 1; # for the benefit of any command that needs to know
+				my @in = (DXCommandmode::run_cmd($self, $field[3]));
+				for (@in) {
+					s/\s*$//og;
+					$self->send(pc35($main::mycall, $field[2], "$main::mycall:$_"));
+					Log('rcmd', 'out', $field[2], $_);
+				}
+				delete $self->{remotecmd};
+			}
+		} else {
+			route($field[1], $line);
+		}
+		return;
 	}
 	
     if ($pcno == 35) {                  # remote command replies
-	  last SWITCH;
+		if ($field[1] eq $main::mycall) {
+			my $s = DXChannel::get($main::myalias); 
+			my @ref = grep { $_->pc34to eq $field[2] } DXChannel::get_all();     # people that have rcmded someone
+			push @ref, $s if $s;
+			
+			foreach (@ref) {
+				$_->send($field[3]);
+			}
+		} else {
+			route($field[1], $line);
+		}
+		return;
 	}
 	
     if ($pcno == 37) {last SWITCH;}
@@ -301,6 +352,7 @@ sub normal
 	
     if ($pcno == 41) {              # user info
       # add this station to the user database, if required
+	  $field[1] =~ s/-\d+$//o;
 	  my $user = DXUser->get_current($field[1]);
 	  $user = DXUser->new($field[1]) if !$user;
 	  
@@ -425,6 +477,7 @@ sub finish
 
   # now broadcast to all other ak1a nodes that I have gone
   broadcast_ak1a(pc21($self->call, 'Gone.'), $self);
+  Log('DXProt', $self->call . " Disconnected");
   $ref->del() if $ref;
 }
 
@@ -441,7 +494,7 @@ sub send_local_config
   my @nodes = DXNode::get_all();
   
   # create a list of all the nodes that are not connected to this connection
-  @nodes = map { $_->dxchan != $self ? $_ : () } @nodes;
+  @nodes = grep { $_->dxchan != $self } @nodes;
   $self->send($me->pc19(@nodes));
 	  
   # get all the users connected on the above nodes and send them out