From 7daa8d6f851534f39e6ed305b49d1f95c994bce6 Mon Sep 17 00:00:00 2001 From: minima Date: Sun, 19 Aug 2001 13:40:04 +0000 Subject: [PATCH] fix RCMDs --- Changes | 2 ++ perl/DXProt.pm | 5 +---- perl/ExtMsg.pm | 7 ++++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Changes b/Changes index f7826e10..7d590750 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,5 @@ +19Aug01======================================================================= +1. Fix rcmds 17Aug01======================================================================= 1. Sort out PC41 handling to include type 5 records for QRA locators and also remove all filtering (but retain ephemeral dup checking). diff --git a/perl/DXProt.pm b/perl/DXProt.pm index e41951da..88433b57 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -1605,10 +1605,7 @@ sub process_rcmd_reply my $s = $rcmds{$fromnode}; if ($s) { my $dxchan = DXChannel->get($s->{call}); - my $ref = DXChannel->get($user) || $dxchan; - if ($ref->{call} eq $main::mycall) { - $ref = DXChannel->get($main::myalias) || $ref; - } + my $ref = $user eq $tonode ? $dxchan : (DXChannel->get($user) || $dxchan); $ref->send($line) if $ref; delete $rcmds{$fromnode} if !$dxchan; } else { diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm index 7b33b6e2..2f12d426 100644 --- a/perl/ExtMsg.pm +++ b/perl/ExtMsg.pm @@ -200,8 +200,8 @@ sub _docmd last; } } - if ($cmd =~ /^\s*\'.*\'\s+\'.*\'/i) { - $conn->_dochat($cmd, $msg); + if ($cmd =~ /^\s*\'([^\']*)\'\s+\'([^\']*)\'/) { + $conn->_dochat($cmd, $msg, $1, $2); last; } if ($cmd =~ /^\s*cl\w+\s+(.*)/i) { @@ -317,9 +317,10 @@ sub _dochat my $conn = shift; my $cmd = shift; my $line = shift; + my $expect = shift; + my $send = shift; if ($line) { - my ($expect, $send) = $cmd =~ /^\s*\'(.*)\'\s+\'(.*)\'/; if ($expect) { dbg("connect $conn->{cnum}: expecting: \"$expect\" received: \"$line\"") if isdbg('connect'); if ($conn->{abort} && $line =~ /\Q$conn->{abort}/i) { -- 2.43.0