GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1994 P25 Phase1 missing subsequent calls audio when multiple conversations on the same traffic channel. (#1995)

Browse Source 
Fixed issue where sdrtrunk was not checking HDU and LDU2 encryption sequences as valid before assessing the encryption state of a call.  Updated P25P1 audio module to check the valid flag for both the HDU and the LDU2 encryption segment before assigning encryption state.  Now caches all LDU messages until encryption state is determined.

Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-09-29 07:53:13 -04:00
committed by GitHub
parent 32ce79b8af
commit 0ecdf4dd2b
8 changed files with 157 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/io/github/dsheirer/module/decode/p25/audio/P25P1AudioModule.java
View File

@@ -1,6 +1,6 @@
/*
* *****************************************************************************
* Copyright (C) 2014-2020 Dennis Sheirer
* Copyright (C) 2014-2024 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@ import io.github.dsheirer.module.decode.p25.phase1.message.ldu.LDU2Message;
import io.github.dsheirer.module.decode.p25.phase1.message.ldu.LDUMessage;
import io.github.dsheirer.preference.UserPreferences;
import io.github.dsheirer.sample.Listener;
import java.util.ArrayList;
import java.util.List;
public class P25P1AudioModule extends ImbeAudioModule
{
@@ -38,7 +40,7 @@ public class P25P1AudioModule extends ImbeAudioModule
private SquelchStateListener mSquelchStateListener = new SquelchStateListener();
private NonClippingGain mGain = new NonClippingGain(5.0f, 0.95f);
private LDU1Message mCachedLDU1Message = null;
private List<LDUMessage> mCachedLDUMessages = new ArrayList<>();
public P25P1AudioModule(UserPreferences userPreferences, AliasList aliasList)
{
@@ -81,37 +83,46 @@ public class P25P1AudioModule extends ImbeAudioModule
{
if(mEncryptedCallStateEstablished)
{
if(message instanceof LDUMessage)
if(message instanceof LDUMessage ldu)
{
processAudio((LDUMessage)message);
processAudio(ldu);
}
}
else
{
if(message instanceof HDUMessage)
if(message instanceof HDUMessage hdu && hdu.isValid())
{
mEncryptedCallStateEstablished = true;
mEncryptedCall = ((HDUMessage)message).getHeaderData().isEncryptedAudio();
mEncryptedCall = hdu.getHeaderData().isEncryptedAudio();
}
else if(message instanceof LDU1Message)
else if(message instanceof LDU1Message ldu1)
{
//When we receive an LDU1 message without first receiving the HDU message, cache the LDU1 Message
//until we can determine the encrypted call state from the next LDU2 message
mCachedLDU1Message = (LDU1Message)message;
mCachedLDUMessages.add(ldu1);
}
else if(message instanceof LDU2Message)
else if(message instanceof LDU2Message ldu2)
{
mEncryptedCallStateEstablished = true;
LDU2Message ldu2 = (LDU2Message)message;
mEncryptedCall = ldu2.getEncryptionSyncParameters().isEncryptedAudio();
if(mCachedLDU1Message != null)
if(ldu2.getEncryptionSyncParameters().isValid())
{
processAudio(mCachedLDU1Message);
mCachedLDU1Message = null;
mEncryptedCallStateEstablished = true;
mEncryptedCall = ldu2.getEncryptionSyncParameters().isEncryptedAudio();
}
processAudio(ldu2);
if(mEncryptedCallStateEstablished)
{
for(LDUMessage cachedLdu : mCachedLDUMessages)
{
processAudio(cachedLdu);
}
mCachedLDUMessages.clear();
processAudio(ldu2);
}
else
{
mCachedLDUMessages.add(ldu2);
}
}
}
}
@@ -152,7 +163,7 @@ public class P25P1AudioModule extends ImbeAudioModule
closeAudioSegment();
mEncryptedCallStateEstablished = false;
mEncryptedCall = false;
mCachedLDU1Message = null;
mCachedLDUMessages.clear();
}
}
}

13
src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderState.java
View File

@@ -60,7 +60,6 @@ import io.github.dsheirer.module.decode.p25.phase1.message.IFrequencyBand;
import io.github.dsheirer.module.decode.p25.phase1.message.P25P1Message;
import io.github.dsheirer.module.decode.p25.phase1.message.hdu.HDUMessage;
import io.github.dsheirer.module.decode.p25.phase1.message.hdu.HeaderData;
import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlOpcode;
import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
import io.github.dsheirer.module.decode.p25.phase1.message.lc.l3harris.LCHarrisReturnToControlChannel;
import io.github.dsheirer.module.decode.p25.phase1.message.lc.motorola.LCMotorolaEmergencyAlarmActivation;
@@ -891,15 +890,9 @@ public class P25P1DecoderState extends DecoderState implements IChannelEventList
if(lcw != null && lcw.isValid())
{
//Send an ACTIVE decoder state event for everything except the CALL TERMINATION opcode which is
//handled by the processLC() method.
if(lcw.getOpcode() != LinkControlOpcode.CALL_TERMINATION_OR_CANCELLATION)
{
//Set the state to ACTIVE while the call continues in hangtime. The processLC() method will signal
// the channel teardown.
broadcast(new DecoderStateEvent(this, Event.DECODE, State.ACTIVE));
}
//Set the state to ACTIVE while the call continues in hangtime. The processLC() method will signal
// the channel teardown when that happens.
broadcast(new DecoderStateEvent(this, Event.DECODE, State.ACTIVE));
processLC(lcw, message.getTimestamp(), true);
}
}

4
src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/hdu/HDUMessage.java
View File

@@ -184,7 +184,11 @@ public class HDUMessage extends P25P1Message
if(irrecoverableErrors)
{
//Set the header data as invalid
mHeaderData.setValid(false);
//Est the whole HDU message as invalid.
setValid(false);
}
else
{