ua1zbe
/
dsd-fme-01.09.2024
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

P25p1 -- Fix Bad Copy/Paste Job in LDU1/LDU2;

This commit is contained in:
lwvmobile 2023-11-02 12:02:11 -04:00
parent 3297bd1e9e
commit f32d18a5a3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/p25p1_ldu1.c
View File

@ -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");

4
src/p25p1_ldu2.c
View File

@ -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");