add k8t,k8o,TX5BTY and remove kh6nd

diff --git a/Changes b/Changes
index 2e686ce132a59d762bfc12b954e4feaea809468c..5f375d5bdf20180f1c275e8c0a50d8c70aae1953 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 29Oct02=======================================================================
 1. make sh/log et al a bit more efficient.
 2. fix dupe message in dx.
+3. add k8T, K8O to KH8 and TX5BTY to FO/A
 25Oct02=======================================================================
 1. remove the dupefile automatically if it becomes corrupted
 2. instrument the startup slightly more

diff --git a/data/cty.dat b/data/cty.dat
index 985c09450d11fbd1ca288a8585d6db1ea59ec3b6..a88041f4e3d3c0978ba4c5e5f0b15aa5e174512d 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -262,7 +262,7 @@ French Polynesia:         32:  63:  OC:  -17.60:   149.50:    10.0:  FO:
     FO,FO0FRA,TO8K;\r
 Austral Is.:              32:  63:  OC:  -22.50:   152.00:    10.0:  FO/a:\r
     FO0AWI/A,FO0DEH,FO0FI,FO0KOJ,FO0MAC/A,FO0MIZ/A,FO0PAP/A,FO0SUC,FO0WEG,\r
-    FO0XUU/A;\r
+    FO0XUU/A,TX5BTY;\r
 Clipperton I.:            07:  10:  NA:   10.30:   109.20:     7.0:  FO/c:\r
     FO0AAA,FO0CI;\r
 Marquesas Is.:            31:  63:  OC:   -9.00:   139.50:    10.0:  FO/m:\r
@@ -429,7 +429,7 @@ Hawaii:                   31:  61:  OC:   21.30:   157.90:    10.0:  KH6:
 Kure I.:                  31:  61:  OC:   28.40:   178.40:    11.0:  KH7K:\r
     AH7K,KH7K,NH7K,WH7K;\r
 American Samoa:           32:  62:  OC:  -14.30:   170.80:    11.0:  KH8:\r
-    AH8,KH8,KS6BK,KS6CQ,KS6DV,KS6EL,KS6FL,KS6FO,KS6FS,NH8,WH8;\r
+    AH8,KH8,KS6BK,KS6CQ,KS6DV,KS6EL,KS6FL,KS6FO,KS6FS,NH8,WH8,K8T,K8O;\r
 Wake I.:                  31:  65:  OC:   19.30:  -166.60:   -12.0:  KH9:\r
     AH9,KH9,NH9,WH9;\r
 Alaska:                   01:  01:  NA:   61.20:   150.00:     9.0:  KL:\r

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index c6d0bbb03cc3a53a3eaa60a15aad3cdda33273f9..3e6634a6990fd76fb0aad5a03db6ae38f338bb50 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -1021,6 +1021,7 @@
   'FR/T' => '117',
   'FR4FA' => '116',
   'FR5AI' => '115',
+  'FR5HG/G' => '115',
   'FR5ZQ/E' => '116',
   'FR5ZQ/G' => '115',
   'FR5ZQ/J' => '116',
@@ -1271,7 +1272,9 @@
   'K8FC' => '293',
   'K8HC' => '293',
   'K8LT' => '293',
+  'K8O' => '177',
   'K8PO' => '293',
+  'K8T' => '177',
   'K8UC' => '293',
   'K8WT' => '293',
   'K9' => '514,515,516',
@@ -1351,8 +1354,6 @@
   'KH5' => '173',
   'KH5K' => '174',
   'KH6' => '175,387',
-  'KH6CP' => '293',
-  'KH6ND' => '293',
   'KH7' => '175,387',
   'KH7K' => '176',
   'KH8' => '177',
@@ -2359,6 +2360,7 @@
   'TX0C' => '119',
   'TX0DX' => '548',
   'TX0K' => '120',
+  'TX5BTY' => '110',
   'TX8' => '107',
   'TX8FU' => '107',
   'TY' => '244',

diff --git a/data/rsgb.cty b/data/rsgb.cty
index 35e6f3f1f00606f62322676a53c4a1195762881c..5342b8a484969f19714457d3d5b3c442822fb695 100644 (file)
--- a/data/rsgb.cty
+++ b/data/rsgb.cty
@@ -166,7 +166,7 @@ Mongolia:                 AS: 33: 23: JT:    JT=JU=JV;
 Svalbard:                 EU: 18: 40: JW:    JW;
 Jan Mayen:                EU: 18: 40: JX:    JX;
 Jordan:                   AS: 39: 20: JY:    JY;
-United States:            NA: 08: 05: K:     4U1WB=A=AH2M=AH3C=AH3D=AL7H=K=KH6CP=KH6ND=KL7DN/1=KL7HIR=KL7HIR/3=KL7NA=KL7TF/4=KP4XS=N=NL7H/6=W=WL7WO=WL7Y=WN4KKN;
+United States:            NA: 08: 05: K:     4U1WB=A=AH2M=AH3C=AH3D=AL7H=K=KL7DN/1=KL7HIR=KL7HIR/3=KL7NA=KL7TF/4=KP4XS=N=NL7H/6=W=WL7WO=WL7Y=WN4KKN;
 Guantanamo Bay:           NA: 11: 08: KG4:   KG4=KG4AU;
 Mariana Islands:          OC: 64: 27: KH0:   AH0=KG6RE=KG6RI=KG6SB=KG6SL=KH0=NH0=WH0;
 Baker & Howland Islands:  OC: 61: 31: KH1:   KH1=AH1=NH1=WH1;

diff --git a/perl/QXProt.pm b/perl/QXProt.pm
index aadb0d2fd98d75432de6ac3438a942157e5778d3..fd945ce1a2320a13c7b826d47e849a1f44aaee4f 100644 (file)
--- a/perl/QXProt.pm
+++ b/perl/QXProt.pm
@@ -67,7 +67,7 @@ sub sendinit
 {
        my $self = shift;
        
-       $self->send($self->gen1);
+       $self->send($self->genI);
 }
 
 sub normal
@@ -76,8 +76,8 @@ sub normal
                DXProt::normal(@_);
                return;
        }
-       my ($id, $fromnode, $msgid, $incs);
-       return unless ($id, $fromnode, $msgid, $incs) = $_[1] =~ /^QX(\d\d)\^([-A-Z0-9]+)\^([0-9A-F]{1,4})\^.*\^([0-9A-F]{2})$/;
+       my ($sort, $tonode, $fromnode, $msgid, $incs);
+       return unless ($sort, $tonode, $fromnode, $msgid, $incs) = $_[1] =~ /^QX([A-Z])\^(\*|[-A-Z0-9]+)\^([-A-Z0-9]+)\^([0-9A-F]{1,4})\^.*\^([0-9A-F]{2})$/;
 
        $msgid = hex $msgid;
        my $noderef = Route::Node::get($fromnode);
@@ -92,7 +92,7 @@ sub normal
 
        return unless $noderef->newid($msgid);
 
-       $_[0]->handle($id, $fromnode, $msgid, $_[1]);
+       $_[0]->handle($sort, $tonode, $fromnode, $msgid, $_[1]);
        return;
 }
 
@@ -100,8 +100,8 @@ sub handle
 {
        no strict 'subs';
        my $self = shift;
-       my $id = 0 + shift;
-       my $sub = "handle$id";
+       my $sort = shift;
+       my $sub = "handle$sort";
        $self->$sub(@_) if $self->can($sub);
        return;
 }
@@ -110,9 +110,9 @@ sub gen
 {
        no strict 'subs';
        my $self = shift;
-       my $id = 0 + shift;
-       my $sub = "gen$id";
-       $self->$sub(@_) if $self->can($sub);
+       my $sort = shift;
+       my $sub = "gen$sort";
+       $self->$sub(@_) if $self->can($sub);
        return;
 }
 
@@ -147,17 +147,18 @@ my $msgid = 1;
 
 sub frame
 {
-       my $pcno = shift;
+       my $sort = shift;
+       my $to = shift || "*";
        my $ht;
        
        $ht = sprintf "%X", $msgid;
-       my $line = join '^', sprintf("QX%02d", $pcno), $main::mycall, $ht, @_;
+       my $line = join '^', "QX$sort", $to, $main::mycall, $ht, @_;
        my $cs = sprintf "%02X", unpack("%32C*", $line) & 255;
        $msgid = 1 if ++$msgid > 0xffff;
        return "$line^$cs";
 }
 
-sub handle1
+sub handleI
 {
        my $self = shift;
        
@@ -168,7 +169,7 @@ sub handle1
                $self->disconnect;
        }
        if ($self->{outbound}) {
-               $self->send($self->gen1);
+               $self->send($self->genI);
        } 
        if ($self->{sort} ne 'S' && $f[4] eq 'DXSpider') {
                $self->{user}->{sort} = $self->{sort} = 'S';
@@ -176,18 +177,33 @@ sub handle1
        }
        $self->{version} = $f[5];
        $self->{build} = $f[6];
-       $self->state('normal');
+       $self->state('init1');
        $self->{lastping} = 0;
 }
 
-sub gen1
+sub genI
 {
        my $self = shift;
        my $inp = Verify->new;
-       return frame(1, 1, "DXSpider", ($main::version + 53) * 100, $main::build, $inp->challenge, $inp->response($self->user->passphrase, $self->call, $main::mycall));
+       return frame('I', $self->call, 1, "DXSpider", ($main::version + 53) * 100, $main::build, $inp->challenge, $inp->response($self->user->passphrase, $self->call, $main::mycall));
+}
+
+sub handleB
+{
+
+}
+
+sub genB
+{
+
+}
+
+sub handleP
+{
+
 }
 
-sub handle2
+sub genP
 {
 
 }