From 02e236202c08ce9ee16448482accebf034f12dbc Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Thu, 31 Oct 2024 05:29:51 -0400 Subject: [PATCH] #2066 P25 Phase 1 frequency band link control messages are now checked for valid CRC before being used. (#2067) Co-authored-by: Dennis Sheirer --- .../module/decode/p25/phase1/P25P1MessageProcessor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1MessageProcessor.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1MessageProcessor.java index 882398fc..759f6f20 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1MessageProcessor.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1MessageProcessor.java @@ -236,13 +236,13 @@ public class P25P1MessageProcessor implements Listener processForFrequencyBands(message); //Also process the link control messages for frequency bands. - if(message instanceof LDU1Message ldu1) + if(message instanceof LDU1Message ldu1 && ldu1.getLinkControlWord() instanceof LinkControlWord lcw && lcw.isValid()) { - processForFrequencyBands(ldu1.getLinkControlWord()); + processForFrequencyBands(lcw); } - else if(message instanceof TDULCMessage tdulc) + else if(message instanceof TDULCMessage tdulc && tdulc.getLinkControlWord() instanceof LinkControlWord lcw && lcw.isValid()) { - processForFrequencyBands(tdulc.getLinkControlWord()); + processForFrequencyBands(lcw); } if(mMessageListener != null)