PDU: Misc Catch All UTF8 Decodes on Unknown Format Types;

This commit is contained in:
lwvmobile
2025-03-13 13:58:09 -04:00
parent 871bdf5a82
commit f593453328
2 changed files with 5 additions and 1 deletions

View File

@@ -461,6 +461,7 @@ void decode_ip_pdu (dsd_opts * opts, dsd_state * state, uint16_t len, uint8_t *
{
sprintf (state->dmr_lrrp_gps[slot], " IP Call SRC: %d; Port; %d; DST: %d; Port: %d;", src24, port1, dst24, port2);
fprintf (stderr, "Unknown UDP Port;");
utf8_to_text(state, 0, len-28, input+28);
}
}
@@ -469,6 +470,7 @@ void decode_ip_pdu (dsd_opts * opts, dsd_state * state, uint16_t len, uint8_t *
{
sprintf (state->dmr_lrrp_gps[slot], " IP Call SRC: %d; DST: %d; Protocol: %d;", src24, dst24, prot);
fprintf(stderr, "Unknown IP Protocol: %02X;", prot);
utf8_to_text(state, 0, len-28, input+28);
}
}

View File

@@ -251,8 +251,10 @@ void p25_decode_pdu_data(dsd_opts * opts, dsd_state * state, uint8_t * input, in
if (sap == 0 || sap == 4) //User Data or Packet Data (both are UDP typically, same format dmr UDP/IP data)
decode_ip_pdu (opts, state, len, input+ptr);
if (sap == 48) //Tier 1 Location Service (or does it depend on the io bit?)
else if (sap == 48) //Tier 1 Location Service (or does it depend on the io bit?)
utf8_to_text(state, 0, len-ptr, input+ptr); //TODO, read initial string, i.e., $GPRMC and properly decode
else utf8_to_text(state, 0, len-ptr, input+ptr); //default catch all
}
else
{