From: minima <minima>
Date: Sat, 26 Feb 2005 21:03:04 +0000 (+0000)
Subject: fix ambiguity on spotter's SSID
X-Git-Tag: 1.53~154
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=331ae9a34defd23c476ceaecdf29d9f49b60faed;p=spider.git

fix ambiguity on spotter's SSID
---

diff --git a/Changes b/Changes
index d2672319..9d2608f3 100644
--- 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 5e324fa4..9dc9d5e4 100644
--- 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;
 	}