From: minima <minima>
Date: Thu, 7 Nov 2002 16:44:55 +0000 (+0000)
Subject: fix 3 digit longitudes
X-Git-Tag: PRE-1-52~113
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=74803d3f4937220f536cd67b515faa15da6e0520;p=spider.git

fix 3 digit longitudes
---

diff --git a/Changes b/Changes
index 62800dd0..ed309c2c 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+07Nov02=======================================================================
+1. allow three digit longitudes
 29Oct02=======================================================================
 1. make sh/log et al a bit more efficient.
 2. fix dupe message in dx.
diff --git a/perl/DXBearing.pm b/perl/DXBearing.pm
index 066826d6..b7101a53 100644
--- a/perl/DXBearing.pm
+++ b/perl/DXBearing.pm
@@ -110,7 +110,7 @@ sub bdist
 # turn a lat long string into floating point lat and long
 sub stoll
 {
-	my ($latd, $latm, $latl, $longd, $longm, $longl) = $_[0] =~ /(\d{1,2})\s+(\d{1,2})\s*([NnSs])\s+(\d{1,2})\s+(\d{1,2})\s*([EeWw])/;
+	my ($latd, $latm, $latl, $longd, $longm, $longl) = $_[0] =~ /(\d{1,2})\s+(\d{1,2})\s*([NnSs])\s+(\d{1,3})\s+(\d{1,2})\s*([EeWw])/;
 	
 	$longd += ($longm/60);
 	$longd = 0-$longd if (uc $longl) eq 'W'; 
diff --git a/perl/QXProt.pm b/perl/QXProt.pm
index 8ab1f4c6..82cb2075 100644
--- a/perl/QXProt.pm
+++ b/perl/QXProt.pm
@@ -134,15 +134,6 @@ sub disconnect
 	$self->DXProt::disconnect(@_);
 }
 
-sub sendallnodes
-{
-}
-
-sub sendallusers
-{
-
-}
-
 my $msgid = 1;
 
 sub frame
@@ -162,21 +153,21 @@ sub handleI
 {
 	my $self = shift;
 	
-	my @f = split /\^/, $_[2];
-	my $inv = Verify->new($f[8]);
-	unless ($inv->verify($f[9], $main::me->user->passphrase, $main::mycall, $self->call)) {
+	my @f = split /\^/, $_[3];
+	my $inv = Verify->new($f[7]);
+	unless ($inv->verify($f[8], $main::me->user->passphrase, $main::mycall, $self->call)) {
 		$self->sendnow('D','Sorry...');
 		$self->disconnect;
 	}
 	if ($self->{outbound}) {
 		$self->send($self->genI);
 	} 
-	if ($self->{sort} ne 'S' && $f[5] eq 'DXSpider') {
+	if ($self->{sort} ne 'S' && $f[4] eq 'DXSpider') {
 		$self->{user}->{sort} = $self->{sort} = 'S';
 		$self->{user}->{priv} = $self->{priv} = 1 unless $self->{priv};
 	}
-	$self->{version} = $f[6];
-	$self->{build} = $f[7];
+	$self->{version} = $f[5];
+	$self->{build} = $f[6];
 	$self->state('init1');
 	$self->{lastping} = 0;
 }
@@ -185,15 +176,15 @@ sub genI
 {
 	my $self = shift;
 	my $inp = Verify->new;
-	return frame('I', $self->call, 1, "DXSpider", ($main::version + 53) * 100, $main::build, $inp->challenge, $inp->response($self->user->passphrase, $self->call, $main::mycall));
+	return frame('I', $self->call, "DXSpider", ($main::version + 53) * 100, $main::build, $inp->challenge, $inp->response($self->user->passphrase, $self->call, $main::mycall));
 }
 
-sub handleB
+sub handleR
 {
 
 }
 
-sub genB
+sub genR
 {
 
 }