ua1zbe
/
dsd-fme
mirror of https://github.com/lwvmobile/dsd-fme.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More P25p1 MPDU Payload Fixes;

This commit is contained in:
lwvmobile 2024-12-13 15:40:48 -05:00
parent 5752f1b84a
commit e13bd4f323
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/p25p1_mdpu.c
View File

@ -1038,7 +1038,9 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
{ {
fprintf (stderr, "%s",KCYN); fprintf (stderr, "%s",KCYN);
fprintf (stderr, "\n P25 MPDU ASCII: "); fprintf (stderr, "\n P25 MPDU ASCII: ");
for (i = 0; i < mpdu_idx-pad-4; i++) start = 0; //offset for any sort of aux headers
if (sap == 1) start = 13;
for (i = start; i < mpdu_idx-pad-4; i++)
{ {
if (mpdu_byte[i] <= 0x7E && mpdu_byte[i] >=0x20) if (mpdu_byte[i] <= 0x7E && mpdu_byte[i] >=0x20)
fprintf (stderr, "%c", mpdu_byte[i]); fprintf (stderr, "%c", mpdu_byte[i]);
@ -1120,7 +1122,9 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
{ {
fprintf (stderr, "%s",KCYN); fprintf (stderr, "%s",KCYN);
fprintf (stderr, "\n P25 MPDU ASCII: "); fprintf (stderr, "\n P25 MPDU ASCII: ");
for (i = 24; i < (12*(blks+1))-4-pad; i++) start = 0; //offset for any sort of aux headers
if (sap == 1) start = 13;
for (i = start; i < (12*(blks+1))-4-pad; i++)
{ {
if (mpdu_byte[i] <= 0x7E && mpdu_byte[i] >=0x20) if (mpdu_byte[i] <= 0x7E && mpdu_byte[i] >=0x20)
fprintf (stderr, "%c", mpdu_byte[i]); fprintf (stderr, "%c", mpdu_byte[i]);
@ -1137,7 +1141,9 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
fprintf (stderr, "%s", KCYN); fprintf (stderr, "%s", KCYN);
fprintf (stderr, "\n P25 MPDU UTF16: "); fprintf (stderr, "\n P25 MPDU UTF16: ");
uint16_t ch16 = 0; uint16_t ch16 = 0;
for (i = 12; i < (12*blks)-4-pad;) start = 0; //offset for any sort of aux headers
if (sap == 1) start = 13;
for (i = start; i < (12*blks)-4-pad;)
{ {
ch16 = (uint16_t)mpdu_byte[i+0]; ch16 = (uint16_t)mpdu_byte[i+0];
ch16 <<= 8; ch16 <<= 8;