fix SSID ambiguity on spotter in DX

[spider.git] / perl / Thingy.pm

diff --git a/perl/Thingy.pm b/perl/Thingy.pm
index 10f20f28714f3a73d988fce6812b95cec8462947..2361561af527edc43c0f474adfc1bc29236ec1a9 100644 (file)
--- a/perl/Thingy.pm
+++ b/perl/Thingy.pm
@@ -104,6 +104,10 @@ sub broadcast
        foreach my $dxchan (DXChannel::get_all()) {
                next if $dxchan == $main::me;
                next if grep $dxchan == $_, @_;
+               next if $dxchan->{call} eq $thing->{origin};
+               next if $thing->{user} && !$dxchan->is_user && $dxchan->{call} eq $thing->{user};
+               
+               dbg("Thingy::broadcast: sending to $dxchan->{call}") if isdbg('thing');
                $thing->send($dxchan); 
        }
 }
@@ -197,7 +201,7 @@ sub add_auth
 {
        my $thing = shift;
        my $s = $thing->{'s'} = sprintf "%X", int(rand() * 100000000);
-       my $auth = Verify->new("DXSp,$main::mycall,$s,$main::version,$main::build");
+       my $auth = Verify->new("DXSp,$main::mycall,$s,$thing->{v},$thing->{b}");
        $thing->{auth} = $auth->challenge($main::me->user->passphrase);
 }