X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fclient.pl;h=834aaf37ce2e33a019987e1ad2b4fe0d8fc1c653;hb=57b5e464bc44ae8eee23ab94c1f499f527595dc9;hp=f7912ad791139d13532759e0971642d7f0ff768a;hpb=60c0ea1747bc8ad95e531d29025f7bcee4fd10c1;p=spider.git

diff --git a/perl/client.pl b/perl/client.pl
index f7912ad7..834aaf37 100755
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -5,27 +5,52 @@
 # This is a perl module/program that sits on the end of a dxcluster
 # 'protocol' connection and deals with anything that might come along.
 #
-# this program is called by ax25d and gets raw ax25 text on its input
+# this program is called by ax25d or inetd and gets raw ax25 text on its input
+# It can also be launched into the ether by the cluster program itself for outgoing
+# connections
+#
+# Calling syntax is:-
+#
+# client.pl [callsign] [telnet|ax25|local] [[connect] [program name and args ...]]
+#
+# if the callsign isn't given then the sysop callsign in DXVars.pm is assumed
+#
+# if there is no connection type then 'local' is assumed
+#
+# if there is a 'connect' keyword then it will try to launch the following program
+# and any arguments and connect the stdin & stdout of both the program and the 
+# client together.
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
 # $Id$
 # 
 
+
+# search local then perl directories
 BEGIN {
-  unshift @INC, "/spider/local";
-  unshift @INC, "/spider/perl";
+  # root of directory tree for this system
+  $root = "/spider"; 
+  $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
+
+  unshift @INC, "$root/perl";   # this IS the right way round!
+  unshift @INC, "$root/local";
 }
 
 use Msg;
 use DXVars;
+use Carp;
 
-$mode = 1;                      # 1 - \n = \r as EOL, 2 - \n = \n, 0 - transparent
+$mode = 2;                      # 1 - \n = \r as EOL, 2 - \n = \n, 0 - transparent
 $call = "";                     # the callsign being used
 @stdoutq = ();                  # the queue of stuff to send out to the user
 $conn = 0;                      # the connection object for the cluster
 $lastbit = "";                  # the last bit of an incomplete input line
-$nl = "\r";
+$mynl = "\n";                   # standard terminator
+$lasttime = time;               # lasttime something happened on the interface
+$outqueue = "";                 # the output queue length
+$buffered = 1;                  # buffer output
+$savenl = "";                   # an NL that has been saved from last time
 
 # cease communications
 sub cease
@@ -43,6 +68,24 @@ sub sig_term
   cease(1);
 }
 
+# terminate a child
+sub sig_chld
+{
+  $SIG{CHLD} = \&sig_chld;
+  $waitedpid = wait;
+}
+
+
+sub setmode
+{
+  if ($mode == 1) {
+    $mynl = "\r";
+  } else {
+	$mynl = "\n";
+  }
+  $/ = $mynl;
+}
+
 # handle incoming messages
 sub rec_socket
 {
@@ -51,18 +94,43 @@ sub rec_socket
     cease(1);
   }
   if (defined $msg) {
-    my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)|(.*)$/;
+    my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
 	
 	if ($sort eq 'D') {
-	   $nl = "" if $mode == 0;
-	   $line =~ s/\n/\r/o if $mode == 1;
-	   print $line, $nl;
+	   my $snl = $mynl;
+	   my $newsavenl = "";
+	   $snl = "" if $mode == 0;
+	   if ($mode && $line =~ />$/) {
+	     $newsavenl = $snl;
+		 $snl = ' ';
+	   }
+	   $line =~ s/\n/\r/og if $mode == 1;
+	   #my $p = qq($line$snl);
+	   if ($buffered) {
+	     if (length $outqueue >= 128) {
+	       print $outqueue;
+		   $outqueue = "";
+	     }
+	     $outqueue .= "$savenl$line$snl";
+		 $lasttime = time;
+	   } else {
+	     print $savenl, $line, $snl;;
+	   }
+	   $savenl = $newsavenl;
 	} elsif ($sort eq 'M') {
 	  $mode = $line;               # set new mode from cluster
-	} elsif ($sort eq 'Z') {       # end, disconnect, go, away .....
+      setmode();
+	} elsif ($sort eq 'B') {
+	  if ($buffered && $outqueue) {
+	    print $outqueue;
+		$outqueue = "";
+	  }
+	  $buffered = $line;           # set buffered or unbuffered
+    } elsif ($sort eq 'Z') {       # end, disconnect, go, away .....
 	  cease(0);
     }	  
-  } 
+  }
+  $lasttime = time; 
 }
 
 sub rec_stdin
@@ -78,9 +146,13 @@ sub rec_stdin
 #  print "sys: $r $buf";
   if ($r > 0) {
     if ($mode) {
-	  $buf =~ s/\r/\n/o if $mode == 1;
+	  $buf =~ s/\r/\n/og if $mode == 1;
 	  $dangle = !($buf =~ /\n$/);
-	  @lines = split /\n/, $buf;
+	  if ($buf eq "\n") {
+	    @lines = (" ");
+	  } else {
+	    @lines = split /\n/, $buf;
+	  }
 	  if ($dangle) {                # pull off any dangly bits
 	    $buf = pop @lines;
 	  } else {
@@ -91,32 +163,57 @@ sub rec_stdin
 	  foreach $first (@lines) {
 	    $conn->send_now("D$call|$first");
 	  }
-	  $lastbit = $buf;  
+	  $lastbit = $buf;
+	  $savenl = "";     # reset savenl 'cos we will have done a newline on input
 	} else {
 	  $conn->send_now("D$call|$buf");
 	}
   } elsif ($r == 0) {
     cease(1);
   }
+  $lasttime = time;
 }
 
-$call = uc $ARGV[0];
-die "client.pl <call> [<mode>]\r\n" if (!$call);
-$mode = $ARGV[1] if (@ARGV > 1);
+$call = uc shift @ARGV;
+$call = uc $myalias if !$call; 
+$connsort = lc shift @ARGV;
+$connsort = 'local' if !$connsort;
+$mode = ($connsort =~ /^ax/o) ? 1 : 2;
 
-if ($mode != 1) {
-  $nl = "\n";
-  $\ = $nl;
+# is this an out going connection?
+if ($ARGV[0] eq "connect") {
+  shift @ARGV;          # lose the keyword
+  
 }
 
-select STDOUT; $| = 1;
+setmode();
+if ($call eq $mycall) {
+  print "You cannot connect as your cluster callsign ($mycall)", $nl;
+  cease(0);
+}
+
+#select STDOUT; $| = 1;
+STDOUT->autoflush(1);
 
 $SIG{'INT'} = \&sig_term;
 $SIG{'TERM'} = \&sig_term;
-#$SIG{'HUP'} = \&sig_term;
+$SIG{'HUP'} = \&sig_term;
+$SIG{'CHLD'} = \&sig_chld;
 
 $conn = Msg->connect("$clusteraddr", $clusterport, \&rec_socket);
-$conn->send_now("A$call|start");
+$conn->send_now("A$call|$connsort");
 Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);
-Msg->event_loop();
+
+for (;;) {
+  my $t;
+  Msg->event_loop(1, 0.010);
+  $t = time;
+  if ($t > $lasttime) {
+    if ($outqueue) {
+	  print $outqueue;
+	  $outqueue = "";
+	}
+	$lasttime = $t;
+  }
+}