X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=18fafa82170ed24318cf20f050f519078d889e45;hb=8a0f0fc3c54895f0ce8b0207e42af1f693d757f6;hp=552468b92cf9ab22a0407a2fdd7ea77fcb2706fb;hpb=57b5e464bc44ae8eee23ab94c1f499f527595dc9;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 552468b9..18fafa82 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");
 }
 
 #
@@ -233,6 +243,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
@@ -252,14 +269,17 @@ sub normal
 	
     if ($pcno == 21) {             # delete a cluster from the list
 	  my $call = uc $field[1];
-	  my $ref = DXCluster->get($call);
-	  $ref->del() if $ref;
+	  if ($call ne $main::mycall) {              # don't allow malicious buggers to disconnect me!
+	    my $ref = DXCluster->get($call);
+	    $ref->del() if $ref;
+	  }
 	  last SWITCH;
 	}
 	
     if ($pcno == 22) {last SWITCH;}
 
     if ($pcno == 23 || $pcno == 27) {  # WWV info
+	  Geomag::update(@field[1..$#field]);
       last SWITCH;
 	}
 
@@ -274,16 +294,39 @@ 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) {
+			if ($self->{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
+				for (DXCommandmode::run_cmd($self, $field[3])) {
+					s/\s*$//og;
+					$self->send(pc35($main::mycall, $self->{call}, "$main::mycall:$_"));
+				}
+				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;}
@@ -299,6 +342,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;
 	  
@@ -423,6 +467,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;
 }
 
@@ -439,7 +484,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