pass external flag to the intial isPeerPermitted() check, this is to fix an issue where if a external peer isn't in the always list for an affiliated group it may attempt to check an affiliation list that doesn't exist (external peers don't typically have affiliation lists);

82-dvmbridge---implement-notch-filter-for-2175hz-trc-guard-tone
Bryan Biedenkapp 1 year ago
parent b593f39d0d
commit 67c84cdc0a

@ -4,7 +4,7 @@
* GPLv2 Open Source. Use is subject to license terms. * GPLv2 Open Source. Use is subject to license terms.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* Copyright (C) 2023-2024 Bryan Biedenkapp, N2PLL * Copyright (C) 2023-2025 Bryan Biedenkapp, N2PLL
* *
*/ */
#include "fne/Defines.h" #include "fne/Defines.h"
@ -129,7 +129,7 @@ bool TagDMRData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId
// is the stream valid? // is the stream valid?
if (validate(peerId, dmrData, streamId)) { if (validate(peerId, dmrData, streamId)) {
// is this peer ignored? // is this peer ignored?
if (!isPeerPermitted(peerId, dmrData, streamId)) { if (!isPeerPermitted(peerId, dmrData, streamId, external)) {
return false; return false;
} }

@ -4,7 +4,7 @@
* GPLv2 Open Source. Use is subject to license terms. * GPLv2 Open Source. Use is subject to license terms.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* Copyright (C) 2023-2024 Bryan Biedenkapp, N2PLL * Copyright (C) 2023-2025 Bryan Biedenkapp, N2PLL
* *
*/ */
#include "fne/Defines.h" #include "fne/Defines.h"
@ -95,7 +95,7 @@ bool TagNXDNData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerI
// is the stream valid? // is the stream valid?
if (validate(peerId, lc, messageType, streamId)) { if (validate(peerId, lc, messageType, streamId)) {
// is this peer ignored? // is this peer ignored?
if (!isPeerPermitted(peerId, lc, messageType, streamId)) { if (!isPeerPermitted(peerId, lc, messageType, streamId, external)) {
return false; return false;
} }

@ -4,7 +4,7 @@
* GPLv2 Open Source. Use is subject to license terms. * GPLv2 Open Source. Use is subject to license terms.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* Copyright (C) 2023-2024 Bryan Biedenkapp, N2PLL * Copyright (C) 2023-2025 Bryan Biedenkapp, N2PLL
* *
*/ */
#include "fne/Defines.h" #include "fne/Defines.h"
@ -153,7 +153,7 @@ bool TagP25Data::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId
// is the stream valid? // is the stream valid?
if (validate(peerId, control, duid, tsbk.get(), streamId)) { if (validate(peerId, control, duid, tsbk.get(), streamId)) {
// is this peer ignored? // is this peer ignored?
if (!isPeerPermitted(peerId, control, duid, streamId)) { if (!isPeerPermitted(peerId, control, duid, streamId, external)) {
return false; return false;
} }

Loading…
Cancel
Save

Powered by TurnKey Linux.