X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fclient.pl;h=c39bda4c0fbde42c8b1e3890a85773e22be5c960;hb=refs%2Ftags%2FR_1_13;hp=a2a690cad22a1bd362c7b1cb5b6818b5687d7344;hpb=7a64dbf69ead057f2fd3fef1df05e30cef339485;p=spider.git

diff --git a/perl/client.pl b/perl/client.pl
index a2a690ca..c39bda4c 100755
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -26,6 +26,7 @@
 # $Id$
 # 
 
+require 5.004;
 
 # search local then perl directories
 BEGIN {
@@ -55,7 +56,10 @@ sub cease
 		$conn->send_now("Z$call|bye...\n");
 	}
 	$stdout->flush if $stdout;
-	kill(15, $pid) if $pid;
+	if ($pid) {
+		dbg('connect', "killing $pid");
+		kill(9, $pid);
+	}
 	sleep(1);
 	exit(0);	
 }
@@ -71,6 +75,7 @@ sub sig_chld
 {
 	$SIG{CHLD} = \&sig_chld;
 	$waitedpid = wait;
+	dbg('connect', "caught $pid");
 }
 
 
@@ -201,19 +206,18 @@ sub doconnect
 		my ($host, $port) = split /\s+/, $line;
 		$port = 23 if !$port;
 		
-		if ($port == 23) {
-			$sock = new Net::Telnet (Timeout => $timeout);
+#		if ($port == 23) {
+			$sock = new Net::Telnet (Timeout => $timeout, Port => $port);
 			$sock->option_callback(\&optioncb);
 			$sock->output_record_separator('');
 			$sock->option_log('option_log');
 			$sock->dump_log('dump');
 			$sock->option_accept(Wont => TELOPT_ECHO);
 			$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 $!";
-			
-		}
+#		} else {
+#			$sock = IO::Socket::INET->new(PeerAddr => "$host:$port", Proto => 'tcp')
+#				or die "Can't connect to $host port $port $!";
+#		}
 	} elsif ($sort eq 'ax25' || $sort eq 'prog') {
 		my @args = split /\s+/, $line;
 		$rfh = new IO::File;
@@ -282,7 +286,7 @@ sub dochat
 sub timeout
 {
 	dbg('connect', "timed out after $timeout seconds");
-	cease(10);
+	cease(0);
 }
 
 
@@ -348,32 +352,61 @@ if ($loginreq) {
 	my $user;
 	my $s;
 
+	if (-e "$data/issue") {
+		open(I, "$data/issue") or die;
+		local $/ = undef;
+		$issue = <I>;
+		close(I);
+		$issue = s/\n/\r/og if $mode == 1;
+		local $/ = $nl;
+		$stdout->print($issue) if issue;
+	}
+	
+
 	DXUser->init($userfn);
 	
+	# allow a login from an existing user. I could create a user but
+	# I want to check for valid callsigns and I don't have the 
+	# necessary info / regular expression yet
 	for ($state = 0; $state < 2; ) {
 		alarm($timeout);
 		
 		if ($state == 0) {
 			$stdout->print('login: ');
 			$stdout->flush();
-			local $/ = $mode == 1 ? "\r" : "\n";
+			local $\ = $nl;
 			$s = $stdin->getline();
 			chomp $s;
+			$s =~ s/\s+//og;
+			$s =~ s/-\d+$//o;            # no ssids!
+			cease(0) unless $s gt ' ';
 			$call = uc $s;
 			$user = DXUser->get($call);
 			$state = 1;
 		} elsif ($state == 1) {
 			$stdout->print('password: ');
 			$stdout->flush();
-			local $/ = $mode == 1 ? "\r" : "\n";
+			local $\ = $nl;
 			$s = $stdin->getline();
 			chomp $s;
 			$state = 2;
-			cease(0) if !$user || ($user->passwd && $user->passwd ne $s);
+			if (!$user || ($user->passwd && $user->passwd ne $s)) {
+				$stdout->print("sorry...$nl");
+				cease(0);
+			}
 		}
 	}
 }
 
+# handle callsign and connection type firtling
+sub doclient
+{
+	my $line = shift;
+	my @f = split /\s+/, $line;
+	$call = uc $f[0] if $f[0];
+	$csort = $f[1] if $f[1];
+}
+
 # is this an out going connection?
 if ($connsort eq "connect") {
 	my $mcall = lc $call;
@@ -382,7 +415,7 @@ if ($connsort eq "connect") {
 	@in = <IN>;
 	close IN;
 	
-	#	alarm($timeout);
+	alarm($timeout);
 	
 	for (@in) {
 		chomp;
@@ -391,10 +424,14 @@ 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;
-		dochat($1, $2) if /\s*\'(.*)\'\s+\'(.*)\'/io;          
+		dochat($1, $2) if /\s*\'(.*)\'\s+\'(.*)\'/io;
+		if (/\s*cl\w+\s+(.*)/io) {
+			doclient($1);
+			last;
+		}
 	}
 	
-    dbg('connect', "Connected to $call, starting normal protocol");
+    dbg('connect', "Connected to $call ($csort), starting normal protocol");
 	dbgsub('connect');
 	
 	# if we get here we are connected