X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FMsg.pm;h=333693b73a2e65d2ef89d0a620e4b4da9133befa;hb=55f3823f3ad86d76e1e995b0f255f1804684de18;hp=3f52e39dfe8057d4fb202f364be81eb36567ceb3;hpb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 3f52e39d..333693b7 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -344,11 +344,12 @@ sub new_server {
 	my $self = $pkg->new($login_proc);
 	
     $self->{sock} = IO::Socket::INET->new (
-                                          LocalAddr => $my_host,
-                                          LocalPort => $my_port,
+                                          LocalAddr => "$my_host:$my_port",
+#                                          LocalPort => $my_port,
                                           Listen    => SOMAXCONN,
                                           Proto     => 'tcp',
-                                          Reuse     => 1);
+                                          ReuseAddr => 1,
+										  );
     die "Could not create socket: $! \n" unless $self->{sock};
     set_event_handler ($self->{sock}, read => sub { $self->new_client }  );
 	return $self;
@@ -386,11 +387,29 @@ sub _rcv {                     # Complement to _send
 	$bytes_read = sysread ($sock, $msg, 1024, 0);
 	if (defined ($bytes_read)) {
 		if ($bytes_read > 0) {
-			$conn->{msg} .= $msg;
 			if (isdbg('raw')) {
 				my $call = $conn->{call} || 'none';
 				dbgdump('raw', "$call read $bytes_read: ", $msg);
 			}
+			if ($conn->{echo}) {
+				my @ch = split //, $msg;
+				my $out;
+				for (@ch) {
+					if (/[\cH\x7f]/) {
+						$out .= "\cH \cH";
+						$conn->{msg} =~ s/.$//;
+					} else {
+						$out .= $_;
+						$conn->{msg} .= $_;
+					}
+				}
+				if (defined $out) {
+					set_event_handler ($sock, write => sub{$conn->_send(0)});
+					push @{$conn->{outqueue}}, $out;
+				}
+			} else {
+				$conn->{msg} .= $msg;
+			}
 		} 
 	} else {
 		if (_err_will_block($!)) {