use strict;
use vars qw($me $pc11_max_age $pc23_max_age
- $last_hour %pings %rcmds
+ $last_hour $last10 %eph %pings %rcmds
%nodehops $baddx $badspotter $badnode $censorpc
$allowzero $decode_dk0wcy $send_opernam @checklist);
$baddx = new DXHash "baddx";
$badspotter = new DXHash "badspotter";
$badnode = new DXHash "badnode";
+$last10 = time;
@checklist =
(
sub new
{
my $self = DXChannel::alloc(@_);
+
+ # add this node to the table, the values get filled in later
+ my $pkg = shift;
+ my $call = shift;
+ $main::routeroot->add($call, '0000', Route::here(1)) if $call ne $main::mycall;
+
return $self;
}
# send info to all logged in thingies
$self->tell_login('loginn');
- # add this node to the table, the values get filled in later
- $main::routeroot->add($call);
-
Log('DXProt', "$call connected");
}
next unless $call && $conf && defined $here && is_callsign($call);
$conf = $conf eq '*';
- push @rout, $parent->add_user($call, Route::here($here)|Route::conf($conf));
+ my $r = Route::User::get($call);
+ my $flags = Route::here($here)|Route::conf($conf);
+
+ if ($r && $r->flags != $flags) {
+ $r->$flags($flags);
+ push @rout, $r;
+ } elsif (!$r) {
+ push @rout, $parent->add_user($call, $flags);
+ }
# add this station to the user database, if required
$call =~ s/-\d+$//o; # remove ssid for users
# queue up any messages (look for privates only)
DXMsg::queue_msg(1) if $self->state eq 'normal';
- dbg('route', "B/C PC16 on $ncall for: " . join(',', map{$_->call} @rout)) if @rout;
$self->route_pc16($parent, @rout) if @rout;
return;
}
if ($pcno == 17) { # remove a user
my $dxchan;
my $ncall = $field[2];
+ my $ucall = $field[1];
if ($ncall eq $main::mycall) {
dbg('chan', "PCPROT: trying to alter config on this node from outside!");
return;
dbg('chan', "PCPROT: Route::Node $ncall not in config");
return;
}
- my @rout = $parent->del_user($field[1]);
- dbg('route', "B/C PC17 on $ncall for: $field[1]");
+ my $r = Route::User::get($ucall);
+ my @rout = $parent->del_user($ucall) if $r;
$self->route_pc17($parent, @rout) if @rout;
return;
}
next if length $call < 3; # min 3 letter callsigns
# update it if required
- if ($parent->call eq $call && !$parent->version) {
+ my $r;
+ my $flags = Route::here($here)|Route::conf($conf);
+ if ($parent->call eq $call && ($parent->version ne $ver || $parent->flags != $flags)) {
$parent->version($ver);
- $parent->flags(Route::here($here)|Route::conf($conf));
+ $parent->flags($flags);
push @rout, $parent;
} elsif ($parent->call ne $call) {
next if $call eq $main::mycall || $call eq $self->{call};
my $r = $parent->add($call, $ver, Route::here($here)|Route::conf($conf));
push @rout, $r if $r;
+ } else {
+ $r = Route::Node::get($call);
+ if ($r && ($r->version ne $ver || $r->flags != $flags)) {
+ $r->version($ver);
+ $r->flags(Route::here($here)|Route::conf($conf));
+ push @rout, $r;
+ }
}
# unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect)
$user->put;
}
- dbg('route', "B/C PC19 for: " . join(',', map{$_->call} @rout)) if @rout;
-
$self->route_pc19(@rout) if @rout;
return;
}
dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!");
return;
}
- dbg('route', "B/C PC21 for: " . join(',', (map{$_->call} @rout))) if @rout;
-
$self->route_pc21(@rout) if @rout;
return;
}
# NOTE - don't arrive here UNLESS YOU WANT this lump of protocol to be
# REBROADCAST!!!!
#
-
- unless ($self->{isolate}) {
- broadcast_ak1a($line, $self); # send it to everyone but me
+
+ if (eph_dup($line)) {
+ dbg('chan', "PCPROT: Ephemeral dup, dropped");
+ } else {
+ unless ($self->{isolate}) {
+ broadcast_ak1a($line, $self); # send it to everyone but me
+ }
}
}
# send a pc50 out on this channel
$dxchan->{pc50_t} = $main::systime unless exists $dxchan->{pc50_t};
if ($t >= $dxchan->{pc50_t} + $DXProt::pc50_interval) {
- $dxchan->send(pc50(scalar DXChannel::get_all_users));
+ my $s = pc50(scalar DXChannel::get_all_users);
+ eph_dup($s);
+ $dxchan->send($s);
$dxchan->{pc50_t} = $t;
}
}
}
}
+
+ # every ten seconds
+ if ($t - $last10 >= 10) {
+ # clean out ephemera
+
+ eph_clean();
+
+ $last10 = $t;
+ }
- my $key;
- my $val;
- my $cutoff;
if ($main::systime - 3600 > $last_hour) {
-# Spot::process;
-# Geomag::process;
-# AnnTalk::process;
$last_hour = $main::systime;
}
}
my $self = shift;
my $n;
my @nodes;
- my @localcalls;
- my @remotecalls;
-
+ my @localnodes;
+ my @remotenodes;
+
+ dbg('trace', 'DXProt::send_local_config');
+
# send our nodes
if ($self->{isolate}) {
- @localcalls = ( $main::mycall );
+ @localnodes = ( $main::routeroot );
} else {
# create a list of all the nodes that are not connected to this connection
# and are not themselves isolated, this to make sure that isolated nodes
# don't appear outside of this node
- my @dxchan = grep { $_->call ne $main::mycall && $_->call ne $self->{call} && !$_->{isolate} } DXChannel::get_all_nodes();
- @localcalls = map { $_->{call} } @dxchan if @dxchan;
- @remotecalls = map {my $r = Route::Node::get($_); $r ? $r->rnodes(@localcalls, $main::mycall, $self->{call}) : () } @localcalls if @localcalls;
- unshift @localcalls, $main::mycall;
+ my @dxchan = grep { $_->call ne $main::mycall && $_->call ne $self->{call} } DXChannel::get_all_nodes();
+ @localnodes = map { Route::Node::get($_->{call}) or die "connot find node $_->{call}" } @dxchan if @dxchan;
+ my @intcalls = map { $_->nodes } @localnodes if @localnodes;
+ my $ref = Route::Node::get($self->{call});
+ my @rnodes = $ref->nodes;
+ for my $n (@intcalls) {
+ push @remotenodes, Route::Node::get($n) unless grep $n eq $_, @rnodes;
+ }
+ unshift @localnodes, $main::routeroot;
}
- @nodes = map {my $r = Route::Node::get($_); $r ? $r : ()} (@localcalls, @remotecalls);
- send_route($self, \&pc19, scalar @nodes, @nodes);
+ send_route($self, \&pc19, scalar(@localnodes)+scalar(@remotenodes), @localnodes, @remotenodes);
# get all the users connected on the above nodes and send them out
- foreach $n (@nodes) {
+ foreach $n (@localnodes, @remotenodes) {
send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users);
}
}
broadcast_route($self, \&pc21, scalar @_, @_);
}
+sub eph_dup
+{
+ my $s = shift;
+
+ # chop the end off
+ $s =~ s/\^H\d\d?\^?~?$//;
+ return 1 if exists $eph{$s};
+ $eph{$s} = $main::systime;
+ return undef;
+}
+
+sub eph_clean
+{
+ my ($key, $val);
+
+ while (($key, $val) = each %eph) {
+ if ($main::systime - $val > 90) {
+ delete $eph{$key};
+ }
+ }
+}
+
1;
__END__