diff --git a/src/dmr_csbk.c b/src/dmr_csbk.c index f3a56f5..9be7fa5 100644 --- a/src/dmr_csbk.c +++ b/src/dmr_csbk.c @@ -613,7 +613,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8 if (p_kind == 0) fprintf (stderr, " Disable Target PTT (DIS_PTT)"); if (p_kind == 1) fprintf (stderr, " Enable Target PTT (EN_PTT)"); - if (p_kind == 2) fprintf (stderr, " Call (ILLEGALLY_PARKED)"); + if (p_kind == 2) fprintf (stderr, " Call Hangtime (ILLEGALLY_PARKED)"); if (p_kind == 3) fprintf (stderr, " Enable Target MS PTT (EN_PTT_ONE_MS)"); fprintf (stderr, "\n"); @@ -629,11 +629,13 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8 { if (state->currentslot == 0) state->dmrburstL = 1; else state->dmrburstR = 1; + state->gi[state->currentslot] = 0; } if (!gi && opts->trunk_tune_private_calls == 1) { if (state->currentslot == 0) state->dmrburstL = 1; else state->dmrburstR = 1; + state->gi[state->currentslot] = 1; } } diff --git a/src/dmr_pdu.c b/src/dmr_pdu.c index 2c11a43..ce67145 100644 --- a/src/dmr_pdu.c +++ b/src/dmr_pdu.c @@ -119,7 +119,7 @@ void dmr_sd_pdu (dsd_opts * opts, dsd_state * state, uint16_t len, uint8_t * DMR else { if (len >= (127*18)) len = 127*18; //sanity check of sorts, prevent extra long line print outs in the console - utf8_to_text(state, 1, len, DMR_PDU); //generic catch-all to see if anything relevant is there + utf8_to_text(state, 0, len, DMR_PDU); //generic catch-all to see if anything relevant is there // utf16_to_text(state, 0, len, DMR_PDU); //generic catch-all to see if anything relevant is there } @@ -493,7 +493,7 @@ void decode_ip_pdu (dsd_opts * opts, dsd_state * state, uint16_t len, uint8_t * } else { - sprintf (state->dmr_lrrp_gps[slot], "IP SRC: %d.%d.%d.%d:%d; DST: %d.%d.%d.%d:%d;", input[12], input[13], input[14], input[15], port1, input[16], input[17], input[18], input[19], port2); + sprintf (state->dmr_lrrp_gps[slot], "IP SRC: %d.%d.%d.%d:%d; DST: %d.%d.%d.%d:%d; Unknown UDP Port;", input[12], input[13], input[14], input[15], port1, input[16], input[17], input[18], input[19], port2); fprintf (stderr, "Unknown UDP Port;"); // if (len > 28) //default catch all (debug only) // utf8_to_text(state, 0, len-28, input+28); @@ -504,7 +504,7 @@ void decode_ip_pdu (dsd_opts * opts, dsd_state * state, uint16_t len, uint8_t * else { - sprintf (state->dmr_lrrp_gps[slot], "IP SRC: %d.%d.%d.%d; DST: %d.%d.%d.%d; Protocol: %d;", input[12], input[13], input[14], input[15], input[16], input[17], input[18], input[19], prot); + sprintf (state->dmr_lrrp_gps[slot], "IP SRC: %d.%d.%d.%d; DST: %d.%d.%d.%d; Unknown IP Protocol: %d; ", input[12], input[13], input[14], input[15], input[16], input[17], input[18], input[19], prot); fprintf(stderr, "Unknown IP Protocol: %02X;", prot); // if (len > 28) //default catch all (debug only) // utf8_to_text(state, 0, len-28, input+28);