X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=8e17cfa875c251dbb2c850bc4d636bd48b2fffe0;hb=0ea4dd9653f0c179c89b089bd595244b8dc14e69;hp=2f12d4262f87e2f6c68759ce76c80dace71368bb;hpb=7daa8d6f851534f39e6ed305b49d1f95c994bce6;p=spider.git

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 2f12d426..8e17cfa8 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -21,6 +21,12 @@ use IO::File;
 use IO::Socket;
 use IPC::Open3;
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw(@ISA $deftimeout);
 
 @ISA = qw(Msg);
@@ -54,6 +60,12 @@ sub send_raw
     Msg::set_event_handler ($sock, "write" => sub {$conn->_send(0)});
 }
 
+sub echo
+{
+	my $conn = shift;
+	$conn->{echo} = shift;
+}
+
 sub dequeue
 {
 	my $conn = shift;
@@ -77,7 +89,7 @@ sub dequeue
 		if ($conn->{msg} =~ /\cJ$/) {
 			delete $conn->{msg};
 		} else {
-			$conn->{msg} = pop @lines;
+			$conn->{msg} =~ s/([^\cM\cJ]*)\cM?\cJ//g;
 		}
 		while (defined ($msg = shift @lines)) {
 			dbg("connect $conn->{cnum}: $msg") if $conn->{state} ne 'C' && isdbg('connect');
@@ -89,14 +101,37 @@ sub dequeue
 				&{$conn->{rproc}}($conn, "I$conn->{call}|$msg");
 			} elsif ($conn->{state} eq 'WL' ) {
 				$msg = uc $msg;
-				if (is_callsign($msg)) {
+				if (is_callsign($msg) && $msg !~ m|/| ) {
 					my $sort = $conn->{csort};
 					$sort = 'local' if $conn->{peerhost} eq "127.0.0.1";
-					$conn->to_connected($msg, 'A', $sort);
+					my $uref;
+					if ($main::passwdreq || ($uref = DXUser->get_current($msg)) && $uref->passwd ) {
+						$conn->conns($msg);
+						$conn->{state} = 'WP';
+						$conn->{decho} = $conn->{echo};
+						$conn->{echo} = 0;
+						$conn->send_raw('password: ');
+					} else {
+						$conn->to_connected($msg, 'A', $sort);
+					}
 				} else {
 					$conn->send_now("Sorry $msg is an invalid callsign");
 					$conn->disconnect;
 				}
+			} elsif ($conn->{state} eq 'WP' ) {
+				my $uref = DXUser->get_current($conn->{call});
+				$msg =~ s/[\r\n]+$//;
+				if ($uref && $msg eq $uref->passwd) {
+					my $sort = $conn->{csort};
+					$conn->{echo} = $conn->{decho};
+					delete $conn->{decho};
+					$sort = 'local' if $conn->{peerhost} eq "127.0.0.1";
+					$conn->{usedpasswd} = 1;
+					$conn->to_connected($conn->{call}, 'A', $sort);
+				} else {
+					$conn->send_now("Sorry");
+					$conn->disconnect;
+				}
 			} elsif ($conn->{state} eq 'WC') {
 				if (exists $conn->{cmd} && @{$conn->{cmd}}) {
 					$conn->_docmd($msg);
@@ -154,6 +189,7 @@ sub new_client {
 				$conn->_send_file("$main::data/issue");
 				$conn->send_raw("login: ");
 				$conn->_dotimeout(60);
+				$conn->{echo} = 1;
 			} else { 
 				&{$conn->{eproc}}() if $conn->{eproc};
 				$conn->disconnect();