made ssids unique everywhere

[spider.git] / cmd / talk.pl

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 2d647d0f68a635291149884fe504df29307ad83e..827ff672d3a26210af2e95aabe8ddabc0f53a6ff 100644 (file)
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -24,7 +24,9 @@ if ($argv[1] eq '>') {
 }
 
 my $call = $via ? $via : $to;
-my $ref = DXCluster->get($call);
+my $ref = DXCluster->get_exact($call);     # try an exact call
+$ref = DXCluster->get($call) unless $ref;  # try one ignoring SSID
+$ref = DXChannel->get($call) unless $ref;  # is it local?
 
 # if we haven't got an explicit via and we can't see them, try their node
 unless ($ref || $via) {
@@ -47,7 +49,7 @@ if ($dxchan && $dxchan->is_user) {
 } else {
        $line =~ s/\^//og;                      # remove any ^ characters
        my $prot = DXProt::pc10($from, $to, $via, $line);
-       DXProt::route($via?$via:$to, $prot);
+       DXProt::route(undef,$via?$via:$to, $prot);
        Log('talk', $to, $from, $via?$via:$main::mycall, $line);
 }