P25 - R34 MPDU Format WIP;

This commit is contained in:
lwvmobile
2023-11-23 20:48:53 -05:00
parent 2d2af754c5
commit 5d26333676
3 changed files with 745 additions and 533 deletions

View File

@@ -585,7 +585,7 @@ processFrame (dsd_opts * opts, dsd_state * state)
if (opts->errorbars == 1) if (opts->errorbars == 1)
{ {
printFrameInfo (opts, state); printFrameInfo (opts, state);
fprintf (stderr," MBF\n"); //multi block format PDU fprintf (stderr," MPDU\n"); //multi block format PDU
} }
if (opts->mbe_out_dir[0] != 0) if (opts->mbe_out_dir[0] != 0)
{ {
@@ -597,7 +597,7 @@ processFrame (dsd_opts * opts, dsd_state * state)
resumeScan (opts, state); resumeScan (opts, state);
} }
state->lastp25type = 4; state->lastp25type = 4;
sprintf (state->fsubtype, " MBF "); sprintf (state->fsubtype, " MPDU ");
processMPDU(opts, state); processMPDU(opts, state);
} }

View File

@@ -389,6 +389,19 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
fprintf (stderr, " MFID90 (Moto) Talker EOT; SRC: %d", src); fprintf (stderr, " MFID90 (Moto) Talker EOT; SRC: %d", src);
} }
//observed format value on SNDCP data channels
else if (lc_format == 0x58)
{
//will need to look for the appropriate values to fill in here from the manual,
//MFID values seem to look like a counter of some sort? offset maybe? or block number?
fprintf (stderr, " SNDCP Data Channel LCW %02X", lc_format);
}
//observed format value on SNDCP data channels
else if (lc_format == 0x63) //based on the SAP of the same value found in BAHA-A (unconfirmed, but may make sense?)
fprintf (stderr, " Protected Format LCW %02X", lc_format);
//not a duplicate, this one will print if not MFID 0 or 1 //not a duplicate, this one will print if not MFID 0 or 1
else else
{ {

View File

@@ -8,6 +8,47 @@
#include "dsd.h" #include "dsd.h"
void processSAP(uint8_t SAP)
{
if (SAP == 0) fprintf (stderr, " User Data;");
else if (SAP == 1) fprintf (stderr, " Encrypted User Data;");
else if (SAP == 2) fprintf (stderr, " Circuit Data;");
else if (SAP == 3) fprintf (stderr, " Circuit Data Control;");
else if (SAP == 4) fprintf (stderr, " Packet Data;");
else if (SAP == 5) fprintf (stderr, " Address Resolution Protocol;");
else if (SAP == 6) fprintf (stderr, " SNDCP Packet Data Control;");
else if (SAP == 31) fprintf (stderr, " Extended Address;");
else if (SAP == 32) fprintf (stderr, " Registration and Authorization;");
else if (SAP == 33) fprintf (stderr, " Channel Reassignment;");
else if (SAP == 34) fprintf (stderr, " System Configuration;");
else if (SAP == 35) fprintf (stderr, " Mobile Radio Loopback;");
else if (SAP == 36) fprintf (stderr, " Mobile Radio Statistics;");
else if (SAP == 37) fprintf (stderr, " Mobile Radio Out of Service;");
else if (SAP == 38) fprintf (stderr, " Mobile Radio Paging;");
else if (SAP == 39) fprintf (stderr, " Mobile Radio Configuration;");
else if (SAP == 40) fprintf (stderr, " Unencrypted Key Management;");
else if (SAP == 41) fprintf (stderr, " Encrypted Key Management;");
else if (SAP == 61) fprintf (stderr, " Trunking Control;");
else if (SAP == 63) fprintf (stderr, " Encrypted Trunking Control;");
//speculative values below based on observation and guess work
//MPDUs immediately following this seems to be encrypted based on the padding octets being non-zeroes (or could just be a decoder failure)
else if (SAP == 8) fprintf (stderr, " Encrytion Parameters?;");
//observed values, but no idea, they all seem to have the same octet values (address of some sort?)
else if (SAP == 0x9) fprintf (stderr, " Unknown SAP;");
else if (SAP == 0xA) fprintf (stderr, " Unknown SAP;");
else if (SAP == 0xB) fprintf (stderr, " Unknown SAP;");
else if (SAP == 0xC) fprintf (stderr, " Unknown SAP;");
else if (SAP == 0xE) fprintf (stderr, " Unknown SAP;");
else if (SAP == 0x2E) fprintf (stderr, " Unknown SAP;");
//catch all for everything else
else fprintf (stderr, " Unknown SAP;");
}
static uint32_t crc32mbf(uint8_t buf[], int len) static uint32_t crc32mbf(uint8_t buf[], int len)
{ {
uint32_t g = 0x04c11db7; uint32_t g = 0x04c11db7;
@@ -46,26 +87,33 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
uint8_t tsbk_byte[12]; //12 byte return from p25_12 uint8_t tsbk_byte[12]; //12 byte return from p25_12
memset (tsbk_byte, 0, sizeof(tsbk_byte)); memset (tsbk_byte, 0, sizeof(tsbk_byte));
unsigned long long int PDU[24]; uint8_t r34byte_b[18];
memset (r34byte_b, 0, sizeof(r34byte_b));
uint8_t r34bytes[18*10]; //18 octets at 10 blocks (unsure of maximum needed, going with 10?)
memset (r34bytes, 0, sizeof(r34bytes));
int r34 = 0;
//these expansions may be overkill, will need to look at them
//and find optimal values for them at a later time
unsigned long long int PDU[24*10];
memset (PDU, 0, sizeof(PDU)); memset (PDU, 0, sizeof(PDU));
int tsbk_decoded_bits[190]; //decoded bits from tsbk_bytes for sending to crc16_lb_bridge int tsbk_decoded_bits[190*10]; //decoded bits from tsbk_bytes for sending to crc16_lb_bridge
memset (tsbk_decoded_bits, 0, sizeof(tsbk_decoded_bits)); memset (tsbk_decoded_bits, 0, sizeof(tsbk_decoded_bits));
uint8_t mpdu_decoded_bits[288]; uint8_t mpdu_decoded_bits[288*20];
memset (mpdu_decoded_bits, 0, sizeof(mpdu_decoded_bits)); memset (mpdu_decoded_bits, 0, sizeof(mpdu_decoded_bits));
uint8_t mpdu_crc_bits[196]; uint8_t mpdu_crc_bits[196*20];
memset (mpdu_crc_bits, 0, sizeof(mpdu_crc_bits)); memset (mpdu_crc_bits, 0, sizeof(mpdu_crc_bits));
uint8_t mpdu_crc_bytes[24]; uint8_t mpdu_crc_bytes[24*10];
memset (mpdu_crc_bytes, 0, sizeof(mpdu_crc_bytes)); memset (mpdu_crc_bytes, 0, sizeof(mpdu_crc_bytes));
int flushing_bits[196]; //for flushing the trellis state machine
memset (flushing_bits, 0, sizeof(flushing_bits));
int i, j, k, x; int i, j, k, x;
int ec[3]; //error value returned from p25_12 int ec[10]; //error value returned from p25_12 or 34
int err[2]; //error value returned from ccrc16 or crc32 int err[2]; //error value returned from ccrc16 or crc32
memset (ec, -2, sizeof(ec)); memset (ec, -2, sizeof(ec));
memset (err, -2, sizeof(err)); memset (err, -2, sizeof(err));
@@ -76,18 +124,29 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
uint8_t mpdu_byte[36]; uint8_t mpdu_byte[36];
memset (mpdu_byte, 0, sizeof(mpdu_byte)); memset (mpdu_byte, 0, sizeof(mpdu_byte));
uint8_t an = 0;
uint8_t io = 0; uint8_t io = 0;
uint8_t fmt = 0; uint8_t fmt = 0;
uint8_t sap = 0; uint8_t sap = 0;
uint8_t blks = 0; uint8_t blks = 0;
uint8_t opcode = 0; uint8_t opcode = 0;
uint32_t target1 = 0;
uint32_t target2 = 0; //enchanced addressing value
uint8_t fmf = 0;
uint8_t pad = 0;
uint8_t ns = 0;
uint8_t fsnf = 0;
uint8_t offset = 0;
int end = 3; //ending value for data gathering repititions
//CRC32 //CRC32
uint32_t CRCComputed = 0; uint32_t CRCComputed = 0;
uint32_t CRCExtracted = 0; uint32_t CRCExtracted = 0;
//collect three reps of 101 dibits (98 valid dibits with status dibits interlaced) //collect x-len reps of 101 dibits (98 valid dibits with status dibits interlaced)
for (j = 0; j < 3; j++) for (j = 0; j < end; j++)
{ {
k = 0; k = 0;
for (i = 0; i < 101; i++) for (i = 0; i < 101; i++)
@@ -110,10 +169,19 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
} }
//send tsbkbit to p25_12 and return tsbk_byte //send header to p25_12 and return tsbk_byte
if (j == 0) ec[j] = p25_12 (tsbk_dibit, tsbk_byte); if (j == 0) ec[j] = p25_12 (tsbk_dibit, tsbk_byte);
//TODO: 3/4 Rate Decodes -- should be able to use the same decoder as DMR 34 rate
//else if (rate34) //look at the header now and determine whether or not to
//decode using 34 or 12 rate decoders
else if (r34)
{
ec[j] = dmr_34 (tsbk_dibit, r34byte_b);
//shuffle 34 rate data into array
if (j != 0) //should never happen, but just in case
memcpy (r34bytes+((j-1)*18), r34byte_b, sizeof(r34byte_b));
}
else ec[j] = p25_12 (tsbk_dibit, tsbk_byte); else ec[j] = p25_12 (tsbk_dibit, tsbk_byte);
//too many bit manipulations! //too many bit manipulations!
@@ -145,16 +213,43 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
k++; k++;
} }
tsbk_byte[i] = byte; tsbk_byte[i] = byte;
mpdu_byte[i+(j*12)] = byte; //add to completed MBF format bytes mpdu_byte[i+(j*12)] = byte; //add to completed MBF format 12 rate bytes
}
} }
//check header data to see if this is a 12 rate trunking setup, or
//34 rate packet data unit
if (j == 0 && err[0] == 0)
{
an = (mpdu_byte[0] >> 6) & 0x1;
io = (mpdu_byte[0] >> 5) & 0x1; io = (mpdu_byte[0] >> 5) & 0x1;
fmt = mpdu_byte[0] & 0x1F; fmt = mpdu_byte[0] & 0x1F;
sap = mpdu_byte[1] & 0x3F; sap = mpdu_byte[1] & 0x3F;
blks = mpdu_byte[6] & 0x7F; blks = mpdu_byte[6] & 0x7F;
MFID = mpdu_byte[2]; MFID = mpdu_byte[2];
target1 = (mpdu_byte[3] << 16) | (mpdu_byte[4] << 8) | mpdu_byte[5]; //LLID, inbound is the source, outbound is the target
target2 = (mpdu_byte[6] << 16) | (mpdu_byte[7] << 8) | mpdu_byte[8]; //unknown which octets convey the secondary address value
fmf = (mpdu_byte[6] >> 7) & 0x1;
pad = mpdu_byte[7] & 0x1F;
ns = (mpdu_byte[8] >> 4) & 0x7;
fsnf = mpdu_byte[8] & 0xF;
offset = mpdu_byte[9] & 0x3F;
if (an == 1 && fmt == 0b10110) //confirmed data packet header block
r34 = 1;
//set end value to number of blocks + 1 (block gathering for variable len)
end = blks + 1;
//sanity check
if (end > 10) end = 10; //TODO: Increase storage for handling these (unsure of upper limit)
//old method for figuring this out, still unclear in the manual which is considered 12 rate, and which are 34 rate
// if ((sap == 0x3D) && ((fmt == 0x17) || (fmt == 0x15))) ; //MBT format 12 rate
// else r34 = 1; //set flag to decode as 34 rate data PDU (confirmed)
}
}
//group list mode so we can look and see if we need to block tuning any groups, etc //group list mode so we can look and see if we need to block tuning any groups, etc
char mode[8]; //allow, block, digital, enc, etc char mode[8]; //allow, block, digital, enc, etc
@@ -164,20 +259,40 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
//comparison below will look for an 'A' to write to mode if it is allowed //comparison below will look for an 'A' to write to mode if it is allowed
if (opts->trunk_use_allow_list == 1) sprintf (mode, "%s", "B"); if (opts->trunk_use_allow_list == 1) sprintf (mode, "%s", "B");
if (err[0] == 0)
{
fprintf (stderr, "%s",KGRN); fprintf (stderr, "%s",KGRN);
fprintf (stderr, " P25 MBF FMT: %02X SAP: %02X", fmt, sap); fprintf (stderr, " P25 Data - AN: %d; IO: %d; FMT: %02X; SAP: 0x%02X;", an, io, fmt, sap);
fprintf (stderr, " Blocks: %02X MFID: %02X", blks, MFID); processSAP(sap); //decode SAP to see what kind of data we are dealing with
fprintf (stderr, "\n F: %d; Blocks: %02X; Pad: %d; NS: %d; FSNF: %d; Offset: %d; MFID: %02X;", fmf, blks, pad, ns, fsnf, offset, MFID);
if (io == 1 && sap != 61 && sap != 63) //destination address if IO bit set
fprintf (stderr, " Target: %d;", target1);
// if (sap == 31) //still unclear on which octets or SAP convey this address, this sap is for extended address (same thing?)
// fprintf (stderr, " Source: %d;", target2); //unsure if this is a source address, manual just says a second address
UNUSED(target2);
//TODO: Print to Data Call String for Ncurses Terminal
}
else //crc error, so we can't validate information as accurate
{
fprintf (stderr, "%s",KRED);
fprintf (stderr, " P25 Data Header CRC Error");
fprintf (stderr, "%s",KNRM);
end = 1; //go ahead and end after this loop
}
//trunking blocks //trunking blocks
if ((sap == 0x3D) && ((fmt == 0x17) || (fmt == 0x15))) if ((sap == 0x3D) && ((fmt == 0x17) || (fmt == 0x15)))
{ {
if (fmt == 0x15) fprintf (stderr, " UNC"); if (fmt == 0x15) fprintf (stderr, " UNC");
else fprintf (stderr, " ALT"); else fprintf (stderr, " ALT");
fprintf (stderr, " MBT"); //find way to convert to vPDU or TSBK format? fprintf (stderr, " MBT");
if (fmt == 0x17) opcode = mpdu_byte[7] & 0x3F; //alt MBT if (fmt == 0x17) opcode = mpdu_byte[7] & 0x3F; //alt MBT
else opcode = mpdu_byte[12] & 0x3F; //unconf MBT else opcode = mpdu_byte[12] & 0x3F; //unconf MBT
fprintf (stderr, " - OP: %02X", opcode); fprintf (stderr, " - OP: %02X", opcode);
}
//CRC32 is now working! //CRC32 is now working!
for (i = 0; i < 196; i++) mpdu_crc_bits[i] = mpdu_decoded_bits[i+96]; for (i = 0; i < 196; i++) mpdu_crc_bits[i] = mpdu_decoded_bits[i+96];
@@ -775,7 +890,7 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
if (opts->payload == 1) if (opts->payload == 1)
{ {
fprintf (stderr, "%s",KCYN); fprintf (stderr, "%s",KCYN);
fprintf (stderr, "\n P25 MBF Payload \n "); fprintf (stderr, "\n P25 MBT Payload \n ");
for (i = 0; i < 36; i++) for (i = 0; i < 36; i++)
{ {
fprintf (stderr, "[%02X]", mpdu_byte[i]); fprintf (stderr, "[%02X]", mpdu_byte[i]);
@@ -805,4 +920,88 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
fprintf (stderr, "%s ", KNRM); fprintf (stderr, "%s ", KNRM);
fprintf (stderr, "\n"); fprintf (stderr, "\n");
} //end trunking block format
else if (r34 == 1 && err[0] == 0) //start 34 rate dump if good header crc
{
//WIP: CRC32 (skip the CRC9, not really needed when you can just do the completed one)
// for (i = 0; i < 196; i++) mpdu_crc_bits[i] = mpdu_decoded_bits[i+96+16];
// for (i = 0; i < 16; i++) mpdu_crc_bytes[i] = mpdu_byte[i+12+2];
// if (blks == 1) //blocks to follow is 1
// {
// CRCExtracted = (uint32_t)ConvertBitIntoBytes(&mpdu_crc_bits[96-32], 32);
// CRCComputed = crc32mbf(mpdu_crc_bytes, 96-32);
// if (CRCComputed == CRCExtracted) err[1] = 0;
// }
// if (blks == 2) //blocks to follow is 2
// {
// CRCExtracted = (uint32_t)ConvertBitIntoBytes(&mpdu_crc_bits[192-32], 32);
// CRCComputed = crc32mbf(mpdu_crc_bytes, 192-32);
// if (CRCComputed == CRCExtracted) err[1] = 0;
// }
//TODO: Combine both of these into one PDU bit set and run CRC on it, etc
//TODO: Handle the Confirmed Data Aspects of this format (CRC9 and DBSN)
//TOOD: Decode some LRRP and/or Text Message Formats, etc
// if (opts->payload == 1)
{
fprintf (stderr, "%s",KCYN);
fprintf (stderr, "\n P25 MPDU Payload \n ");
for (i = 0; i < 12; i++) //header
fprintf (stderr, "[%02X]", mpdu_byte[i]);
fprintf (stderr, " Header \n ");
//variable len printing
for (i = 0; i < 18*blks; i++)
{
if (i == 18 || i == 36 || i == 54 || i == 72 || i == 90)
fprintf (stderr, "\n ");
fprintf (stderr, "[%02X]", r34bytes[i]);
}
// if (err[1] != 0)
// {
// fprintf (stderr, "%s",KRED);
// fprintf (stderr, " (MPDU CRC32 ERR)");
// fprintf (stderr, "%s",KCYN);
// fprintf (stderr, " CRC EXT %08X CMP %08X", CRCExtracted, CRCComputed); //TODO
// }
fprintf (stderr, "\n P25 MPDU ASCII: ");
for (i = 2; i < (18*blks)-4; i++) //skip the first DBSN/CRC9 and Final CRC32
{
if (i == 16 || i == 32 || i == 48 || i == 60 || i == 72)
i += 2; // skip the next DBSN/CRC9 values
if (r34bytes[i] <= 0x7E && r34bytes[i] >=0x20)
{
fprintf (stderr, "%c", r34bytes[i]);
}
else fprintf (stderr, " ");
}
fprintf (stderr, "%s ", KNRM);
fprintf (stderr, "\n");
}
} //end r34
else if (err[0] == 0)
{
//just print the header
// if (opts->payload == 1)
{
fprintf (stderr, "%s",KCYN);
fprintf (stderr, "\n P25 MPDU Header: ");
for (i = 0; i < 12; i++) //header
fprintf (stderr, "[%02X]", mpdu_byte[i]);
fprintf (stderr, "%s",KNRM);
fprintf (stderr, "\n");
}
}
else fprintf (stderr, "\n");
} }