added operating system to sh/version

changed lineending for telnet sessions to be \r\n instead of plain \n
added lineend '\r\n' command for custom lineendings

diff --git a/Changes b/Changes
index fa32dd3974e3aa42b516e251090a58b277f4fb09..c4810f8ca954bd7c0b8b42ca16e318d25324cc95 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,8 @@
+22Feb01=======================================================================
+1. Added platform name to sh/version
+2. changed client.pl so that it send \r\n instead of \n on telnet connects
+3. added lineend '\r\n' command to connect scripts so you can override 
+defaults
 03Feb01=======================================================================
 1. Changes and additions to the manual and added a help file for sh/log (g0vgs)
 13Jan01=======================================================================

diff --git a/cmd/show/version.pl b/cmd/show/version.pl
index 508ac23555bfacdb597c9f2e0b796bfb594171c5..b9bb950110e29e4834e2591c01a2bede9c5c3201 100644 (file)
--- a/cmd/show/version.pl
+++ b/cmd/show/version.pl
@@ -8,7 +8,7 @@
 
 my @out;
 
-push @out, "DX Spider Cluster version $main::version";
+push @out, "DX Spider Cluster version $main::version on \u$^O";
 push @out, "Copyright (c) 1998-2001 Dirk Koopman G1TLH";
 
 return (1, @out);

diff --git a/perl/client.pl b/perl/client.pl
index 5e975c157bf18d903e8a11b3acdef0838cc6340a..06d4cbc49bf16ab274d4fa926538f35090816b74 100755 (executable)
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -88,8 +88,10 @@ sub setmode
 {
        if ($mode == 1) {
                $mynl = "\r";
+               $out_lineend = "\r";
        } else {
                $mynl = "\n";
+               $out_lineend = "\r\n";
        }
        $/ = $mynl;
 }
@@ -265,6 +267,16 @@ sub dotimeout
        $timeout = $val;
 }
 
+sub dolineend
+{
+       my $val = shift;
+       $out_lineend = $val;
+       $out_lineend =~ s/\\r/\r/g;
+       $out_lineend =~ s/\\n/\n/g;
+       dbg('connect', "lineend set to $val ");
+       $out_lineend = $mynl unless $out_lineend;
+}
+
 sub dochat
 {
        my ($expect, $send) = @_;
@@ -304,9 +316,10 @@ sub dochat
        }
        if ($send) {
                if ($csort eq 'telnet') {
-                       $sock->print("$send\n");
+                       local $\ = $out_lineend;
+                       $sock->print("$send$out_lineend");
                } elsif ($csort eq 'ax25') {
-                       local $\ = "\r";
+                       local $\ = $out_lineend;
                        $wfh->print("$send");
                }
                dbg('connect', "sent \"$send\"");
@@ -350,6 +363,7 @@ $maxecho = 5;                  # length of max echo queue
 $pid = 0;                       # the pid of the child program
 $csort = "";                    # the connection type
 $sock = 0;                      # connection socket
+$out_lineend = $mynl;          # connection lineending (used for outgoing connects) 
 
 $stdin = *STDIN;
 $stdout = *STDOUT;
@@ -444,7 +458,9 @@ if ($connsort eq "connect") {
                doconnect($1, $2) if /^\s*co\w*\s+(\w+)\s+(.*)$/io;
                doabort($1) if /^\s*a\w*\s+(.*)/io;
                dotimeout($1) if /^\s*t\w*\s+(\d+)/io;
+               dolineend($1) if /^\s*[Ll]\w*\s+\'((?:\\[rn])+)\'/;
                dochat($1, $2) if /^\s*\'(.*)\'\s+\'(.*)\'/io;
+               
                if (/^\s*cl\w+\s+(.*)/io) {
                        doclient($1);
                        last;