I think I have most the SSID probs cracked.
authordjk <djk>
Mon, 30 Nov 1998 15:26:02 +0000 (15:26 +0000)
committerdjk <djk>
Mon, 30 Nov 1998 15:26:02 +0000 (15:26 +0000)
connect/gb7tlh
perl/DXCluster.pm
perl/DXProt.pm
perl/DXProtout.pm
perl/DXUser.pm
perl/client.pl
perl/cluster.pl
perl/create_sysop.pl

index a844b21d811910de5feae51fe04eed44327ea49b..59fc857acce9dfb80ca7dd7064cb2404906ee857 100644 (file)
@@ -1,5 +1,6 @@
 timeout 15
-connect ax25 /usr/sbin/netrom_call bbs gb7djk g1tlh
+# don't forget to chmod 4775 netrom_call!
+connect ax25 /usr/sbin/netrom_call bbs gb7djk-1 g1tlh
 'Connect' ''
 'Connect' 'cluster'
 'Connect'
index 51c63f8239ed7af492148b68cf5f67007a5254af..25dafaed20d249cdafd994823d42dfdd068e9c2c 100644 (file)
@@ -49,11 +49,45 @@ sub alloc
   return $self;
 }
 
+# get an entry exactly as it is
+sub get_exact
+{
+  my ($pkg, $call) = @_;
+
+  # belt and braces
+  $call = uc $call;
+  
+  # search for 'as is'
+  return $cluster{$call}; 
+}
+
+#
 # search for a call in the cluster
+# taking into account SSIDs
+#
 sub get
 {
   my ($pkg, $call) = @_;
-  return $cluster{$call};
+
+  # belt and braces
+  $call = uc $call;
+  
+  # search for 'as is'
+  my $ref = $cluster{$call}; 
+  return $ref if $ref;
+
+  # search for the unSSIDed one
+  $call =~ s/-\d+$//o;
+  $ref = $cluster{$call};
+  return $ref if $ref;
+  
+  # search for the SSIDed one
+  my $i;
+  for ($i = 1; $i < 17; $i++) {
+         $ref = $cluster{"$call-$i"};
+         return $ref if $ref;
+  }
+  return undef;
 }
 
 # get all 
@@ -137,7 +171,7 @@ sub new
 {
   my ($pkg, $dxchan, $node, $call, $confmode, $here) = @_;
 
-  die "tried to add $call when it already exists" if DXCluster->get($call);
+  die "tried to add $call when it already exists" if DXCluster->get_exact($call);
   
   my $self = $pkg->alloc($dxchan, $call, $confmode, $here);
   $self->{mynode} = $node;
index d1352b8c6f1bac886960dd04925e684c23f9357b..58dfd4973877731827c87d9695274917f0b3f13c 100644 (file)
@@ -26,17 +26,17 @@ use Carp;
 use strict;
 use vars qw($me $pc11_max_age $pc11_dup_age %dup $last_hour);
 
-$me = undef;                # the channel id for this cluster
-$pc11_max_age = 1*3600;     # the maximum age for an incoming 'real-time' pc11
-$pc11_dup_age = 24*3600;    # the maximum time to keep the dup list for
-%dup = ();                  # the pc11 and 26 dup hash 
-$last_hour = time;          # last time I did an hourly periodic update
+$me = undef;                                   # the channel id for this cluster
+$pc11_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc11
+$pc11_dup_age = 24*3600;               # the maximum time to keep the dup list for
+%dup = ();                                             # the pc11 and 26 dup hash 
+$last_hour = time;                             # last time I did an hourly periodic update
 
 sub init
 {
-  my $user = DXUser->get($main::mycall);
-  $me = DXProt->new($main::mycall, undef, $user); 
-#  $me->{sort} = 'M';    # M for me
+       my $user = DXUser->get($main::mycall);
+       $me = DXProt->new($main::mycall, undef, $user); 
+       #  $me->{sort} = 'M';    # M for me
 }
 
 #
@@ -45,9 +45,9 @@ sub init
 
 sub new 
 {
-  my $self = DXChannel::alloc(@_);
-  $self->{sort} = 'A';   # in absence of how to find out what sort of an object I am
-  return $self;
+       my $self = DXChannel::alloc(@_);
+       $self->{sort} = 'A';            # in absence of how to find out what sort of an object I am
+       return $self;
 }
 
 # this is how a pc connection starts (for an incoming connection)
@@ -55,29 +55,29 @@ sub new
 # all the crap that comes between).
 sub start
 {
-  my ($self, $line, $sort) = @_;
-  my $call = $self->{call};
-  my $user = $self->{user};
-      
-  # remember type of connection
-  $self->{consort} = $line;
-  $self->{outbound} = $sort eq 'O';
-  $self->{priv} = $user->priv;
-  $self->{lang} = $user->lang;
-  $self->{consort} = $line;                # save the connection type
-  $self->{here} = 1;
-  
-  # set unbuffered
-  $self->send_now('B',"0");
-  
-  # send initialisation string
-  if (!$self->{outbound}) {
-         $self->send(pc38()) if DXNode->get_all();
-         $self->send(pc18());
-  }
-  $self->state('init');
-  $self->pc50_t(time);
-  Log('DXProt', "$call connected");
+       my ($self, $line, $sort) = @_;
+       my $call = $self->{call};
+       my $user = $self->{user};
+       
+       # remember type of connection
+       $self->{consort} = $line;
+       $self->{outbound} = $sort eq 'O';
+       $self->{priv} = $user->priv;
+       $self->{lang} = $user->lang;
+       $self->{consort} = $line;       # save the connection type
+       $self->{here} = 1;
+       
+       # set unbuffered
+       $self->send_now('B',"0");
+       
+       # send initialisation string
+       if (!$self->{outbound}) {
+               $self->send(pc38()) if DXNode->get_all();
+               $self->send(pc18());
+       }
+       $self->state('init');
+       $self->pc50_t(time);
+       Log('DXProt', "$call connected");
 }
 
 #
@@ -85,340 +85,374 @@ sub start
 #
 sub normal
 {
-  my ($self, $line) = @_;
-  my @field = split /[\^\~]/, $line;
-  
-  # ignore any lines that don't start with PC
-  return if !$field[0] =~ /^PC/;
-
-  # process PC frames
-  my ($pcno) = $field[0] =~ /^PC(\d\d)/;          # just get the number
-  return if $pcno < 10 || $pcno > 51;
-  
-  SWITCH: {
-    if ($pcno == 10) {             # incoming talk
-
-      # is it for me or one of mine?
-         my $call = ($field[5] gt ' ') ? $field[5] : $field[2];
-         if ($call eq $main::mycall || grep $_ eq $call, get_all_user_calls()) {
-           
-               # yes, it is
-               my $text = unpad($field[3]);
-               my $ref = DXChannel->get($call);
-               $ref->send("$call de $field[1]: $text") if $ref;
-               Log('talk', $call, $field[1], $field[6], $text);
-         } else {
-           route($field[2], $line);       # relay it on its way
-         }
-         return;
-       }
+       my ($self, $line) = @_;
+       my @field = split /[\^\~]/, $line;
        
-    if ($pcno == 11 || $pcno == 26) {             # dx spot
-
-      # if this is a 'nodx' node then ignore it
-         last SWITCH if grep $field[7] =~ /^$_/,  @DXProt::nodx_node;
-         
-      # convert the date to a unix date
-         my $d = cltounix($field[3], $field[4]);
-         return if !$d || ($pcno == 11 && $d < $main::systime - $pc11_max_age);  # bang out (and don't pass on) if date is invalid or the spot is too old
-         
-         # strip off the leading & trailing spaces from the comment
-         my $text = unpad($field[5]);
-         
-         # store it away
-         my $spotter = $field[6];
-         $spotter =~ s/-\d+$//o;         # strip off the ssid from the spotter
-
-      # do some de-duping
-         my $dupkey = "$field[1]$field[2]$d$text$field[6]";
-         return if $dup{$dupkey};
-         $dup{$dupkey} = $d;
-         
-         my $spot = Spot::add($field[1], $field[2], $d, $text, $spotter);
-         
-         # send orf to the users
-      if ($spot && $pcno == 11) {
-           my $buf = Spot::formatb($field[1], $field[2], $d, $text, $spotter);
-        broadcast_users("$buf\a\a");
-         }
-         
-         last SWITCH;
-       }
+       # ignore any lines that don't start with PC
+       return if !$field[0] =~ /^PC/;
        
-    if ($pcno == 12) {             # announces
+       # process PC frames
+       my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
+       return if $pcno < 10 || $pcno > 51;
        
-         if ($field[2] eq '*' || $field[2] eq $main::mycall) {
-
-        # strip leading and trailing stuff
-           my $text = unpad($field[3]);
-               my $target;
-               my $to = 'To ';
-               my @list;
+ SWITCH: {
+               if ($pcno == 10) {              # incoming talk
+                       
+                       # is it for me or one of mine?
+                       my $call = ($field[5] gt ' ') ? $field[5] : $field[2];
+                       if ($call eq $main::mycall || grep $_ eq $call, get_all_user_calls()) {
+                               
+                               # yes, it is
+                               my $text = unpad($field[3]);
+                               my $ref = DXChannel->get($call);
+                               $ref->send("$call de $field[1]: $text") if $ref;
+                               Log('talk', $call, $field[1], $field[6], $text);
+                       } else {
+                               route($field[2], $line); # relay it on its way
+                       }
+                       return;
+               }
                
-           if ($field[4] eq '*') {          # sysops
-                 $target = "Sysops";
-                 @list = map { $_->priv >= 5 ? $_ : () } get_all_users();
-               } elsif ($field[4] gt ' ') {     # speciality list handling
-                 my ($name) = split /\./, $field[4]; 
-          $target = "$name";          # put the rest in later (if bothered) 
-        } 
+               if ($pcno == 11 || $pcno == 26) { # dx spot
+                       
+                       # if this is a 'nodx' node then ignore it
+                       last SWITCH if grep $field[7] =~ /^$_/,  @DXProt::nodx_node;
+                       
+                       # convert the date to a unix date
+                       my $d = cltounix($field[3], $field[4]);
+                       return if !$d || ($pcno == 11 && $d < $main::systime - $pc11_max_age); # bang out (and don't pass on) if date is invalid or the spot is too old
+                       
+                       # strip off the leading & trailing spaces from the comment
+                       my $text = unpad($field[5]);
+                       
+                       # store it away
+                       my $spotter = $field[6];
+                       $spotter =~ s/-\d+$//o; # strip off the ssid from the spotter
+                       
+                       # do some de-duping
+                       my $dupkey = "$field[1]$field[2]$d$text$field[6]";
+                       return if $dup{$dupkey};
+                       $dup{$dupkey} = $d;
+                       
+                       my $spot = Spot::add($field[1], $field[2], $d, $text, $spotter);
+                       
+                       # send orf to the users
+                       if ($spot && $pcno == 11) {
+                               my $buf = Spot::formatb($field[1], $field[2], $d, $text, $spotter);
+                               broadcast_users("$buf\a\a");
+                       }
+                       
+                       last SWITCH;
+               }
                
-               if ($field[6] eq '1') {
-                       $target = "WX"; 
-                       $to = '';
+               if ($pcno == 12) {              # announces
+                       
+                       if ($field[2] eq '*' || $field[2] eq $main::mycall) {
+                               
+                               # strip leading and trailing stuff
+                               my $text = unpad($field[3]);
+                               my $target;
+                               my $to = 'To ';
+                               my @list;
+                               
+                               if ($field[4] eq '*') { # sysops
+                                       $target = "Sysops";
+                                       @list = map { $_->priv >= 5 ? $_ : () } get_all_users();
+                               } elsif ($field[4] gt ' ') { # speciality list handling
+                                       my ($name) = split /\./, $field[4]; 
+                                       $target = "$name"; # put the rest in later (if bothered) 
+                               } 
+                               
+                               if ($field[6] eq '1') {
+                                       $target = "WX"; 
+                                       $to = '';
+                               }
+                               $target = "All" if !$target;
+                               
+                               if (@list > 0) {
+                                       broadcast_list("$to$target de $field[1]: $text", @list);
+                               } else {
+                                       broadcast_users("$target de $field[1]: $text");
+                               }
+                               Log('ann', $target, $field[1], $text);
+                               
+                               return if $field[2] eq $main::mycall; # it's routed to me
+                       } else {
+                               route($field[2], $line);
+                               return;                 # only on a routed one
+                       }
+                       
+                       last SWITCH;
                }
-               $target = "All" if !$target;
                
-               if (@list > 0) {
-                 broadcast_list("$to$target de $field[1]: $text", @list);
-               } else {
-                 broadcast_users("$target de $field[1]: $text");
+               if ($pcno == 13) {
+                       last SWITCH;
+               }
+               if ($pcno == 14) {
+                       last SWITCH;
+               }
+               if ($pcno == 15) {
+                       last SWITCH;
                }
-               Log('ann', $target, $field[1], $text);
                
-               return if $field[2] eq $main::mycall;   # it's routed to me
-         } else {
-           route($field[2], $line);
-               return;                     # only on a routed one
-         }
-         
-         last SWITCH;
-       }
-       
-    if ($pcno == 13) {last SWITCH;}
-    if ($pcno == 14) {last SWITCH;}
-    if ($pcno == 15) {last SWITCH;}
-       
-    if ($pcno == 16) {              # add a user
-         my $node = DXCluster->get($field[1]);
-         last SWITCH if !$node;        # ignore if havn't seen a PC19 for this one yet
-         my $i;
-         
-         for ($i = 2; $i < $#field; $i++) {
-           my ($call, $confmode, $here) = $field[$i] =~ /^(\w+) (-) (\d)/o;
-               next if length $call < 3;
-               next if !$confmode;
-               $call = uc $call;
-        $call =~ s/-\d+$//o;        # remove ssid
-               next if DXCluster->get($call);    # we already have this (loop?)
+               if ($pcno == 16) {              # add a user
+                       my $node = DXCluster->get_exact($field[1]); 
+                       last SWITCH if !$node; # ignore if havn't seen a PC19 for this one yet
+                       my $i;
+                       
+                       for ($i = 2; $i < $#field; $i++) {
+                               my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (-) (\d)/o;
+                               next if length $call < 3;
+                               next if !$confmode;
+                               $call = uc $call;
+                               next if DXCluster->get_exact($call); # we already have this (loop?)
+                               
+                               $confmode = $confmode eq '*';
+                               DXNodeuser->new($self, $node, $call, $confmode, $here);
+                               
+                               # add this station to the user database, if required
+                               $call =~ s/-\d+$//o;        # remove ssid for users
+                               my $user = DXUser->get_current($call);
+                               $user = DXUser->new($call) if !$user;
+                               $user->node($node->call);
+                               $user->homenode($node->call) if !$user->homenode;
+                               $user->put;
+                       }
+                       
+                       # queue up any messages (look for privates only)
+                       DXMsg::queue_msg(1) if $self->state eq 'normal';     
+                       last SWITCH;
+               }
                
-               $confmode = $confmode eq '*';
-               DXNodeuser->new($self, $node, $call, $confmode, $here);
+               if ($pcno == 17) {              # remove a user
+                       
+                       my $ref = DXCluster->get_exact($field[1]);
+                       $ref->del() if $ref;
+                       last SWITCH;
+               }
                
-               # add this station to the user database, if required
-               my $user = DXUser->get_current($call);
-               $user = DXUser->new($call) if !$user;
-               $user->node($node->call) if !$user->node;
-               $user->put;
-         }
-         
-         # queue up any messages (look for privates only)
-         DXMsg::queue_msg(1) if $self->state eq 'normal';     
-         last SWITCH;
-       }
-       
-    if ($pcno == 17) {              # remove a user
-         my $ref = DXCluster->get($field[1]);
-         $ref->del() if $ref;
-         last SWITCH;
-       }
-       
-    if ($pcno == 18) {              # link request
-         $self->send_local_config();
-         $self->send(pc20());
-      $self->state('init');    
-         last SWITCH;
-       }
-       
-    if ($pcno == 19) {               # incoming cluster list
-      my $i;
-         for ($i = 1; $i < $#field-1; $i += 4) {
-           my $here = $field[$i];
-           my $call = uc $field[$i+1];
-               my $confmode = $field[$i+2] eq '*';
-               my $ver = $field[$i+3];
-
-               # now check the call over
-               next if DXCluster->get($call);   # we already have this
+               if ($pcno == 18) {              # link request
+                       $self->send_local_config();
+                       $self->send(pc20());
+                       $self->state('init');   
+                       last SWITCH;
+               }
                
-               # check for sane parameters
-               next if $ver < 5000;             # only works with version 5 software
-               next if length $call < 3;        # min 3 letter callsigns
-        DXNode->new($self, $call, $confmode, $here, $ver);
-
-        # unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect)
-               my $mref = DXMsg::get_busy($call);
-               $mref->stop_msg($self) if $mref;
-
-               # add this station to the user database, if required
-               my $user = DXUser->get_current($call);
-               $user = DXUser->new($call) if !$user;
-               $user->node($call) if !$user->node;
-               $user->sort('A');
-               $user->put;
-         }
-         
-         # queue up any messages
-         DXMsg::queue_msg() if $self->state eq 'normal';     
-         last SWITCH;
-       }
-       
-    if ($pcno == 20) {              # send local configuration
-         $self->send_local_config();
-         $self->send(pc22());
-         $self->state('normal');
-         
-         # queue mail
-         DXMsg::queue_msg();
-         return;
-       }
-       
-    if ($pcno == 21) {             # delete a cluster from the list
-         my $call = uc $field[1];
-         if ($call ne $main::mycall) {              # don't allow malicious buggers to disconnect me!
-           my $ref = DXCluster->get($call);
-           $ref->del() if $ref;
-         }
-         last SWITCH;
-       }
-       
-    if ($pcno == 22) {last SWITCH;}
-
-    if ($pcno == 23 || $pcno == 27) {  # WWV info
-         Geomag::update(@field[1..$#field]);
-      last SWITCH;
-       }
-
-    if ($pcno == 24) {             # set here status
-         my $call = uc $field[1];
-         $call =~ s/-\d+//o;
-         my $ref = DXCluster->get($call);
-         $ref->here($field[2]) if $ref;
-         last SWITCH;
-       }
-       
-    if ($pcno == 25) {last SWITCH;}
-
-    if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42) {   # mail/file handling
-               DXMsg::process($self, $line);
-               return;
-       }
-       
-    if ($pcno == 34 || $pcno == 36) {   # remote commands (incoming)
-               if ($field[1] eq $main::mycall) {
-                       my $ref = DXUser->get_current($field[2]);
-                       Log('rcmd', 'in', $ref->{priv}, $field[2], $field[3]);
-                       if ($ref->{priv}) {        # you have to have SOME privilege, the commands have further filtering
-                               $self->{remotecmd} = 1; # for the benefit of any command that needs to know
-                               my @in = (DXCommandmode::run_cmd($self, $field[3]));
-                               for (@in) {
-                                       s/\s*$//og;
-                                       $self->send(pc35($main::mycall, $field[2], "$main::mycall:$_"));
-                                       Log('rcmd', 'out', $field[2], $_);
+               if ($pcno == 19) {              # incoming cluster list
+                       my $i;
+                       for ($i = 1; $i < $#field-1; $i += 4) {
+                               my $here = $field[$i];
+                               my $call = uc $field[$i+1];
+                               my $confmode = $field[$i+2] eq '*';
+                               my $ver = $field[$i+3];
+                               
+                               # now check the call over
+                               next if DXCluster->get_exact($call); # we already have this
+                               
+                               # check for sane parameters
+                               next if $ver < 5000; # only works with version 5 software
+                               next if length $call < 3; # min 3 letter callsigns
+                               DXNode->new($self, $call, $confmode, $here, $ver);
+                               
+                               # unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect)
+                               my $mref = DXMsg::get_busy($call);
+                               $mref->stop_msg($self) if $mref;
+                               
+                               # add this station to the user database, if required (don't remove SSID from nodes)
+                               my $user = DXUser->get_current($call);
+                               if (!$user) {
+                                       $user = DXUser->new($call);
+                                       $user->sort('A');
+                                       $user->node($call);
+                                       $user->homenode($call);
+                                       $user->put;
                                }
-                               delete $self->{remotecmd};
                        }
-               } else {
-                       route($field[1], $line);
+                       
+                       # queue up any messages
+                       DXMsg::queue_msg() if $self->state eq 'normal';     
+                       last SWITCH;
                }
-               return;
-       }
-       
-    if ($pcno == 35) {                  # remote command replies
-               if ($field[1] eq $main::mycall) {
-                       my $s = DXChannel::get($main::myalias); 
-                       my @ref = grep { $_->pc34to eq $field[2] } DXChannel::get_all();     # people that have rcmded someone
-                       push @ref, $s if $s;
+               
+               if ($pcno == 20) {              # send local configuration
+                       $self->send_local_config();
+                       $self->send(pc22());
+                       $self->state('normal');
                        
-                       foreach (@ref) {
-                               $_->send($field[3]);
+                       # queue mail
+                       DXMsg::queue_msg();
+                       return;
+               }
+               
+               if ($pcno == 21) {              # delete a cluster from the list
+                       my $call = uc $field[1];
+                       if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
+                               my $ref = DXCluster->get_exact($call);
+                               $ref->del() if $ref;
                        }
-               } else {
-                       route($field[1], $line);
+                       last SWITCH;
+               }
+               
+               if ($pcno == 22) {
+                       last SWITCH;
+               }
+               
+               if ($pcno == 23 || $pcno == 27) { # WWV info
+                       Geomag::update(@field[1..$#field]);
+                       last SWITCH;
+               }
+               
+               if ($pcno == 24) {              # set here status
+                       my $call = uc $field[1];
+                       my $ref = DXCluster->get_exact($call);
+                       $ref->here($field[2]) if $ref;
+                       last SWITCH;
+               }
+               
+               if ($pcno == 25) {
+                       last SWITCH;
+               }
+               
+               if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42) { # mail/file handling
+                       DXMsg::process($self, $line);
+                       return;
+               }
+               
+               if ($pcno == 34 || $pcno == 36) { # remote commands (incoming)
+                       if ($field[1] eq $main::mycall) {
+                               my $ref = DXUser->get_current($field[2]);
+                               Log('rcmd', 'in', $ref->{priv}, $field[2], $field[3]);
+                               if ($ref->{priv}) {     # you have to have SOME privilege, the commands have further filtering
+                                       $self->{remotecmd} = 1; # for the benefit of any command that needs to know
+                                       my @in = (DXCommandmode::run_cmd($self, $field[3]));
+                                       for (@in) {
+                                               s/\s*$//og;
+                                               $self->send(pc35($main::mycall, $field[2], "$main::mycall:$_"));
+                                               Log('rcmd', 'out', $field[2], $_);
+                                       }
+                                       delete $self->{remotecmd};
+                               }
+                       } else {
+                               route($field[1], $line);
+                       }
+                       return;
+               }
+               
+               if ($pcno == 35) {              # remote command replies
+                       if ($field[1] eq $main::mycall) {
+                               my $s = DXChannel::get($main::myalias); 
+                               my @ref = grep { $_->pc34to eq $field[2] } DXChannel::get_all(); # people that have rcmded someone
+                               push @ref, $s if $s;
+                               
+                               foreach (@ref) {
+                                       $_->send($field[3]);
+                               }
+                       } else {
+                               route($field[1], $line);
+                       }
+                       return;
+               }
+               
+               if ($pcno == 37) {
+                       last SWITCH;
+               }
+               
+               if ($pcno == 38) {              # node connected list from neighbour
+                       return;
+               }
+               
+               if ($pcno == 39) {              # incoming disconnect
+                       $self->disconnect();
+                       return;
+               }
+               
+               if ($pcno == 41) {              # user info
+                       # add this station to the user database, if required
+                       my $user = DXUser->get_current($field[1]);
+                       if (!$user) {
+                               # then try without an SSID
+                               $field[1] =~ s/-\d+$//o;
+                               $user = DXUser->get_current($field[1]);
+                       }
+                       $user = DXUser->new($field[1]) if !$user;
+                       
+                       if ($field[2] == 1) {
+                               $user->name($field[3]);
+                       } elsif ($field[2] == 2) {
+                               $user->qth($field[3]);
+                       } elsif ($field[2] == 3) {
+                               my ($latd, $latm, $latl, $longd, $longm, $longl) = split /\s+/, $field[3];
+                               $longd += ($longm/60);
+                               $longd = 0-$longd if (uc $longl) eq 'W'; 
+                               $user->long($longd);
+                               $latd += ($latm/60);
+                               $latd = 0-$latd if (uc $latl) eq 'S';
+                               $user->lat($latd);
+                       } elsif ($field[2] == 4) {
+                               $user->homenode($field[3]);
+                       }
+                       $user->put;
+                       last SWITCH;
+               }
+               if ($pcno == 43) {
+                       last SWITCH;
+               }
+               if ($pcno == 44) {
+                       last SWITCH;
+               }
+               if ($pcno == 45) {
+                       last SWITCH;
+               }
+               if ($pcno == 46) {
+                       last SWITCH;
+               }
+               if ($pcno == 47) {
+                       last SWITCH;
+               }
+               if ($pcno == 48) {
+                       last SWITCH;
+               }
+               if ($pcno == 49) {
+                       last SWITCH;
+               }
+               
+               if ($pcno == 50) {              # keep alive/user list
+                       my $ref = DXCluster->get_exact($field[1]);
+                       $ref->update_users($field[2]) if $ref;
+                       last SWITCH;
+               }
+               
+               if ($pcno == 51) {              # incoming ping requests/answers
+                       
+                       # is it for us?
+                       if ($field[1] eq $main::mycall) {
+                               my $flag = $field[3];
+                               $flag ^= 1;
+                               $self->send($self->pc51($field[2], $field[1], $flag));
+                       } else {
+                               # route down an appropriate thingy
+                               route($field[1], $line);
+                       }
+                       return;
                }
-               return;
-       }
-       
-    if ($pcno == 37) {last SWITCH;}
-    
-       if ($pcno == 38) {                  # node connected list from neighbour
-         return;
-       }
-
-    if ($pcno == 39) {              # incoming disconnect
-      $self->disconnect();
-         return;
-       }
-       
-    if ($pcno == 41) {              # user info
-      # add this station to the user database, if required
-         $field[1] =~ s/-\d+$//o;
-         my $user = DXUser->get_current($field[1]);
-         $user = DXUser->new($field[1]) if !$user;
-         
-         if ($field[2] == 1) {
-           $user->name($field[3]);
-         } elsif ($field[2] == 2) {
-           $user->qth($field[3]);
-         } elsif ($field[2] == 3) {
-        my ($latd, $latm, $latl, $longd, $longm, $longl) = split /\s+/, $field[3];
-               $longd += ($longm/60);
-               $longd = 0-$longd if (uc $longl) eq 'W'; 
-               $user->long($longd);
-               $latd += ($latm/60);
-               $latd = 0-$latd if (uc $latl) eq 'S';
-               $user->lat($latd);
-         } elsif ($field[2] == 4) {
-           $user->node($field[3]);
-         }
-         $user->put;
-         last SWITCH;
-       }
-    if ($pcno == 43) {last SWITCH;}
-    if ($pcno == 44) {last SWITCH;}
-    if ($pcno == 45) {last SWITCH;}
-    if ($pcno == 46) {last SWITCH;}
-    if ($pcno == 47) {last SWITCH;}
-    if ($pcno == 48) {last SWITCH;}
-    if ($pcno == 49) {last SWITCH;}
-       
-    if ($pcno == 50) {              # keep alive/user list
-         my $ref = DXCluster->get($field[1]);
-         $ref->update_users($field[2]) if $ref;
-         last SWITCH;
-       }
-       
-    if ($pcno == 51) {              # incoming ping requests/answers
-         
-         # is it for us?
-         if ($field[1] eq $main::mycall) {
-           my $flag = $field[3];
-           $flag ^= 1;
-           $self->send($self->pc51($field[2], $field[1], $flag));
-         } else {
-           # route down an appropriate thingy
-               route($field[1], $line);
-         }
-         return;
        }
-  }
-  
-  # if get here then rebroadcast the thing with its Hop count decremented (if
-  # there is one). If it has a hop count and it decrements to zero then don't
-  # rebroadcast it.
-  #
-  # NOTE - don't arrive here UNLESS YOU WANT this lump of protocol to be
-  #        REBROADCAST!!!!
-  #
-  
-  my $hops;
-  if (($hops) = $line =~ /H(\d+)\^\~?$/o) {
-       my $newhops = $hops - 1;
-       if ($newhops > 0) {
-         $line =~ s/\^H$hops(\^\~?)$/\^H$newhops$1/;       # change the hop count
-         broadcast_ak1a($line, $self);             # send it to everyone but me
+        
+        # if get here then rebroadcast the thing with its Hop count decremented (if
+        # there is one). If it has a hop count and it decrements to zero then don't
+        # rebroadcast it.
+        #
+        # NOTE - don't arrive here UNLESS YOU WANT this lump of protocol to be
+        #        REBROADCAST!!!!
+        #
+        
+        my $hops;
+       if (($hops) = $line =~ /H(\d+)\^\~?$/o) {
+               my $newhops = $hops - 1;
+               if ($newhops > 0) {
+                       $line =~ s/\^H$hops(\^\~?)$/\^H$newhops$1/;     # change the hop count
+                       broadcast_ak1a($line, $self); # send it to everyone but me
+               }
        }
-  }
 }
 
 #
@@ -427,30 +461,30 @@ sub normal
 #
 sub process
 {
-  my $t = time;
-  my @chan = DXChannel->get_all();
-  my $chan;
-  
-  foreach $chan (@chan) {
-    next if !$chan->is_ak1a();
-
-    # send a pc50 out on this channel
-    if ($t >= $chan->pc50_t + $DXProt::pc50_interval) {
-      $chan->send(pc50());
-         $chan->pc50_t($t);
+       my $t = time;
+       my @chan = DXChannel->get_all();
+       my $chan;
+       
+       foreach $chan (@chan) {
+               next if !$chan->is_ak1a();
+               
+               # send a pc50 out on this channel
+               if ($t >= $chan->pc50_t + $DXProt::pc50_interval) {
+                       $chan->send(pc50());
+                       $chan->pc50_t($t);
+               }
        }
-  }
-  
-  my $key;
-  my $val;
-  my $cutoff;
-  if ($main::systime - 3600 > $last_hour) {
-    $cutoff  = $main::systime - $pc11_dup_age;
-       while (($key, $val) = each %dup) {
-         delete $dup{$key} if $val < $cutoff;
+       
+       my $key;
+       my $val;
+       my $cutoff;
+       if ($main::systime - 3600 > $last_hour) {
+               $cutoff  = $main::systime - $pc11_dup_age;
+               while (($key, $val) = each %dup) {
+                       delete $dup{$key} if $val < $cutoff;
+               }
+               $last_hour = $main::systime;
        }
-       $last_hour = $main::systime;
-  }
 }
 
 #
@@ -458,27 +492,27 @@ sub process
 #
 sub finish
 {
-  my $self = shift;
-  my $ref = DXCluster->get($self->call);
-
-  # unbusy and stop and outgoing mail
-  my $mref = DXMsg::get_busy($self->call);
-  $mref->stop_msg($self) if $mref;
-  
-  # broadcast to all other nodes that all the nodes connected to via me are gone
-  my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();
-  my $node;
-
-  foreach $node (@gonenodes) {
-    next if $node->call eq $self->call; 
-    broadcast_ak1a(pc21($node->call, 'Gone'), $self);    # done like this 'cos DXNodes don't have a pc21 method
-       $node->del();
-  }
-
-  # now broadcast to all other ak1a nodes that I have gone
-  broadcast_ak1a(pc21($self->call, 'Gone.'), $self);
-  Log('DXProt', $self->call . " Disconnected");
-  $ref->del() if $ref;
+       my $self = shift;
+       my $ref = DXCluster->get_exact($self->call);
+       
+       # unbusy and stop and outgoing mail
+       my $mref = DXMsg::get_busy($self->call);
+       $mref->stop_msg($self) if $mref;
+       
+       # broadcast to all other nodes that all the nodes connected to via me are gone
+       my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();
+       my $node;
+       
+       foreach $node (@gonenodes) {
+               next if $node->call eq $self->call; 
+               broadcast_ak1a(pc21($node->call, 'Gone'), $self); # done like this 'cos DXNodes don't have a pc21 method
+               $node->del();
+       }
+       
+       # now broadcast to all other ak1a nodes that I have gone
+       broadcast_ak1a(pc21($self->call, 'Gone.'), $self);
+       Log('DXProt', $self->call . " Disconnected");
+       $ref->del() if $ref;
 }
 
 #
@@ -487,21 +521,21 @@ sub finish
 
 sub send_local_config
 {
-  my $self = shift;
-  my $n;
-
-  # send our nodes
-  my @nodes = DXNode::get_all();
-  
-  # create a list of all the nodes that are not connected to this connection
-  @nodes = grep { $_->dxchan != $self } @nodes;
-  $self->send($me->pc19(@nodes));
-         
-  # get all the users connected on the above nodes and send them out
-  foreach $n (@nodes) {
-    my @users = values %{$n->list};
-    $self->send(DXProt::pc16($n, @users));
-  }
+       my $self = shift;
+       my $n;
+       
+       # send our nodes
+       my @nodes = DXNode::get_all();
+       
+       # create a list of all the nodes that are not connected to this connection
+       @nodes = grep { $_->dxchan != $self } @nodes;
+       $self->send($me->pc19(@nodes));
+       
+       # get all the users connected on the above nodes and send them out
+       foreach $n (@nodes) {
+               my @users = values %{$n->list};
+               $self->send(DXProt::pc16($n, @users));
+       }
 }
 
 #
@@ -511,60 +545,60 @@ sub send_local_config
 #
 sub route
 {
-  my ($call, $line) = @_;
-  my $cl = DXCluster->get($call);
-  if ($cl) {
-    my $hops;
-       my $dxchan = $cl->{dxchan};
-       if (($hops) = $line =~ /H(\d+)\^\~?$/o) {
-         my $newhops = $hops - 1;
-         if ($newhops > 0) {
-           $line =~ s/\^H$hops(\^\~?)$/\^H$newhops$1/;       # change the hop count
-               $dxchan->send($line) if $dxchan;
-         }
-       } else {
-         $dxchan->send($line) if $dxchan;                    # for them wot don't have Hops
+       my ($call, $line) = @_;
+       my $cl = DXCluster->get_exact($call);
+       if ($cl) {
+               my $hops;
+               my $dxchan = $cl->{dxchan};
+               if (($hops) = $line =~ /H(\d+)\^\~?$/o) {
+                       my $newhops = $hops - 1;
+                       if ($newhops > 0) {
+                               $line =~ s/\^H$hops(\^\~?)$/\^H$newhops$1/;     # change the hop count
+                               $dxchan->send($line) if $dxchan;
+                       }
+               } else {
+                       $dxchan->send($line) if $dxchan; # for them wot don't have Hops
+               }
        }
-  }
 }
 
 # broadcast a message to all clusters [except those mentioned after buffer]
 sub broadcast_ak1a
 {
-  my $s = shift;                  # the line to be rebroadcast
-  my @except = @_;                # to all channels EXCEPT these (dxchannel refs)
-  my @chan = get_all_ak1a();
-  my $chan;
-  
-  foreach $chan (@chan) {
-     next if grep $chan == $_, @except;
-        $chan->send($s);              # send it if it isn't the except list
-  }
+       my $s = shift;                          # the line to be rebroadcast
+       my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)
+       my @chan = get_all_ak1a();
+       my $chan;
+       
+       foreach $chan (@chan) {
+               next if grep $chan == $_, @except;
+               $chan->send($s);                # send it if it isn't the except list
+       }
 }
 
 # broadcast to all users
 sub broadcast_users
 {
-  my $s = shift;                  # the line to be rebroadcast
-  my @except = @_;                # to all channels EXCEPT these (dxchannel refs)
-  my @chan = get_all_users();
-  my $chan;
-  
-  foreach $chan (@chan) {
-    next if grep $chan == $_, @except;
-       $chan->send($s);              # send it if it isn't the except list
-  }
+       my $s = shift;                          # the line to be rebroadcast
+       my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)
+       my @chan = get_all_users();
+       my $chan;
+       
+       foreach $chan (@chan) {
+               next if grep $chan == $_, @except;
+               $chan->send($s);                # send it if it isn't the except list
+       }
 }
 
 # broadcast to a list of users
 sub broadcast_list
 {
-  my $s = shift;
-  my $chan;
-  
-  foreach $chan (@_) {
-       $chan->send($s);              # send it 
-  }
+       my $s = shift;
+       my $chan;
+       
+       foreach $chan (@_) {
+               $chan->send($s);                # send it 
+       }
 }
 
 #
@@ -572,37 +606,37 @@ sub broadcast_list
 #
 sub get_all_ak1a
 {
-  my @list = DXChannel->get_all();
-  my $ref;
-  my @out;
-  foreach $ref (@list) {
-    push @out, $ref if $ref->is_ak1a;
-  }
-  return @out;
+       my @list = DXChannel->get_all();
+       my $ref;
+       my @out;
+       foreach $ref (@list) {
+               push @out, $ref if $ref->is_ak1a;
+       }
+       return @out;
 }
 
 # return a list of all users
 sub get_all_users
 {
-  my @list = DXChannel->get_all();
-  my $ref;
-  my @out;
-  foreach $ref (@list) {
-    push @out, $ref if $ref->is_user;
-  }
-  return @out;
+       my @list = DXChannel->get_all();
+       my $ref;
+       my @out;
+       foreach $ref (@list) {
+               push @out, $ref if $ref->is_user;
+       }
+       return @out;
 }
 
 # return a list of all user callsigns
 sub get_all_user_calls
 {
-  my @list = DXChannel->get_all();
-  my $ref;
-  my @out;
-  foreach $ref (@list) {
-    push @out, $ref->call if $ref->is_user;
-  }
-  return @out;
+       my @list = DXChannel->get_all();
+       my $ref;
+       my @out;
+       foreach $ref (@list) {
+               push @out, $ref->call if $ref->is_user;
+       }
+       return @out;
 }
 
 #
@@ -611,18 +645,18 @@ sub get_all_user_calls
 
 sub get_hops
 {
-  my ($pcno) = @_;
-  my $hops = $DXProt::hopcount{$pcno};
-  $hops = $DXProt::def_hopcount if !$hops;
-  return "H$hops";       
+       my ($pcno) = @_;
+       my $hops = $DXProt::hopcount{$pcno};
+       $hops = $DXProt::def_hopcount if !$hops;
+       return "H$hops";       
 }
 
 # remove leading and trailing spaces from an input string
 sub unpad
 {
-  my $s = shift;
-  $s =~ s/^\s+|\s+$//;
-  return $s;
+       my $s = shift;
+       $s =~ s/^\s+|\s+$//;
+       return $s;
 }
 1;
 __END__ 
index 07d5a0e98baeb9f51173797efd3101f1412d0a7e..fb86ee2e67273d996176fa31b8ae4b4ac54981ad 100644 (file)
@@ -271,7 +271,7 @@ sub pc49
 # periodic update of users, plus keep link alive device (always H99)
 sub pc50
 {
-  my $me = DXCluster->get($main::mycall);
+  my $me = DXCluster->get_exact($main::mycall);
   my $n = $me->users ? $me->users : '0';
   return "PC50^$main::mycall^$n^H99^";
 }
index 55245a59a2a7cd2b5651dd8dd08e464c73bfe368..0af77f04df235d0da9e136dc5e7df3eb4f8856fa 100644 (file)
@@ -39,7 +39,8 @@ $filename = undef;
   sort => '0,Type of User',                # A - ak1a, U - User, S - spider cluster, B - BBS
   xpert => '0,Expert Status,yesno',
   bbs => '0,Home BBS',
-  node => '0,Home Node',
+  node => '0,Last Node',
+  homenode => '0,Home Node',
   lockout => '9,Locked out?,yesno',        # won't let them in at all
   dxok => '9,DX Spots?,yesno',            # accept his dx spots?
   annok => '9,Announces?,yesno',            # accept his announces?
@@ -97,7 +98,7 @@ sub new
 {
   my $pkg = shift;
   my $call = uc shift;
-  $call =~ s/-\d+//o;
+#  $call =~ s/-\d+$//o;
   
   confess "can't create existing call $call in User\n!" if $u{$call};
 
@@ -120,7 +121,7 @@ sub get
 {
   my $pkg = shift;
   my $call = uc shift;
-  $call =~ s/-\d+$//o;       # strip ssid
+#  $call =~ s/-\d+$//o;       # strip ssid
   return $u{$call};
 }
 
@@ -145,7 +146,7 @@ sub get_current
 {
   my $pkg = shift;
   my $call = uc shift;
-  $call =~ s/-\d+$//o;       # strip ssid
+#  $call =~ s/-\d+$//o;       # strip ssid
   
   my $dxchan = DXChannel->get($call);
   return $dxchan->user if $dxchan;
index 5b35ee2dc83fb98c236d9f0055766f93eaf973de..9c4fc0f5088a9b39d76cfe51592a295d5701ccc9 100755 (executable)
@@ -293,7 +293,16 @@ $call = uc $myalias if !$call;
 $connsort = lc shift @ARGV;
 $connsort = 'local' if !$connsort;
 
-$mode = ($connsort =~ /^ax/o) ? 1 : 2;
+#
+# strip off any SSID if it is a telnet connection 
+#
+# SSID's are a problem, basically we don't allow them EXCEPT for the special case
+# of local users. i.e. you can have a cluster call with an SSID and a usercall with
+# an SSID and they are different to the system to those without SSIDs
+#
+
+$call =~ s/-\d+$//o if $mode eq 'telnet';
+$mode = ($connsort eq 'ax25') ? 1 : 2;
 setmode();
 
 if ($call eq $mycall) {
index 666f4f87fd0b59d0b167b297f3ef11cbec3d454c..f1b467321219f222df82efaaffd7dabb8722165c 100755 (executable)
@@ -86,7 +86,8 @@ sub rec
                }
                
                # is there one already connected elsewhere in the cluster?
-               if (DXCluster->get($call)) {
+               if (($call eq $main::myalias && DXCluster->get_exact($call)) ||
+                   DXCluster->get($call)) {
                        my $mess = DXM::msg($lang, 'concluster', $call);
                        dbg('chan', "-> D $call $mess\n"); 
                        $conn->send_now("D$call|$mess");
@@ -96,6 +97,7 @@ sub rec
                        return;
                }
                
+               # the user MAY have an SSID if local, but otherwise doesn't
                my $user = DXUser->get($call);
                if (!defined $user) {
                        $user = DXUser->new($call);
index da242811ffe19f981efad33e2c5c98ce1fe59bd3..4696fc2e505633f723568594e363a60f43a7bf64 100755 (executable)
@@ -35,7 +35,8 @@ sub create_it
   $self->{long} = $mylongtitude;
   $self->{email} = $myemail;
   $self->{bbsaddr} = $mybbsaddr;
-  $self->{sort} = 'U';           # C - Console user, S - Spider cluster, A - AK1A, U - User, B - BBS
+  $self->{homenode} = $mycall;
+  $self->{sort} = 'A';           # C - Console user, S - Spider cluster, A - AK1A, U - User, B - BBS
   $self->{priv} = 9;             # 0 - 9 - with 9 being the highest
   $self->{lastin} = 0;
   $self->{dxok} = 1;
@@ -53,6 +54,7 @@ sub create_it
   $self->{long} = $mylongtitude;
   $self->{email} = $myemail;
   $self->{bbsaddr} = $mybbsaddr;
+  $self->{homenode} = $mycall;
   $self->{sort} = 'U';           # C - Console user, S - Spider cluster, A - AK1A, U - User, B - BBS
   $self->{priv} = 9;             # 0 - 9 - with 9 being the highest
   $self->{lastin} = 0;