fix ambiguity on spotter's SSID

diff --git a/Changes b/Changes
index d2672319f492fc7f26399844e6d81b63fcacc2e3..9d2608f3f177e62a5f779f72df1b8cab9389c624 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 26Feb05=======================================================================
 1. Added show/grayline command from Steve K9AN. This is also aliased to
 show/greyline :-)
+2. fix spot dupe ambiguity on spotter having an SSID (remove it).
 25Feb05=======================================================================
 1. Changed the way spot deduping is done. This is likely to make deduping much
 stricter. In essence a person cannot spot the same call on the same frequency

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 5e324fa47f2af7656ebbff28e7fbcccadb834557..9dc9d5e48506d90961d15ef5e6295a43f58ef9c5 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -535,7 +535,7 @@ sub handle_11
 #      RouteDB::update($_[7], $self->{call});
 #      RouteDB::update($_[6], $_[7]);
        
-       my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $_[6], $_[7]);
+       my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $nossid, $_[7]);
        # global spot filtering on INPUT
        if ($self->{inspotsfilter}) {
                my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
@@ -548,7 +548,7 @@ sub handle_11
        # this goes after the input filtering, but before the add
        # so that if it is input filtered, it isn't added to the dup
        # list. This allows it to come in from a "legitimate" source
-       if (Spot::dup($_[1], $_[2], $d, $_[5], $_[6])) {
+       if (Spot::dup(@spot[0..4])) {
                dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
                return;
        }