fix who

diff --git a/cmd/who.pl b/cmd/who.pl
index 1ccf9ca8a39bb5b00a055e1d107451c97ba93ad0..ecb45d70f8eff3167934e57522cd62c078f4b05d 100644 (file)
--- a/cmd/who.pl
+++ b/cmd/who.pl
@@ -28,7 +28,8 @@ foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all ) {
        my $name = $dxchan->user->name || " ";
        my $ping = $dxchan->is_node && $dxchan != $DXProt::me ? sprintf("%5.2f", $dxchan->pingave) : "     ";
        my $conn = $dxchan->conn;
-       my $ip = $conn->{peerhost} || '' if $conn;
+       my $ip = '';
+       $ip = $conn->{peerhost} if $conn && $conn->{peerhost};
        push @out, sprintf "%10s $type $sort $t %-10.10s $ping $ip", $call, $name;
 }
 

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index ee2ad231e40dfb8d3b935d62dfcc72fa197e348d..01a30924393e088535a9d2f98f97cff11004b5b7 100644 (file)
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -247,7 +247,7 @@ sub _dochat
        my $conn = shift;
        my $cmd = shift;
        my $line = shift;
-       
+               
        if ($line) {
                my ($expect, $send) = $cmd =~ /^\s*\'(.*)\'\s+\'(.*)\'/;
                if ($expect) {
@@ -261,6 +261,7 @@ sub _dochat
                        if ($line =~ /$expect/i) {
                                dbg('connect', "got: \"$expect\" sending: \"$send\"");
                                $conn->send_later($send);
+                               delete $conn->{msg}; # get rid any input if a match
                                return;
                        }
                }