X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2Fclient.pl;h=ce0085dedd10e1c52ee40850c51dc0cff14f18b5;hb=9e6f237bf04fc102b519085e171d81b28d418ccb;hp=5b35ee2dc83fb98c236d9f0055766f93eaf973de;hpb=b473fa8950fc9a6b747be44434569dec254b0897;p=spider.git

diff --git a/perl/client.pl b/perl/client.pl
index 5b35ee2d..ce0085de 100755
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -40,9 +40,10 @@ BEGIN {
 use Msg;
 use DXVars;
 use DXDebug;
+use IO::File;
 use IO::Socket;
 use IPC::Open2;
-use FileHandle;
+use Net::Telnet qw(TELOPT_ECHO);
 use Carp;
 
 # cease communications
@@ -116,6 +117,16 @@ sub rec_socket
 		} elsif ($sort eq 'M') {
 			$mode = $line;		# set new mode from cluster
 			setmode();
+		} elsif ($sort eq 'E') {
+			if ($sort eq 'telnet') {
+				$mode = $line;		# set echo mode from cluster
+				my $term = POSIX::Termios->new;
+				$term->getattr(fileno($sock));
+				$term->setflag( &POSIX::ISIG );
+				$term->setattr(fileno($sock), &POSIX::TCSANOW );
+			}
+		} elsif ($sort eq 'I') {
+			;                       # ignore echoed I frames
 		} elsif ($sort eq 'B') {
 			if ($buffered && $outqueue) {
 				print $stdout $outqueue;
@@ -162,12 +173,12 @@ sub rec_stdin
 			unshift @lines, ($lastbit . $first) if ($first);
 			foreach $first (@lines) {
 				#		  print "send_now $call $first\n";
-				$conn->send_now("D$call|$first");
+				$conn->send_now("I$call|$first");
 			}
 			$lastbit = $buf;
 			$savenl = "";		# reset savenl 'cos we will have done a newline on input
 		} else {
-			$conn->send_now("D$call|$buf");
+			$conn->send_now("I$call|$buf");
 		}
 	} elsif ($r == 0) {
 		cease(1);
@@ -181,17 +192,24 @@ sub doconnect
 	dbg('connect', "CONNECT sort: $sort command: $line");
 	if ($sort eq 'telnet') {
 		# this is a straight network connect
-		my ($host) = $line =~ /host\s+(\w+)/o;
-		my ($port) = $line =~ /port\s+(\d+)/o;
+		my ($host, $port) = split /\s+/, $line;
 		$port = 23 if !$port;
 		
-		$sock = IO::Socket::INET->new(PeerAddr => "$host", PeerPort => "$port", Proto => 'tcp')
-			or die "Can't connect to $host port $port $!";
-		
+		if ($port == 23) {
+			$sock = new Net::Telnet (Timeout => $timeout, BinMode => 1);
+			$sock->option_accept(Dont => TELOPT_ECHO, Wont => TELOPT_ECHO);
+			$sock->option_log('option_log');
+			$sock->dump_log('dump');
+			$sock->open($host) or die "Can't connect to $host port $port $!";
+		} else {
+			$sock = IO::Socket::INET->new(PeerAddr => "$host:$port", Proto => 'tcp')
+				or die "Can't connect to $host port $port $!";
+			
+		}
 	} elsif ($sort eq 'ax25') {
 		my @args = split /\s+/, $line;
-		$rfh = new FileHandle;
-		$wfh = new FileHandle;
+		$rfh = new IO::File;
+		$wfh = new IO::File;
 		$pid = open2($rfh, $wfh, "$line") or die "can't do $line $!";
 		dbg('connect', "got pid $pid");
 		$wfh->autoflush(1);
@@ -221,29 +239,32 @@ sub dochat
 	dbg('connect', "CHAT \"$expect\" -> \"$send\"");
     my $line;
 	
-	#	alarm($timeout);
+	alarm($timeout);
 	
     if ($expect) {
-		if ($csort eq 'telnet') {
-			$line = <$sock>;
-			chomp;
-		} elsif ($csort eq 'ax25') {
-			local $/ = "\r";
-			$line = <$rfh>;
-			$line =~ s/\r//og;
-		}
-		dbg('connect', "received \"$line\"");
-		if ($abort && $line =~ /$abort/i) {
-			dbg('connect', "aborted on /$abort/");
-			cease(11);
+		for (;;) {
+			if ($csort eq 'telnet') {
+				$line = $sock->get();
+				chomp;
+			} elsif ($csort eq 'ax25') {
+				local $/ = "\r";
+				$line = <$rfh>;
+				$line =~ s/\r//og;
+			}
+			dbg('connect', "received \"$line\"");
+			if ($abort && $line =~ /$abort/i) {
+				dbg('connect', "aborted on /$abort/");
+				cease(11);
+			}
+			last if $line =~ /$expect/i;
 		}
 	}
-	if ($send && (!$expect || $line =~ /$expect/i)) {
+	if ($send) {
 		if ($csort eq 'telnet') {
 			$sock->print("$send\n");
 		} elsif ($csort eq 'ax25') {
 			local $\ = "\r";
-			$wfh->print("$send\r");
+			$wfh->print("$send");
 		}
 		dbg('connect', "sent \"$send\"");
 	}
@@ -270,7 +291,7 @@ $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
-$timeout = 30;                  # default timeout for connects
+$timeout = 60;                  # default timeout for connects
 $abort = "";                    # the current abort string
 $cpath = "$root/connect";		# the basic connect directory
 
@@ -293,7 +314,16 @@ $call = uc $myalias if !$call;
 $connsort = lc shift @ARGV;
 $connsort = 'local' if !$connsort;
 
-$mode = ($connsort =~ /^ax/o) ? 1 : 2;
+#
+# strip off any SSID if it is a telnet connection 
+#
+# SSID's are a problem, basically we don't allow them EXCEPT for the special case
+# of local users. i.e. you can have a cluster call with an SSID and a usercall with
+# an SSID and they are different to the system to those without SSIDs
+#
+
+$call =~ s/-\d+$//o if $mode eq 'telnet';
+$mode = ($connsort eq 'ax25') ? 1 : 2;
 setmode();
 
 if ($call eq $mycall) {