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");
}
return;
}
$dxchan = DXChannel->get($ncall);
- if ($dxchan ne $self) {
+ if ($dxchan && $dxchan ne $self) {
dbg('chan', "PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!");
return;
}
return;
}
$dxchan = DXChannel->get($ncall);
- if ($dxchan ne $self) {
+ if ($dxchan && $dxchan ne $self) {
dbg('chan', "PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!");
return;
}
next if length $call < 3; # min 3 letter callsigns
# update it if required
+ my $r;
if ($parent->call eq $call && !$parent->version) {
$parent->version($ver);
$parent->flags(Route::here($here)|Route::conf($conf));
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 || $r->version eq '0000')) {
+ $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)
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);
}
}