X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FExtMsg.pm;h=2fd19873eae890b619030266f1bc34db625bf030;hb=b7e47e72297ced0ec9ce120922e6de2e5614a3fe;hp=de0c0bcaf4640b5e8b962702510e20fc8632fa45;hpb=01f2793abb2aa2bef7762183a33f5e867ab703ee;p=spider.git

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index de0c0bca..2fd19873 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -122,29 +122,34 @@ sub to_connected
 sub new_client {
 	my $server_conn = shift;
     my $sock = $server_conn->{sock}->accept();
-    my $conn = $server_conn->new($server_conn->{rproc});
-	$conn->{sock} = $sock;
-
-    my ($rproc, $eproc) = &{$server_conn->{rproc}} ($conn, $conn->{peerhost} = $sock->peerhost(), $conn->{peerport} = $sock->peerport());
-	if ($eproc) {
-		$conn->{eproc} = $eproc;
-        Msg::set_event_handler ($sock, "error" => $eproc);
+	if ($sock) {
+		my $conn = $server_conn->new($server_conn->{rproc});
+		$conn->{sock} = $sock;
+		
+		my ($rproc, $eproc) = &{$server_conn->{rproc}} ($conn, $conn->{peerhost} = $sock->peerhost(), $conn->{peerport} = $sock->peerport());
+		if ($eproc) {
+			$conn->{eproc} = $eproc;
+			Msg::set_event_handler ($sock, "error" => $eproc);
+		}
+		if ($rproc) {
+			$conn->{rproc} = $rproc;
+			my $callback = sub {$conn->_rcv};
+			Msg::set_event_handler ($sock, "read" => $callback);
+			# send login prompt
+			$conn->{state} = 'WL';
+			#		$conn->send_raw("\xff\xfe\x01\xff\xfc\x01\ff\fd\x22");
+			#		$conn->send_raw("\xff\xfa\x22\x01\x01\xff\xf0");
+			#		$conn->send_raw("\xFF\xFC\x01");
+			$conn->_send_file("$main::data/issue");
+			$conn->send_raw("login: ");
+			$conn->_dotimeout(60);
+		} else { 
+			&{$conn->{eproc}}() if $conn->{eproc};
+			$conn->disconnect();
+		}
+	} else {
+		dbg('err', "ExtMsg: error on accept ($!)");
 	}
-    if ($rproc) {
-        $conn->{rproc} = $rproc;
-        my $callback = sub {$conn->_rcv};
-		Msg::set_event_handler ($sock, "read" => $callback);
-		# send login prompt
-		$conn->{state} = 'WL';
-#		$conn->send_raw("\xff\xfe\x01\xff\xfc\x01\ff\fd\x22");
-#		$conn->send_raw("\xff\xfa\x22\x01\x01\xff\xf0");
-#		$conn->send_raw("\xFF\xFC\x01");
-		$conn->_send_file("$main::data/issue");
-		$conn->send_raw("login: ");
-		$conn->_dotimeout(60);
-    } else { 
-        $conn->disconnect();
-    }
 }
 
 sub start_connect
@@ -312,7 +317,7 @@ sub _dochat
 			}
 			if ($line =~ /\Q$expect/i) {
 				dbg('connect', "got: \"$expect\" sending: \"$send\"");
-				$conn->send_later($send);
+				$conn->send_later("D$conn->{call}|$send");
 				delete $conn->{msg}; # get rid any input if a match
 				return;
 			}
@@ -341,7 +346,7 @@ sub _doclient
 	$conn->conns($call);
 	$conn->{csort} = $f[1] if $f[1];
 	$conn->{state} = 'C';
-	&{$conn->{rproc}}($conn, "O$call|telnet");
+	&{$conn->{rproc}}($conn, "O$call|$conn->{csort}");
 	delete $conn->{cmd};
 	$conn->{timeout}->del if $conn->{timeout};
 }