From c87ad08371edddbf6d8933c6091d737425e6a4c3 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Fri, 7 Jun 2024 22:20:36 -0400 Subject: [PATCH] M17: Fix META Decode when not IV and Decode META Text as UTF-8 and Not RAW; --- src/m17.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/m17.c b/src/m17.c index a91fd71..850383b 100644 --- a/src/m17.c +++ b/src/m17.c @@ -191,7 +191,7 @@ void M17decodeLSF(dsd_state * state) if (lsf_et == 0 && state->m17_meta[0] != 0) //not sure if this applies universally, or just to text data byte 0 for null data { uint8_t meta[15]; meta[0] = lsf_es + 90; //add identifier for pkt decoder - for (i = 0; i < 14; i++) meta[i+1] = state->m17_lsf[i]; + for (i = 0; i < 14; i++) meta[i+1] = state->m17_meta[i]; fprintf (stderr, "\n "); //Note: We don't have opts here, so in the future, if we need it, we will need to pass it here decodeM17PKT (NULL, state, meta, 15); //decode META @@ -3225,8 +3225,8 @@ void decodeM17PKT(dsd_opts * opts, dsd_state * state, uint8_t * input, int len) else fprintf (stderr, " Reserved Station Type: %02X;", station_type); } - //Any Other Text Based - else if (protocol >= 90) + //1600 Arbitrary Data, or META Text Message + else if (protocol == 90 || protocol == 99) { fprintf (stderr, " "); for (i = 1; i < len; i++)