From 8d4360134b5a83741dbd77ef99a56c2f1c40db05 Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Mon, 26 Dec 2016 22:27:21 +0000 Subject: [PATCH] try to prevent $myalias calls being set to nodes --- Changes | 2 ++ perl/DXProtHandle.pm | 37 +++++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/Changes b/Changes index 6b64cfc9..4a4b0fac 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,5 @@ +26Dec16======================================================================= +1. Fix some possible routes to $myalias callsigns becoming nodes. 22Nov16======================================================================= 1. Add CTY-2614 prefixes 21Nov16======================================================================= diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 4e55b940..d4ce6bf6 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -653,8 +653,8 @@ sub check_add_node $user->lockout(1); $user->homenode($call); $user->node($call); + $user->sort('A'); } - $user->sort('A') unless $user->is_node; return $user; } @@ -709,7 +709,7 @@ sub handle_19 next unless $ver && $ver =~ /^\d+$/; next if $ver < 5000; # only works with version 5 software next if length $call < 3; # min 3 letter callsigns - next if $call eq $main::mycall; + next if $call eq $main::mycall || $call eq $main::myalias; # check that this PC19 isn't trying to alter the wrong dxchan $h = 0; @@ -853,7 +853,7 @@ sub handle_21 my @rout; - if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me! + if ($call ne $main::mycall && $call ne $main::myalias) { # don't allow malicious buggers to disconnect me! my $node = Route::Node::get($call); if ($node) { @@ -864,7 +864,7 @@ sub handle_21 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'); + dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chan'); return; } @@ -876,7 +876,7 @@ sub handle_21 push @rout, $call if $dxchan && @rout == 0; } } else { - dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr'); + dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chan'); return; } @@ -1014,7 +1014,7 @@ sub handle_25 return; } if ($pc->[2] eq $main::mycall) { - dbg("PCPROT: Trying to merge to myself, ignored") if isdbg('chanerr'); + dbg("PCPROT: Trying to merge to myself, ignored") if isdbg('chan'); return; } @@ -1169,7 +1169,7 @@ sub handle_41 return; } - if ($call eq $main::mycall && $call eq $main::myalias) { + if ($call eq $main::mycall || $call eq $main::myalias) { dbg "DXPROT: PC41 trying to update $call from outside via $origin, ignored"; return; } @@ -1298,6 +1298,10 @@ sub handle_51 my $from = $pc->[2]; my $flag = $pc->[3]; + if ($to eq $main::myalias) { + dbg("DXPROT: Ping addressed to \$myalias ($main::myalias), ignored") if isdbg('chan'); + return; + } # is it for us? if ($to eq $main::mycall) { @@ -1646,7 +1650,11 @@ sub pc92_handle_first_slot my ($call, $is_node, $is_extnode, $here, $version, $build) = @$slot; if ($call && $is_node) { if ($call eq $main::mycall) { - dbg("PCPROT: $call looped back onto $main::mycall, ignored") if isdbg('chanerr'); + dbg("PCPROT: $call looped back onto \$main::mycall ($main::mycall), ignored") if isdbg('chan'); + return; + } + if ($call eq $main::myalias) { + dbg("PCPROT: $call looped back onto \$main::myalias ($main::myalias), ignored") if isdbg('chan'); return; } # this is only accepted from my "self". @@ -1707,21 +1715,26 @@ sub handle_92 # } if ($pcall eq $main::mycall) { - dbg("PCPROT: looped back, ignored") if isdbg('chanerr'); + dbg("PCPROT: looped back, ignored") if isdbg('chan'); + return; + } + + if ($pcall eq $main::myalias) { + dbg("PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored") if isdbg('chan'); return; } if ($pcall eq $self->{call} && $self->{state} eq 'init') { if ($self->{isolate}) { - dbg("PC9x received, but $pcall is isolated, ignored"); + dbg("DXPROT: PC9x received, but $pcall is isolated, ignored"); return; } elsif (!$self->user->wantpc9x) { - dbg("PC9x explicitly switched off on $pcall, ignored"); + dbg("DXPROT: PC9x explicitly switched off on $pcall, ignored"); return; } else { $self->state('init92'); $self->{do_pc9x} = 1; - dbg("Do pc9x set on $pcall"); + dbg("DXPROT: Do pc9x set on $pcall"); } } unless ($self->{do_pc9x}) { -- 2.43.0