From d2f4c1ddd9689cb0afd56e834a66dbb732d50403 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Wed, 23 Apr 2025 00:03:58 -0400 Subject: [PATCH] Fix Current Warnings Regarding #287; --- src/dmr_block.c | 6 +++--- src/dmr_pdu.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dmr_block.c b/src/dmr_block.c index f646fbc..9fab993 100644 --- a/src/dmr_block.c +++ b/src/dmr_block.c @@ -1054,7 +1054,7 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte fprintf (stderr, "%s", KNRM); char enc_str[200]; memset (enc_str, 200, sizeof(enc_str)); - sprintf (enc_str, "DATA TGT: %d; SRC: %d; Encrypted PDU;", state->dmr_lrrp_source[slot], state->dmr_lrrp_target[slot]); + sprintf (enc_str, "DATA TGT: %lld; SRC: %lld; Encrypted PDU;", state->dmr_lrrp_source[slot], state->dmr_lrrp_target[slot]); watchdog_event_datacall (opts, state, state->dmr_lrrp_source[slot], state->dmr_lrrp_target[slot], enc_str, slot); } else if (CRCCorrect || opts->aggressive_framesync == 0) @@ -1115,7 +1115,7 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte if (mnis_type != 0x11) { char mnis_str[200]; memset (mnis_str, 200, sizeof(mnis_str)); - sprintf (mnis_str, "MNIS TGT: %d; SRC: %d;", state->dmr_lrrp_source[slot], state->dmr_lrrp_target[slot]); + sprintf (mnis_str, "MNIS TGT: %lld; SRC: %lld;", state->dmr_lrrp_source[slot], state->dmr_lrrp_target[slot]); watchdog_event_datacall (opts, state, state->dmr_lrrp_source[slot], state->dmr_lrrp_target[slot], mnis_str, slot); } @@ -1123,7 +1123,7 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte else { char unk_str[200]; memset (unk_str, 200, sizeof(unk_str)); - sprintf (unk_str, "DATA TGT: %d; SRC: %d; Unknown PDU Format;", state->dmr_lrrp_source[slot], state->dmr_lrrp_target[slot]); + sprintf (unk_str, "DATA TGT: %lld; SRC: %lld; Unknown PDU Format;", state->dmr_lrrp_source[slot], state->dmr_lrrp_target[slot]); watchdog_event_datacall (opts, state, state->dmr_lrrp_source[slot], state->dmr_lrrp_target[slot], unk_str, slot); } } diff --git a/src/dmr_pdu.c b/src/dmr_pdu.c index c8140a1..7853324 100644 --- a/src/dmr_pdu.c +++ b/src/dmr_pdu.c @@ -489,7 +489,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; DST: %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:%d; DST: %d.%d.%d.%d:%d; 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);