GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-15 10:17:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

P25 -- Fix Alignment; Fix Compiler Warning;

Browse Source
This commit is contained in:
lwvmobile
2023-09-26 08:54:08 -04:00
parent daecac1612
commit 29cd61fdcd
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/p25p1_tsbk.c
View File

@@ -153,14 +153,14 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
fprintf (stderr, " %s",KNRM); fprintf (stderr, " %s",KNRM);
//This seems to follow the same structure as the MFID 90 Group Regroup Add Command //This seems to follow the same structure as the MFID 90 Group Regroup Add Command
//MFID A4 Opcode 1 on TSBK / Opcode 0x41 on vPDU
// P25 PDU Payload #1 [81][A4] [11][0D] [83][4E] [84][2A] [84][EE] -------[39][30]
// MFID A4 Protected: 0 Last Block: 1
//these values do seem to change, but not often, but seem to pair up into 16-bit values //MFID A4 Opcode 1 on TSBK / Opcode 0x41 on vPDU
// P25 PDU Payload #1 [81][A4] [11][0D] [84][2A] [84][EE] [FF][FF] -------[4D][2F] // P25 PDU Payload #1 [81][A4] [11][0D] [83][4E] [84][2A] [84][EE] -------[39][30]
// MFID A4 Protected: 0 Last Block: 1 // MFID A4 Protected: 0 Last Block: 1
//these values do seem to change, but not often, but seem to pair up into 16-bit values
// P25 PDU Payload #1 [81][A4] [11][0D] [84][2A] [84][EE] [FF][FF] -------[4D][2F]
// MFID A4 Protected: 0 Last Block: 1
} }

4
src/p25p2_vpdu.c
View File

@@ -1177,9 +1177,9 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
int res = MAC[3+len_a] >> 6; int res = MAC[3+len_a] >> 6;
if (len > 24) if (len > 24)
len = 24; //should never exceed this len, but just in case it does len = 24; //should never exceed this len, but just in case it does
fprintf (stderr, "\n MFID A4 (Harris); Res: %d; Len: %d; Opcode: %02X; ", res, len, MAC[1+len_a]); fprintf (stderr, "\n MFID A4 (Harris); Res: %d; Len: %d; Opcode: %02llX; ", res, len, MAC[1+len_a]);
for (i = 1; i < len; i++) for (i = 1; i < len; i++)
fprintf (stderr, "%02X", MAC[i+len_a]); //might not be a good idea to run this, or it may overflow fprintf (stderr, "%02llX", MAC[i+len_a]); //might not be a good idea to run this, or it may overflow
} }