push @f, " " unless @f;
for (@f) {
my $n = DXDb::newstream($self->call);
- DXProt::route(undef, $db->remote, DXProt::pc44($main::mycall, $db->remote, $n, uc $db->name,uc $_, $self->call));
+ DXChannel::route(undef, $db->remote, DXProt::pc44($main::mycall, $db->remote, $n, uc $db->name,uc $_, $self->call));
}
last;
} else {
return (1, $self->msg('e7', $call)) unless $noderef;
# ping it
+
DXProt::addping($self->call, $call);
return (1, $self->msg('pingo', $call));
2A3,2B3,2C3,2D3,2E3,2F3,2G3,2H3,2I3,2J3,2K3,2L3,2M3 Scotland-GM 65 27 14 0.0 55 48 0 N 4 18 0 W
2N3,2O3,2P3,2Q3,2R3,2S3,2T3,2U3,2V3,2W3,2X3,2Y3,2Z3 Scotland-GM 65 27 14 0.0 55 48 0 N 4 18 0 W
GU Guernsey-GU 66 27 14 0.0 49 30 0 N 2 42 0 W @
+GP Guernsey-GU 66 27 14 0.0 49 30 0 N 2 42 0 W
MA8,MB8,ME8,MF8,MG8,MK8,ML8 Guernsey-GU 66 27 14 0.0 49 30 0 N 2 42 0 W
MO8,MQ8,MR8,MU,MV8,MY8,MZ8 Guernsey-GU 66 27 14 0.0 49 30 0 N 2 42 0 W
2A8,2B8,2C8,2D8,2E8,2F8,2G8,2H8,2I8,2J8,2K8,2L8,2M8 Guernsey-GU 66 27 14 0.0 49 30 0 N 2 42 0 W
$data = '' unless defined $data;
if ($sort eq 'D') {
+
+ # incoming data
my $d = unpack "Z*", $data;
$d =~ s/\cM\cJ?$//;
$d =~ s/^\cJ//;
dbg("AGW error Unsolicited Data!");
}
} elsif ($sort eq 'I' || $sort eq 'S' || $sort eq 'U' || $sort eq 'M' || $sort eq 'T') {
+
+ # incoming monitoring
my $d = unpack "Z*", $data;
$d =~ s/^\cJ//;
$d =~ s/\cM\cJ?$//;
dbg("AGW Monitor port: $port \"$_\"") if isdbg('agw');
}
} elsif ($sort eq 'C') {
+
+ # incoming connection
my $d = unpack "Z*", $data;
$d =~ s/\cM\cJ?$//;
dbg("AGW Connect port: $port pid: $pid '$from'->'$to' \"$d\"") if isdbg('agw');
$conn->to_connected($call, 'A', $conn->{csort} = 'ax25');
}
} elsif ($sort eq 'd') {
+
+ # incoming disconnection
my $d = unpack "Z*", $data;
$d =~ s/\cM\cJ?$//;
dbg("AGW '$from'->'$to' port: $port Disconnected ($d)") if isdbg('agw');
$conn->in_disconnect;
}
} elsif ($sort eq 'y') {
+
+ # outstanding frames statistics (unconnected)
my ($frames) = unpack "V", $data;
dbg("AGW Frames Outstanding on port $port = $frames") if isdbg('agwpollans');
my $conn = _find($from);
$conn->{oframes} = $frames if $conn;
} elsif ($sort eq 'Y') {
+
+ # outstanding frames statistics (connected)
my ($frames) = unpack "V", $data;
dbg("AGW Frames Outstanding on circuit '$from'->'$to' = $frames") if isdbg('agw');
my $conn = _find($from eq $main::mycall ? $to : $from);
$conn->{oframes} = $frames if $conn;
} elsif ($sort eq 'H') {
+
+ # heard stations
unless ($from =~ /^\s+$/) {
my $d = unpack "Z*", $data;
$d =~ s/\cM\cJ?$//;
dbg("AGW Heard port: $port \"$d\"") if isdbg('agw');
}
} elsif ($sort eq 'X') {
+
+ # registration reply
my ($r) = unpack "C", $data;
$r = $r ? "Successful" : "Failed";
dbg("AGW Register $from $r");
finish() unless $r;
} elsif ($sort eq 'R') {
+
+ # version string
my ($major, $minor) = unpack "v x2 v x2", $data;
dbg("AGW Version $major.$minor") if isdbg('agw');
} elsif ($sort eq 'G') {
+
+ # list of ports
my @ports = split /;/, $data;
$noports = shift @ports || '0';
dbg("AGW $noports Ports available") if isdbg('agw');
_sendf('g', undef, undef, $i);
}
} else {
+
+ # some other frame
my $d = unpack "Z*", $data;
dbg("AGW decode $sort port: $port pid: $pid '$from'->'$to' length: $len \"$d\"") if isdbg('agw');
}
use Filter;
use Prefix;
use Route;
+use Time::HiRes qw(gettimeofday tv_interval);
use strict;
-use vars qw(%channels %valid @ISA $count);
+use vars qw(
+ %channels %pings %valid @ISA $count
+ $pingint $obscount
+ );
-%channels = ();
+%pings = (); # outstanding ping requests outbound
+%channels = (); # the channel list
$count = 0;
+$pingint = 5*60; # default pinginterval
+$obscount = 2; # default obscount for pings
%valid = (
call => '0,Callsign',
return values(%channels);
}
+#
+# route a message down an appropriate interface for a callsign
+#
+# is called route(to, pcline);
+#
+
+sub route
+{
+ my ($self, $call, $line) = @_;
+
+ if (ref $self && $call eq $self->{call}) {
+ dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
+ return;
+ }
+
+ # always send it down the local interface if available
+ my $dxchan = DXChannel->get($call);
+ unless ($dxchan) {
+ my $cl = Route::get($call);
+ $dxchan = $cl->dxchan if $cl;
+ if (ref $dxchan) {
+ if (ref $self && $dxchan eq $self) {
+ dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
+ return;
+ }
+ }
+ }
+ if ($dxchan) {
+ my $routeit = $dxchan->adjust_hops($line); # adjust its hop count by node name
+ if ($routeit) {
+ $dxchan->send($routeit) unless $dxchan == $main::me;
+ }
+ } else {
+ dbg("PCPROT: No route available, dropped") if isdbg('chanerr');
+ }
+}
+
#
# gimme all the ak1a nodes
#
my $self = shift;
return $self->{'sort'} =~ /[ACRSX]/;
}
+
+# is a node and uses old protocol
+sub is_op
+{
+ my $self = shift;
+ return $self->is_node && !$self->user->wantnp;
+}
+
+# is a node and uses new protocol
+sub is_np
+{
+ my $self = shift;
+ return $self->is_node && $self->user->wantnp;
+}
+
# is it an ak1a node ?
sub is_ak1a
{
{
my $self = shift;
my $user = $self->{user};
+
+ # remove outstanding pings
+ delete $pings{$self->{call}};
- main::clean_inqueue($self); # clear out any remaining incoming frames
$user->close() if defined $user;
$self->{conn}->disconnect;
$self->del();
}
}
+sub handlepingreply
+{
+ my ($self, $from) = @_;
+
+ my $ref = $pings{$from};
+ if ($ref) {
+ my $tochan = DXChannel->get($from);
+ while (@$ref) {
+ my $r = shift @$ref;
+ my $dxchan = DXChannel->get($r->{call});
+ next unless $dxchan;
+ my $t = tv_interval($r->{t}, [ gettimeofday ]);
+ if ($dxchan->is_user) {
+ my $s = sprintf "%.2f", $t;
+ my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
+ $dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
+ } elsif ($dxchan->is_node) {
+ if ($tochan) {
+ my $nopings = $tochan->user->nopings || 2;
+ push @{$tochan->{pingtime}}, $t;
+ shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
+
+ # cope with a missed ping, this means you must set the pingint large enough
+ if ($t > $tochan->{pingint} && $t < 2 * $tochan->{pingint} ) {
+ $t -= $tochan->{pingint};
+ }
+
+ # calc smoothed RTT a la TCP
+ if (@{$tochan->{pingtime}} == 1) {
+ $tochan->{pingave} = $t;
+ } else {
+ $tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
+ }
+ $tochan->{nopings} = $nopings; # pump up the timer
+ }
+ }
+ }
+ }
+}
#no strict;
sub AUTOLOAD
{
+ my $self = shift;
no strict;
my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
# this clever line of code creates a subroutine which takes over from autoload
# from OO Perl - Conway
*$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
- goto &$AUTOLOAD;
+ &$AUTOLOAD($self, @_);
+# *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
+# @_ ? $self->{$name} = shift : $self->{$name} ;
}
$main::branch += $BRANCH;
use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
- $last_hour $last10 %eph %pings %rcmds $ann_to_talk
- $pingint $obscount %pc19list
+ $last_hour $last10 %eph %rcmds $ann_to_talk
%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
$allowzero $decode_dk0wcy $send_opernam @checklist);
$pc23_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc23
$last_hour = time; # last time I did an hourly periodic update
-%pings = (); # outstanding ping requests outbound
%rcmds = (); # outstanding rcmd requests outbound
%nodehops = (); # node specific hop control
-%pc19list = (); # list of outstanding PC19s that haven't had PC16s on them
-
$censorpc = 1; # Do a BadWords::check on text fields and reject things
# loads of 'bad things'
$baddx = new DXHash "baddx";
$eph_restime = 180;
$eph_info_restime = 60*60;
$eph_pc34_restime = 30;
-$pingint = 5*60;
-$obscount = 2;
@checklist =
(
# ping neighbour node stuff
my $ping = $user->pingint;
- $ping = $pingint unless defined $ping;
+ $ping = $DXChannel::pingint unless defined $ping;
$self->{pingint} = $ping;
- $self->{nopings} = $user->nopings || $obscount;
+ $self->{nopings} = $user->nopings || $DXChannel::obscount;
$self->{pingtime} = [ ];
$self->{pingave} = 999;
$self->{metric} ||= 100;
# send the rcmd but we aren't interested in the replies...
my $dxchan = $node->dxchan;
if ($dxchan && $dxchan->is_clx) {
- route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd));
+ DXChannel::route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd));
} else {
- route(undef, $to, pc34($main::mycall, $to, $cmd));
+ DXChannel::route(undef, $to, pc34($main::mycall, $to, $cmd));
}
if ($to ne $field[7]) {
$to = $field[7];
if ($node) {
$dxchan = $node->dxchan;
if ($dxchan && $dxchan->is_clx) {
- route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd));
+ DXChannel::route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd));
} else {
- route(undef, $to, pc34($main::mycall, $to, $cmd));
+ DXChannel::route(undef, $to, pc34($main::mycall, $to, $cmd));
}
}
}
return;
}
my $parent = Route::Node::get($ncall);
-
- # if there is a parent, proceed, otherwise if there is a latent PC19 in the PC19list,
- # fix it up in the routing tables and issue it forth before the PC16
unless ($parent) {
- my $nl = $pc19list{$ncall};
-
- if ($nl && @field > 3) { # 3 because of the hop count!
-
- # this is a new (remembered) node, now attach it to me if it isn't in filtered
- # and we haven't disallowed it
- my $user = DXUser->get_current($ncall);
- if (!$user) {
- $user = DXUser->new($ncall);
- $user->sort('A');
- $user->priv(1); # I have relented and defaulted nodes
- $user->lockout(1);
- $user->homenode($ncall);
- $user->node($ncall);
- }
-
- my $wantpc19 = $user->wantroutepc19;
- if ($wantpc19 || !defined $wantpc19) {
- my $new = Route->new($ncall); # throw away
- if ($self->in_filter_route($new)) {
- my @nrout;
- for (@$nl) {
- $parent = Route::Node::get($_->[0]);
- $dxchan = $parent->dxchan if $parent;
- if ($dxchan && $dxchan ne $self) {
- dbg("PCPROT: PC19 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
- $parent = undef;
- }
- if ($parent) {
- my $r = $parent->add($ncall, $_->[1], $_->[2]);
- push @nrout, $r unless @nrout;
- }
- }
- $user->wantroutepc19(1) unless defined $wantpc19; # for now we work on the basis that pc16 = real route
- $user->lastin($main::systime) unless DXChannel->get($ncall);
- $user->put;
-
- # route the pc19 - this will cause 'stuttering PC19s' for a while
- $self->route_pc19(@nrout) if @nrout ;
- $parent = Route::Node::get($ncall);
- unless ($parent) {
- dbg("PCPROT: lost $ncall after sending PC19 for it?");
- return;
- }
- } else {
- return;
- }
- delete $pc19list{$ncall};
- }
- } else {
- dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
- return;
- }
- } else {
-
- $dxchan = $parent->dxchan;
- if ($dxchan && $dxchan ne $self) {
- dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
- return;
- }
-
- # input filter if required
- return unless $self->in_filter_route($parent);
+ dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
+ return;
+ }
+ $dxchan = $parent->dxchan;
+ if ($dxchan && $dxchan ne $self) {
+ dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+ return;
}
+ my ($hops) = $field[-1] =~ /H(\d+)/;
+ my $thing = Thingy::Route->new(fromnode => $ncall, fromdxchan => $self, pcline=>$line, hops=>$hops);
+
+
+ # input filter if required
+ return unless $self->in_filter_route($parent);
+
my $i;
+ my @list;
my @rout;
for ($i = 2; $i < $#field; $i++) {
my ($call, $conf, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
next;
}
- $r = Route::User::get($call);
my $flags = Route::here($here)|Route::conf($conf);
-
- if ($r) {
- my $au = $r->addparent($parent);
- if ($r->flags != $flags) {
- $r->flags($flags);
- $au = $r;
- }
- push @rout, $r if $au;
- } else {
- push @rout, $parent->add_user($call, $flags);
- }
-
-
- # 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->homenode($parent->call) if !$user->homenode;
- $user->node($parent->call);
- $user->lastin($main::systime) unless DXChannel->get($call);
- $user->put;
+ $r = Route::User::new($call, $ncall, $flags);
+ push @list, $r;
}
-
- # queue up any messages (look for privates only)
- DXMsg::queue_msg(1) if $self->state eq 'normal';
- $self->route_pc16($parent, @rout) if @rout;
+ $thing->list(\@list);
+ $thing->add;
+ $thing->route;
return;
}
# new routing list
my @rout;
- my $parent = Route::Node::get($self->{call});
+ my $ncall = $self->{call};
+ my $parent = Route::Node::get($ncall);
unless ($parent) {
- dbg("DXPROT: my parent $self->{call} has disappeared");
+ dbg("DXPROT: my parent $ncall has disappeared");
$self->disconnect;
return;
}
+ my ($hops) = $field[-1] =~ /H(\d+)/;
+ my $thing = Thingy::Route->new(fromnode=>$ncall, fromdxchan => $self, pcline=>$line, hops=>$hops);
+
# parse the PC19
+ my @list;
for ($i = 1; $i < $#field-1; $i += 4) {
my $here = $field[$i];
my $call = uc $field[$i+1];
next;
}
- # 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->priv(1); # I have relented and defaulted nodes
- $user->lockout(1);
- $user->homenode($call);
- $user->node($call);
- }
-
- my $r = Route::Node::get($call);
- my $flags = Route::here($here)|Route::conf($conf);
-
- # modify the routing table if it is in it, otherwise store it in the pc19list for now
- if ($r) {
- my $ar;
- if ($call ne $parent->call) {
- if ($self->in_filter_route($r)) {
- $ar = $parent->add($call, $ver, $flags);
- push @rout, $ar if $ar;
- } else {
- next;
- }
- }
- if ($r->version ne $ver || $r->flags != $flags) {
- $r->version($ver);
- $r->flags($flags);
- push @rout, $r unless $ar;
- }
- } else {
-
- # if he is directly connected or allowed then add him, otherwise store him up for later
- if ($call eq $self->{call} || $user->wantroutepc19) {
- my $new = Route->new($call); # throw away
- if ($self->in_filter_route($new)) {
- my $ar = $parent->add($call, $ver, $flags);
- $user->wantroutepc19(1) unless defined $user->wantroutepc19;
- push @rout, $ar if $ar;
- } else {
- next;
- }
- } else {
- $pc19list{$call} = [] unless exists $pc19list{$call};
- my $nl = $pc19list{$call};
- push @{$pc19list{$call}}, [$self->{call}, $ver, $flags] unless grep $_->[0] eq $self->{call}, @$nl;
- }
- }
-
- # 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($call) if $mref;
-
- $user->lastin($main::systime) unless DXChannel->get($call);
- $user->put;
+ # decide whether we want this or not?
+ my $r = Route::Node->new($call, $ver, $flags);
+ push @list, $r if $call ne $ncall && $self->in_filter_route($r);
+ }
+ if (@list) {
+ $thing->list(\@list);
+ $thing->add;
+ $thing->route;
}
-
-
- $self->route_pc19(@rout) if @rout;
return;
}
if ($pcno == 21) { # delete a cluster from the list
my $call = uc $field[1];
- eph_del_regex("^PC1[679].*$call");
+ eph_del_regex("^PC1[79].*$call");
# if I get a PC21 from the same callsign as self then treat it
# as a PC39: I have gone away
return;
}
- # check to see if we are in the pc19list, if we are then don't bother with any of
- # this routing table manipulation, just remove it from the list and dump it
my @rout;
- if (my $nl = $pc19list{$call}) {
- $pc19list{$call} = [ grep {$_->[0] ne $self->{call}} @$nl ];
- delete $pc19list{$call} unless @{$pc19list{$call}};
- } else {
-
- my $parent = Route::Node::get($self->{call});
- unless ($parent) {
- dbg("DXPROT: my parent $self->{call} has disappeared");
- $self->disconnect;
- return;
- }
- if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
- my $node = Route::Node::get($call);
- if ($node) {
-
- my $dxchan = DXChannel->get($call);
- if ($dxchan && $dxchan != $self) {
- dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr');
- return;
- }
-
- # input filter it
- return unless $self->in_filter_route($node);
-
- # routing objects
- push @rout, $node->del($parent);
+ my $parent = Route::Node::get($self->{call});
+ unless ($parent) {
+ dbg("DXPROT: my parent $self->{call} has disappeared");
+ $self->disconnect;
+ return;
+ }
+ if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
+ my $node = Route::Node::get($call);
+ if ($node) {
+
+ my $dxchan = DXChannel->get($call);
+ if ($dxchan && $dxchan != $self) {
+ dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr');
+ return;
}
- } else {
- dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr');
- return;
+
+ # input filter it
+ return unless $self->in_filter_route($node);
+
+ # routing objects
+ push @rout, $node->del($parent);
}
+ } else {
+ dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr');
+ return;
}
+# if (eph_dup($line)) {
+# dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
+# return;
+# }
+
$self->route_pc21(@rout) if @rout;
return;
}
if ($pcno == 41) { # user info
my $call = $field[1];
- my $l = $line;
- $l =~ s/[\x00-\x20\x7f-\xff]+//g; # remove all funny characters and spaces for dup checking
- if (eph_dup($l, $eph_info_restime)) {
+ if (eph_dup($line, $eph_info_restime)) {
dbg("PCPROT: dupe") if isdbg('chanerr');
return;
}
$self->send(pc51($from, $to, '0'));
} else {
# it's a reply, look in the ping list for this one
- my $ref = $pings{$from};
- if ($ref) {
- my $tochan = DXChannel->get($from);
- while (@$ref) {
- my $r = shift @$ref;
- my $dxchan = DXChannel->get($r->{call});
- next unless $dxchan;
- my $t = tv_interval($r->{t}, [ gettimeofday ]);
- if ($dxchan->is_user) {
- my $s = sprintf "%.2f", $t;
- my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
- $dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
- } elsif ($dxchan->is_node) {
- if ($tochan) {
- my $nopings = $tochan->user->nopings || 2;
- push @{$tochan->{pingtime}}, $t;
- shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
-
- # cope with a missed ping, this means you must set the pingint large enough
- if ($t > $tochan->{pingint} && $t < 2 * $tochan->{pingint} ) {
- $t -= $tochan->{pingint};
- }
-
- # calc smoothed RTT a la TCP
- if (@{$tochan->{pingtime}} == 1) {
- $tochan->{pingave} = $t;
- } else {
- $tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
- }
- $tochan->{nopings} = $nopings; # pump up the timer
- }
- }
- }
- }
+ $self->handlepingreply($from);
}
} else {
if (eph_dup($line)) {
}
foreach $dxchan (@dxchan) {
- next unless $dxchan->is_node();
+ next unless $dxchan->is_op();
next if $dxchan == $main::me;
# send the pc50 or PC90
if ($dxchan->{nopings} <= 0) {
$dxchan->disconnect;
} else {
- addping($main::mycall, $dxchan->call);
+ $dxchan->addping($main::mycall, $dxchan->call);
$dxchan->{nopings} -= 1;
$dxchan->{lastping} = $t;
}
# some active measures
#
-
sub send_dx_spot
{
my $self = shift;
# get all the users connected on the above nodes and send them out
foreach $node (@localnodes, @remotenodes) {
if ($node) {
- my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
- $self->send_route(\&pc16, 1, $node, @rout) if @rout && $self->user->wantsendpc16;
+ $self->send_route(\&pc16, 1, $node,
+ map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users)
+ if $self->user->wantsendpc16;
} else {
dbg("sent a null value") if isdbg('chanerr');
}
}
}
-#
-# route a message down an appropriate interface for a callsign
-#
-# is called route(to, pcline);
-#
-sub route
-{
- my ($self, $call, $line) = @_;
-
- if (ref $self && $call eq $self->{call}) {
- dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
- return;
- }
-
- # always send it down the local interface if available
- my $dxchan = DXChannel->get($call);
- unless ($dxchan) {
- my $cl = Route::get($call);
- $dxchan = $cl->dxchan if $cl;
- if (ref $dxchan) {
- if (ref $self && $dxchan eq $self) {
- dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
- return;
- }
- }
- }
- if ($dxchan) {
- my $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
- if ($routeit) {
- $dxchan->send($routeit) unless $dxchan == $main::me;
- }
- } else {
- dbg("PCPROT: No route available, dropped") if isdbg('chanerr');
- }
-}
#
# obtain the hops from the list for this callsign and pc no
return ();
}
-
-# add a ping request to the ping queues
-sub addping
-{
- my ($from, $to) = @_;
- my $ref = $pings{$to} || [];
- my $r = {};
- $r->{call} = $from;
- $r->{t} = [ gettimeofday ];
- route(undef, $to, pc51($to, $main::mycall, 1));
- push @$ref, $r;
- $pings{$to} = $ref;
-}
-
sub process_rcmd
{
my ($self, $tonode, $fromnode, $user, $cmd) = @_;
my $ref = Route::Node::get($to);
my $dxchan = $ref->dxchan;
if ($dxchan && $dxchan->is_clx) {
- route(undef, $to, pc84($main::mycall, $to, $self->{call}, $cmd));
+ DXChannel::route(undef, $to, pc84($main::mycall, $to, $self->{call}, $cmd));
} else {
- route(undef, $to, pc34($main::mycall, $to, $cmd));
+ DXChannel::route(undef, $to, pc34($main::mycall, $to, $cmd));
}
}
$self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
}
- # get rid of any PC16/17/19
- eph_del_regex("^PC1[679]*$call");
+ # get rid of any PC16 and 19s
+ eph_del_regex("^PC16\\^$call");
+ eph_del_regex("^PC19\\^.*$call");
- # do routing stuff, remove me from routing table
+ # do routing stuff
my $node = Route::Node::get($call);
my @rout;
if ($node) {
@rout = $node->del($main::routeroot);
-
- # and all my ephemera as well
- for (@rout) {
- my $c = $_->call;
- eph_del_regex("^PC1[679].*$c");
- }
}
- # remove them from the pc19list as well
- while (my ($k,$v) = each %pc19list) {
- my @l = grep {$_->[0] ne $call} @{$pc19list{$k}};
- if (@l) {
- $pc19list{$k} = \@l;
- } else {
- delete $pc19list{$k};
- }
-
- # and the ephemera
- eph_del_regex("^PC1[679].*$k");
- }
-
# unbusy and stop and outgoing mail
my $mref = DXMsg::get_busy($call);
$mref->stop_msg($call) if $mref;
$self->route_pc21(@rout) if @rout;
}
- # remove outstanding pings
- delete $pings{$call};
-
# I was the last node visited
$self->user->node($main::mycall);
return $filter;
}
+# add a ping request to the ping queues
+sub addping
+{
+ my ($self, $from, $to) = @_;
+ my $ref = $DXChannel::pings{$to} || [];
+ my $r = {};
+ $r->{call} = $from;
+ $r->{t} = [ gettimeofday ];
+ DXChannel::route(undef, $to, pc51($to, $main::mycall, 1));
+ push @$ref, $r;
+ $DXCHannel::pings{$to} = $ref;
+}
+
sub eph_dup
{
my $s = shift;
$main::build += $VERSION;
$main::branch += $BRANCH;
-use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime $lru $lrusize $tooold);
+use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime $lru $lrusize);
%u = ();
$dbm = undef;
$lastoperinterval = 60*24*60*60;
$lasttime = 0;
$lrusize = 2000;
-$tooold = 86400 * 365; # this marks an old user who hasn't given enough info to be useful
# hash of valid elements and a simple prompt
%valid = (
wantpc90 => '1,Req PC90,yesno',
wantnp => '1,Req New Protocol,yesno',
wantpc16 => '9,Want Users from node,yesno',
- wantsendpc16 => '9,Send PC16,yesno',
- wantroutepc19 => '9,Route PC19,yesno',
+ wantsendpc16 => '9,Send users to node,yesno',
lastoper => '9,Last for/oper,cldatetime',
nothere => '0,Not Here Text',
registered => '9,Registered?,yesno',
#no strict;
sub AUTOLOAD
{
+ my $self = shift;
no strict;
my $name = $AUTOLOAD;
# this clever line of code creates a subroutine which takes over from autoload
# from OO Perl - Conway
*$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
- goto &$AUTOLOAD;
+ &$AUTOLOAD($self, @_);
+# *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
+# if (@_) {
+# $self->{$name} = shift;
+# }
+# return $self->{$name};
}
#use strict;
my $count = 0;
my $err = 0;
- my $del = 0;
my $fh = new IO::File ">$fn" or return "cannot open $fn ($!)";
if ($fh) {
my $key = 0;
# try to detect a lockfile (this isn't atomic but
# should do for now
- $lockfn = "$root/perl/cluster.lck"; # lock file name
+ $lockfn = "$root/local/cluster.lck"; # lock file name
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
}
my $ref = decode($val);
if ($ref) {
- my $t = $ref->{lastin} || 0;
- if ($main::systime > $t + $tooold) {
- unless ($ref->{lat} && $ref->{long} || $ref->{qth} || $ref->{qra}) {
- eval {$dbm->del($key)};
- dbg(carp("Export Error2: $key\t$val\n$@")) if $@;
- Log('DXCommand', "$ref->{call} deleted, too old");
- $del++;
- next;
- }
- }
- # only store users that are reasonably active or have useful information
print $fh "$key\t" . $ref->encode . "\n";
++$count;
} else {
- Log('DXCommand', "Export Error3: $key\t$val");
+ Log('DXCommand', "Export Error2: $key\t$val");
eval {$dbm->del($key)};
- dbg(carp("Export Error3: $key\t$val\n$@")) if $@;
+ dbg(carp("Export Error2: $key\t$val\n$@")) if $@;
++$err;
}
}
$fh->close;
}
- return "$count Users $del Deleted $err Errors ('sh/log Export' for details)";
+ return "$count Users $err Errors ('sh/log Export' for details)";
}
#
return _want('sendpc16', @_);
}
-sub wantroutepc16
-{
- return _want('routepc16', @_);
-}
-
sub wantlogininfo
{
my $self = shift;
use DXProt;
use Verify;
+# sub modules
+use QXProt::QXI;
+use QXProt::QXP;
+use QXProt::QXR;
+
use strict;
use vars qw($VERSION $BRANCH);
{
my $self = shift;
- $self->send($self->genI);
+ $self->send($self->QXI::gen);
}
sub normal
DXProt::normal(@_);
return;
}
- 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})$/;
+ my ($sort, $tonode, $fromnode, $msgid, $line, $incs);
+ return unless ($sort, $tonode, $fromnode, $msgid, $line, $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);
return unless $noderef->newid($msgid);
- $_[0]->handle($sort, $tonode, $fromnode, $msgid, $_[1]);
- return;
-}
-
-sub handle
-{
- no strict 'subs';
- my $self = shift;
- my $sort = shift;
- my $sub = "handle$sort";
- $self->$sub(@_) if $self->can($sub);
- return;
-}
-
-sub gen
-{
- no strict 'subs';
- my $self = shift;
- my $sort = shift;
- my $sub = "gen$sort";
- $self->$sub(@_) if $self->can($sub);
+ {
+ no strict 'subs';
+ my $sub = "QX${sort}::handle";
+ $_[0]->$sub($tonode, $fromnode, $msgid, $line) if $_[0]->can($sub);
+ }
return;
}
sub process
{
- if ($main::systime >= $last_node_update+$node_update_interval) {
+
+ my $t = $main::systime;
+
+ foreach my $dxchan (DXChannel->get_all()) {
+ next unless $dxchan->is_np;
+ next if $dxchan == $main::me;
+
+ # send a ping out on this channel
+ if ($dxchan->{pingint} && $t >= $dxchan->{pingint} + $dxchan->{lastping}) {
+ if ($dxchan->{nopings} <= 0) {
+ $dxchan->disconnect;
+ } else {
+ $dxchan->addping($main::mycall, $dxchan->call);
+ $dxchan->{nopings} -= 1;
+ $dxchan->{lastping} = $t;
+ }
+ }
+ }
+
+ if ($t >= $last_node_update+$node_update_interval) {
# sendallnodes();
# sendallusers();
$last_node_update = $main::systime;
}
}
+sub adjust_hops
+{
+ return $_[1];
+}
+
sub disconnect
{
my $self = shift;
sub frame
{
+ my $self = shift;
my $sort = shift;
my $to = shift || "*";
my $ht;
return "$line^$cs";
}
-sub handleI
-{
- my $self = shift;
-
- my @f = split /\^/, $_[3];
- if ($self->passphrase && $f[7] && $f[8]) {
- 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;
- }
- $self->{verified} = 1;
- } else {
- $self->{verified} = 0;
- }
- if ($self->{outbound}) {
- $self->send($self->genI);
- }
- 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[5];
- $self->{build} = $f[6];
- $self->state('init1');
- $self->{lastping} = 0;
-}
-
-sub genI
-{
- my $self = shift;
- my @out = ('I', $self->call, "DXSpider", ($main::version + 53) * 100, $main::build);
- if (my $pass = $self->user->passphrase) {
- my $inp = Verify->new;
- push @out, $inp->challenge, $inp->response($pass, $self->call, $main::mycall);
- }
- return frame(@out);
-}
-
-sub handleR
-{
-
-}
-
-sub genR
-{
-
-}
-
-sub handleP
+# add a ping request to the ping queues
+sub addping
{
-
+ my ($self, $usercall, $to) = @_;
+ my $ref = $DXChannel::pings{$to} || [];
+ my $r = {};
+ $r->{call} = $usercall;
+ $r->{t} = [ gettimeofday ];
+ DXChannel::route(undef, $to, $self->QXP::gen($to, 1, $usercall, @{$r->{t}}));
+ push @$ref, $r;
+ $DXCHannel::pings{$to} = $ref;
}
-sub genP
-{
-
-}
-sub gen2
-{
- my $self = shift;
-
- my $node = shift;
- my $sort = shift;
- my @out;
- my $dxchan;
-
- while (@_) {
- my $str = '';
- for (; @_ && length $str <= 230;) {
- my $ref = shift;
- my $call = $ref->call;
- my $flag = 0;
-
- $flag += 1 if $ref->here;
- $flag += 2 if $ref->conf;
- if ($ref->is_node) {
- my $ping = int($ref->pingave * 10);
- $str .= "^N$flag$call,$ping";
- my $v = $ref->build || $ref->version;
- $str .= ",$v" if defined $v;
- } else {
- $str .= "^U$flag$call";
- }
- }
- push @out, $str if $str;
- }
- my $n = @out;
- my $h = get_hops(90);
- @out = map { sprintf "PC90^%s^%X^%s%d%s^%s^", $node->call, $main::systime, $sort, --$n, $_, $h } @out;
- return @out;
-}
1;
return undef;
}
$self = $parent->new($call, @_);
+ $self->register;
$parent->_addnode($self);
return $self;
}
@out = $uref->addparent($self);
} else {
$uref = Route::User->new($ucall, $self->{call}, @_);
+ $uref->register;
@out = $uref;
}
$self->_adduser($uref);
{
my $pkg = shift;
my $call = uc shift;
-
- confess "already have $call in $pkg" if $list{$call};
-
my $self = $pkg->SUPER::new($call);
$self->{parent} = ref $pkg ? [ $pkg->{call} ] : [ ];
$self->{version} = shift;
$self->{nodes} = [];
$self->{lid} = 0;
- $list{$call} = $self;
-
return $self;
}
+sub register
+{
+ my $self = shift;
+ confess "already have $call in $pkg" if $list{$self->{call}};
+ $list{$call} = $self;
+}
+
sub get
{
my $call = shift;
sub AUTOLOAD
{
no strict;
- my $name = $AUTOLOAD;
+
+ my $self = shift;
+ $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
- $name =~ s/^.*:://o;
+ $name =~ s/.*:://o;
confess "Non-existant field '$AUTOLOAD'" unless $valid{$name} || $Route::valid{$name};
- # this clever line of code creates a subroutine which takes over from autoload
- # from OO Perl - Conway
- *$AUTOLOAD = sub {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
- goto &$AUTOLOAD;
+ *$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
+ &$AUTOLOAD($self, @_);
}
1;
my $call = uc shift;
my $ncall = uc shift;
my $flags = shift;
- confess "already have $call in $pkg" if $list{$call};
my $self = $pkg->SUPER::new($call);
$self->{parent} = [ $ncall ];
$self->{flags} = $flags;
- $list{$call} = $self;
return $self;
}
+sub register
+{
+ my $self = shift;
+
+ confess "already have $call in $pkg" if $list{$self->{call}};
+
+ $list{$call} = $self;
+}
+
sub get_all
{
return values %list;
sub AUTOLOAD
{
no strict;
- my ($pkg,$name) = $AUTOLOAD =~ /^(.*)::(\w+)$/;
- return if $name eq 'DESTROY';
+
+ my $self = shift;
+ $name = $AUTOLOAD;
+ return if $name =~ /::DESTROY$/;
+ $name =~ s/.*:://o;
confess "Non-existant field '$AUTOLOAD'" unless $valid{$name} || $Route::valid{$name};
- # this clever line of code creates a subroutine which takes over from autoload
- # from OO Perl - Conway
- *$AUTOLOAD = sub {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
- goto &$AUTOLOAD;
-# *{"${pkg}::$name"} = sub {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
-# goto &{"${pkg}::$name"};
+ *$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
+ &$AUTOLOAD($self, @_);
}
1;
--- /dev/null
+#
+# This module is part of the new structure of the cluster
+#
+# What happens when a sentence comes in is that it is sanity
+# checked and then is converted into a Thingy. This Thingy is what
+# is the passed around the system.
+#
+# Copyright (c) 2001 Dirk Koopman G1TLH
+#
+# $Id$
+#
+
+use strict;
+
+package Thingy;
+
+use DXDebug;
+
+use vars qw($VERSION $BRANCH %valid);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
+%valid = (
+ tonode => '0,To Node',
+ fromnode => '0,From Node',
+ fromchan => '0,DXChannel Ref',
+ pcline => '0,Original PC Line',
+ qxline => '0,Original QX Line',
+ hops => '0,Hops',
+ );
+
+sub _valid
+{
+ my @pkg = split /::/, ref shift;
+ my $field = shift;
+
+ # iterate down the packages looking for a 'valid'
+ no strict 'refs';
+ while (@pkg >= 1) {
+ my $n = join('::'. @pkg, 'valid');
+ my $r = $$n{$field};
+ return $r if defined $r;
+ pop @pkg;
+ }
+ return undef;
+}
+
+sub new
+{
+ my $pkg = shift;
+ my $self = bless {}, $pkg;
+ while (my ($k, $v) = each %{\@_}) {
+ confess "Non-existant field '$k'" unless $self->_valid($k);
+ $self->{lc $k} = $v;
+ }
+ return $self;
+}
+
+sub AUTOLOAD
+{
+ my $self = shift;
+ no strict;
+ my $name = $AUTOLOAD;
+ return if $name =~ /::DESTROY$/;
+ $name =~ s/^.*:://o;
+
+ confess "Non-existant field '$AUTOLOAD'" unless $self->_valid($name);
+
+ *$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
+ &$AUTOLOAD($self, @_);
+}
+
+
+
+
+
+
+
+
+
+
+1;
--- /dev/null
+package Thingy::RouteUser;
+
+use vars qw($VERSION $BRANCH %valid);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
+%valid = (
+ list => '0,List of Calls,parray',
+ new => '0,List of new Routes,parray',
+ );
+
+sub add
+{
+ my $self = shift;
+
+ my $dxchan = DXChannel->get($self->{fromdxchan});
+ my $parent = Route::Node::get($self->{fromnode});
+
+ my @rout;
+ foreach my $r (@{$self->{list}}) {
+
+ my $user;
+ if ($sort eq 'U') {
+ my $old = Route::User::get($r->call);
+ if ($old) {
+ if ($old->flags != $r->flags) {
+ $old->flags($r->flags);
+ push @rout, $r;
+ }
+ $old->addparent($parent);
+ } else {
+ $r->register;
+ $parent->add_user($r->call);
+ $r->add_parent($parent);
+ push @rout, $r;
+ }
+
+ # add this station to the user database, if required
+ $call =~ s/-\d+$//o; # remove ssid for users
+ $user = DXUser->get_current($call) || DXUser->new($call);
+ $user->homenode($parent->call) unless $user->homenode;
+ $user->node($parent->call);
+ } elsif ($sort eq 'N') {
+ my $old = Route::Node::get($call);
+ if ($old) {
+ my $ar;
+ $ar = $parent->add($call, $ver, $flags);
+ push @rout, $ar if $ar;
+ } else {
+ next;
+ }
+ }
+ if ($r->version ne $ver || $r->flags != $flags) {
+ $r->version($ver);
+ $r->flags($flags);
+ push @rout, $r unless $ar;
+ }
+ } else {
+ if ($call eq $self->{call}) {
+ dbg("DXPROT: my channel route for $call has disappeared");
+ next;
+ };
+
+ my $new = Route->new($call); # throw away
+ if ($dxchan->in_filter_route($new)) {
+ my $r = $parent->add($call, $ver, $flags);
+ push @rout, $r;
+ } else {
+ next;
+ }
+ }
+
+ # add this station to the user database, if required (don't remove SSID from nodes)
+ my $user = DXUser->get_current($call);
+ unless ($user) {
+ $user = DXUser->new($call);
+ $user->sort('A');
+ $user->priv(1); # I have relented and defaulted nodes
+ $user->lockout(1);
+ $user->homenode($call);
+ $user->node($call);
+ }
+ }
+ $user->lastin($main::systime) unless DXChannel->get($call);
+ $user->put;
+ }
+ $self->{new} = \@rout;
+}
# try to create and lock a lockfile (this isn't atomic but
# should do for now
- $lockfn = "$root/perl/cluster.lck"; # lock file name
+ $lockfn = "$root/local/cluster.lck"; # lock file name
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
# create the channel
if ($user->wantnp) {
- if ($user->passphrase && $main::me->user->passphrase) {
- $dxchan = QXProt->new($call, $conn, $user);
- } else {
- unless ($user->passphrase) {
- Log('DXCommand', "$call using NP but has no passphrase");
- dbg("$call using NP but has no passphrase");
- }
- unless ($main::me->user->passphrase) {
- Log('DXCommand', "$main::mycall using NP but has no passphrase");
- dbg("$main::mycall using NP but has no passphrase");
- }
- already_conn($conn, $call, "Need to exchange passphrases");
- return;
+ $dxchan = QXProt->new($call, $conn, $user);
+ unless ($user->passphrase) {
+ Log('DXCommand', "$call using NP but has no passphrase");
+ dbg("$call using NP but has no passphrase");
+ }
+ unless ($main::me->user->passphrase) {
+ Log('DXCommand', "$main::mycall using NP but has no passphrase");
+ dbg("$main::mycall using NP but has no passphrase");
}
} elsif ($user->is_node) {
$dxchan = DXProt->new($call, $conn, $user);
}
}
-# remove any outstanding entries on the inqueue after a disconnection (usually)
-sub clean_inqueue
-{
- my $dxchan = shift;
- @inqueue = grep {$_->{dxchan} != $dxchan} @inqueue;
-}
-
sub login
{
return \&new_channel;
# load Prefixes
dbg("loading prefixes ...");
-my $r = Prefix::init();
+my $r = Prefix::load();
confess $r if $r;
dbg(USDB::init());
}
-$lockfn = "$root/perl/cluster.lck"; # lock file name
+$lockfn = "$root/local/cluster.lck"; # lock file name
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
use DXVars;
use DXUser;
-my $lockfn = "$root/perl/cluster.lck"; # lock file name
+my $lockfn = "$root/local/cluster.lck"; # lock file name
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
}
-$lockfn = "$root/perl/cluster.lck"; # lock file name
+$lockfn = "$root/local/cluster.lck"; # lock file name
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
projects / spider.git / commitdiff