Disable Debug Catch All UTF8 Decode on unknown PDU types;

This commit is contained in:
lwvmobile
2025-03-13 14:55:08 -04:00
parent 9f063cb4da
commit 9f59729fb1
2 changed files with 12 additions and 12 deletions

View File

@@ -461,9 +461,9 @@ 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); 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;"); fprintf (stderr, "Unknown UDP Port;");
if (len > 28) // if (len > 28) //default catch all (debug only)
utf8_to_text(state, 0, len-28, input+28); // utf8_to_text(state, 0, len-28, input+28);
else utf8_to_text(state, 0, len, input+28); // else utf8_to_text(state, 0, len, input+28);
} }
} }
@@ -472,9 +472,9 @@ 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); sprintf (state->dmr_lrrp_gps[slot], " IP Call SRC: %d; DST: %d; Protocol: %d;", src24, dst24, prot);
fprintf(stderr, "Unknown IP Protocol: %02X;", prot); fprintf(stderr, "Unknown IP Protocol: %02X;", prot);
if (len > 28) // if (len > 28) //default catch all (debug only)
utf8_to_text(state, 0, len-28, input+28); // utf8_to_text(state, 0, len-28, input+28);
else utf8_to_text(state, 0, len, input+28); // else utf8_to_text(state, 0, len, input+28);
} }
} }

View File

@@ -254,12 +254,12 @@ void p25_decode_pdu_data(dsd_opts * opts, dsd_state * state, uint8_t * input, in
else 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 utf8_to_text(state, 0, len-ptr, input+ptr); //TODO, read initial string, i.e., $GPRMC and properly decode
else //default catch all // else //default catch all (debug only)
{ // {
if (len > ptr) // if (len > ptr)
utf8_to_text(state, 0, len-ptr, input+ptr); // utf8_to_text(state, 0, len-ptr, input+ptr);
else utf8_to_text(state, 0, len, input+ptr); // else utf8_to_text(state, 0, len, input+ptr);
} // }
} }
else else
{ {