Fix for limiting AKAs, show parent PID that forked child, other minor fixes

This commit is contained in:
2023-07-08 18:00:23 +10:00
parent 02105b10fb
commit faeec61aeb
5 changed files with 12 additions and 21 deletions

View File

@@ -203,23 +203,9 @@ final class Binkp extends BaseProtocol
// If we are originating, we'll show the remote our address in the same network
if ($this->originate) {
if ($this->setup->optionGet(Setup::O_HIDEAKA)) {
$addresses = collect();
$addresses = $this->our_addresses();
foreach ($this->node->aka_remote_authed as $ao)
$addresses = $addresses->merge($this->setup->system->match($ao->zone,Address::NODE_ZC|Address::NODE_RC|Address::NODE_NC|Address::NODE_HC|Address::NODE_ACTIVE|Address::NODE_PVT|Address::NODE_POINT));
$addresses = $addresses->unique();
Log::debug(sprintf('%s:- Presenting limited AKAs [%s]',self::LOGKEY,$addresses->pluck('ftn')->join(',')));
} else {
$addresses = $this->setup->system->addresses;
Log::debug(sprintf('%s:- Presenting ALL our AKAs [%s]',self::LOGKEY,$addresses->pluck('ftn')->join(',')));
}
$this->msgs(self::BPM_ADR,$this->setup->system->addresses->pluck('ftn')->join(' '));
$this->msgs(self::BPM_ADR,$addresses->pluck('ftn')->join(' '));
}
}