From b3cd3f431f7cf9e2c204a8b048e27c3167137a56 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Sun, 27 Oct 2024 05:29:25 -0400 Subject: [PATCH] #2045 P25 Phase 1 Data channels are now ignored if the channel config calls for it. (#2046) Co-authored-by: Dennis Sheirer --- .../decode/p25/P25TrafficChannelManager.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java b/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java index aa59d549..6db3b0b7 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java @@ -1163,16 +1163,20 @@ public class P25TrafficChannelManager extends TrafficChannelManager implements I return; } - if(mIgnoreDataCalls && isDataChannelGrant && tracker == null) + if(mIgnoreDataCalls && isDataChannelGrant) { - P25ChannelGrantEvent event = P25ChannelGrantEvent.builder(decodeEventType, timestamp, serviceOptions) - .channelDescriptor(apco25Channel) - .details("IGNORED: PHASE 1 DATA CALL " + (serviceOptions != null ? serviceOptions : "")) - .identifiers(ic) - .build(); - tracker = new P25TrafficChannelEventTracker(event); - addTracker(tracker, frequency, P25P1Message.TIMESLOT_1); - broadcast(tracker); + if(tracker == null) + { + P25ChannelGrantEvent event = P25ChannelGrantEvent.builder(decodeEventType, timestamp, serviceOptions) + .channelDescriptor(apco25Channel) + .details("IGNORED: PHASE 1 DATA CALL " + (serviceOptions != null ? serviceOptions : "")) + .identifiers(ic) + .build(); + tracker = new P25TrafficChannelEventTracker(event); + addTracker(tracker, frequency, P25P1Message.TIMESLOT_1); + broadcast(tracker); + } + return; }