From f32d18a5a3f6aa1c6a36ebaed33219ca89a9a816 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Thu, 2 Nov 2023 12:02:11 -0400 Subject: [PATCH] P25p1 -- Fix Bad Copy/Paste Job in LDU1/LDU2; --- src/p25p1_ldu1.c | 4 ++-- src/p25p1_ldu2.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/p25p1_ldu1.c b/src/p25p1_ldu1.c index 8cb00c4..7c784ed 100644 --- a/src/p25p1_ldu1.c +++ b/src/p25p1_ldu1.c @@ -550,7 +550,7 @@ processLDU1 (dsd_opts* opts, dsd_state* state) if (wr == 0) { state->group_array[state->group_tally].groupNumber = tsrc; - if (state->nxdn_cipher_type != 0 && opts->trunk_tune_enc_calls == 0 && state->R == 0) + if (state->payload_algid != 0x80 && opts->trunk_tune_enc_calls == 0 && state->R == 0) sprintf (state->group_array[state->group_tally].groupMode, "%s", "DE"); else sprintf (state->group_array[state->group_tally].groupMode, "%s", "D"); @@ -562,7 +562,7 @@ processLDU1 (dsd_opts* opts, dsd_state* state) else if (strcmp(str, state->group_array[z].groupName) != 0) { state->group_array[z].groupNumber = tsrc; - if (state->nxdn_cipher_type != 0 && opts->trunk_tune_enc_calls == 0 && state->R == 0) + if (state->payload_algid != 0x80 && opts->trunk_tune_enc_calls == 0 && state->R == 0) sprintf (state->group_array[state->group_tally].groupMode, "%s", "DE"); else sprintf (state->group_array[state->group_tally].groupMode, "%s", "D"); diff --git a/src/p25p1_ldu2.c b/src/p25p1_ldu2.c index eae448e..52c01f7 100644 --- a/src/p25p1_ldu2.c +++ b/src/p25p1_ldu2.c @@ -584,7 +584,7 @@ processLDU2 (dsd_opts * opts, dsd_state * state) if (wr == 0) { state->group_array[state->group_tally].groupNumber = tsrc; - if (state->nxdn_cipher_type != 0 && opts->trunk_tune_enc_calls == 0 && state->R == 0) + if (state->payload_algid != 0x80 && opts->trunk_tune_enc_calls == 0 && state->R == 0) sprintf (state->group_array[state->group_tally].groupMode, "%s", "DE"); else sprintf (state->group_array[state->group_tally].groupMode, "%s", "D"); @@ -596,7 +596,7 @@ processLDU2 (dsd_opts * opts, dsd_state * state) else if (strcmp(str, state->group_array[z].groupName) != 0) { state->group_array[z].groupNumber = tsrc; - if (state->nxdn_cipher_type != 0 && opts->trunk_tune_enc_calls == 0 && state->R == 0) + if (state->payload_algid != 0x80 && opts->trunk_tune_enc_calls == 0 && state->R == 0) sprintf (state->group_array[state->group_tally].groupMode, "%s", "DE"); else sprintf (state->group_array[state->group_tally].groupMode, "%s", "D");