From 67c84cdc0a2bb61fe16e0f0ce9d19b9dee203ab4 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Fri, 7 Feb 2025 23:51:44 -0500 Subject: [PATCH] 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); --- src/fne/network/callhandler/TagDMRData.cpp | 4 ++-- src/fne/network/callhandler/TagNXDNData.cpp | 4 ++-- src/fne/network/callhandler/TagP25Data.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fne/network/callhandler/TagDMRData.cpp b/src/fne/network/callhandler/TagDMRData.cpp index 47dc7896..fdd74957 100644 --- a/src/fne/network/callhandler/TagDMRData.cpp +++ b/src/fne/network/callhandler/TagDMRData.cpp @@ -4,7 +4,7 @@ * GPLv2 Open Source. Use is subject to license terms. * 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" @@ -129,7 +129,7 @@ bool TagDMRData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId // is the stream valid? if (validate(peerId, dmrData, streamId)) { // is this peer ignored? - if (!isPeerPermitted(peerId, dmrData, streamId)) { + if (!isPeerPermitted(peerId, dmrData, streamId, external)) { return false; } diff --git a/src/fne/network/callhandler/TagNXDNData.cpp b/src/fne/network/callhandler/TagNXDNData.cpp index b579a58f..84ffc12b 100644 --- a/src/fne/network/callhandler/TagNXDNData.cpp +++ b/src/fne/network/callhandler/TagNXDNData.cpp @@ -4,7 +4,7 @@ * GPLv2 Open Source. Use is subject to license terms. * 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" @@ -95,7 +95,7 @@ bool TagNXDNData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerI // is the stream valid? if (validate(peerId, lc, messageType, streamId)) { // is this peer ignored? - if (!isPeerPermitted(peerId, lc, messageType, streamId)) { + if (!isPeerPermitted(peerId, lc, messageType, streamId, external)) { return false; } diff --git a/src/fne/network/callhandler/TagP25Data.cpp b/src/fne/network/callhandler/TagP25Data.cpp index a49fd4b5..5de7f021 100644 --- a/src/fne/network/callhandler/TagP25Data.cpp +++ b/src/fne/network/callhandler/TagP25Data.cpp @@ -4,7 +4,7 @@ * GPLv2 Open Source. Use is subject to license terms. * 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" @@ -153,7 +153,7 @@ bool TagP25Data::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId // is the stream valid? if (validate(peerId, control, duid, tsbk.get(), streamId)) { // is this peer ignored? - if (!isPeerPermitted(peerId, control, duid, streamId)) { + if (!isPeerPermitted(peerId, control, duid, streamId, external)) { return false; }