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

32
src/main/java/io/github/dsheirer/gui/viewer/MessagePackageViewer.java
View File

@@ -22,6 +22,8 @@ package io.github.dsheirer.gui.viewer;
import io.github.dsheirer.channel.state.DecoderStateEvent;
import io.github.dsheirer.module.decode.event.DecodeEventSnapshot;
import javafx.scene.control.Label;
import javafx.scene.control.Tab;
import javafx.scene.control.TabPane;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.control.cell.PropertyValueFactory;
@@ -38,6 +40,7 @@ public class MessagePackageViewer extends VBox
private TableView<DecoderStateEvent> mDecoderStateEventTableView;
private TableView<DecodeEventSnapshot> mDecodeEventTableView;
private IdentifierCollectionViewer mIdentifierCollectionViewer;
private IdentifierCollectionViewer mAudioSegmentIdCollectionViewer;
private ChannelStartProcessingRequestViewer mChannelStartProcessingRequestViewer;
/**
@@ -63,8 +66,14 @@ public class MessagePackageViewer extends VBox
GridPane.setHgrow(getDecodeEventTableView(), Priority.ALWAYS);
gridPane.add(getDecodeEventTableView(), 1, 2);
gridPane.add(new Label("Channel Start Processing Request"), 0, 3);
gridPane.add(getChannelStartProcessingRequestViewer(), 0, 4);
TabPane tabPane = new TabPane();
Tab startTab = new Tab("Channel Start Processing Request");
startTab.setContent(getChannelStartProcessingRequestViewer());
Tab audioTab = new Tab("Audio Segment");
audioTab.setContent(getAudioSegmentIdCollectionViewer());
tabPane.getTabs().addAll(audioTab, startTab);
gridPane.add(tabPane, 0, 4);
getIdentifierCollectionViewer().setPrefHeight(120);
gridPane.add(new Label("Selected Decode Event Identifiers"), 1, 3);
@@ -96,6 +105,15 @@ public class MessagePackageViewer extends VBox
{
getDecodeEventTableView().getSelectionModel().select(0);
}
if(messagePackage.getAudioSegment() != null)
{
getAudioSegmentIdCollectionViewer().set(messagePackage.getAudioSegment().getIdentifierCollection());
}
else
{
getAudioSegmentIdCollectionViewer().set(null);
}
}
}
@@ -109,6 +127,16 @@ public class MessagePackageViewer extends VBox
return mIdentifierCollectionViewer;
}
private IdentifierCollectionViewer getAudioSegmentIdCollectionViewer()
{
if(mAudioSegmentIdCollectionViewer == null)
{
mAudioSegmentIdCollectionViewer = new IdentifierCollectionViewer();
}
return mAudioSegmentIdCollectionViewer;
}
private Label getMessageLabel()
{
if(mMessageLabel == null)