add a timeout to the outgoing connect

[spider.git] / perl / Msg.pm

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 7af8566e09f800f56b232b471945bdd40c827581..6702f152bc6811334a8cf1f6661791f0d0a2c7b7 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -51,6 +51,7 @@ sub new
                state => 0,
                lineend => "\r\n",
                csort => 'telnet',
+               timeval => 60,
     };
 
        return bless $conn, $class;
@@ -61,20 +62,22 @@ sub new
 sub connect {
     my ($pkg, $to_host, $to_port, $rproc) = @_;
 
+    # Create a connection end-point object
+    my $conn = $pkg;
+       unless (ref $pkg) {
+               $conn = $pkg->new($rproc);
+       }
+       
     # Create a new internet socket
     my $sock = IO::Socket::INET->new (
                                       PeerAddr => $to_host,
                                       PeerPort => $to_port,
                                       Proto    => 'tcp',
-                                      Reuse    => 1);
+                                      Reuse    => 1,
+                                                                         Timeout  => $conn->{timeval} / 2);
 
     return undef unless $sock;
 
-    # Create a connection end-point object
-    my $conn = $pkg;
-       unless (ref $pkg) {
-               $conn = $pkg->new($rproc);
-       }
        $conn->{sock} = $sock;
     
     if ($conn->{rproc}) {
@@ -245,9 +248,12 @@ sub _rcv {                     # Complement to _send
                if ($bytes_read > 0) {
                        if ($msg =~ /\n/) {
                                @lines = split /\r?\n/, $msg;
-                               $lines[0] = '' unless @lines;
-                               $lines[0] = $conn->{msg} . $lines[0] if exists $conn->{msg};
-                               push @lines, ' ' unless @lines;
+                               if (@lines) {
+                                       $lines[0] = $conn->{msg} . $lines[0] if exists $conn->{msg};
+                               } else {
+                                       $lines[0] = $conn->{msg} if exists $conn->{msg};
+                                       push @lines, '' unless @lines;
+                               }
                                if ($msg =~ /\n$/) {
                                        delete $conn->{msg};
                                } else {