From 2392f57d62bf8c927107fe619fa68413545c7a9a Mon Sep 17 00:00:00 2001
From: lwvmobile <lwvmobile@gmail.com>
Date: Tue, 12 Mar 2024 14:20:58 -0400
Subject: [PATCH] M17 - Check Caps and Special CSD Values;

---
 src/dsd_main.c |  7 +++++++
 src/m17.c      | 20 ++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/dsd_main.c b/src/dsd_main.c
index c6c06e5..6240eb7 100644
--- a/src/dsd_main.c
+++ b/src/dsd_main.c
@@ -2982,6 +2982,13 @@ main (int argc, char **argv)
       //read in values
       //string in format of M17:can:src_csd:dst_csd
 
+      //check and capatalize any letters in the CSD
+      for (int i = 0; state.m17dat[i]!='\0'; i++)
+      {
+        if(state.m17dat[i] >= 'a' && state.m17dat[i] <= 'z')
+          state.m17dat[i] = state.m17dat[i] -32;
+      }
+
       fprintf (stderr, "M17 User Data: ");
       char * curr;
       
diff --git a/src/m17.c b/src/m17.c
index 611c0f1..ab5f89e 100644
--- a/src/m17.c
+++ b/src/m17.c
@@ -797,7 +797,7 @@ void processM17LSF(dsd_opts * opts, dsd_state * state)
     M17decodeLSF(state);
 
   else if (opts->aggressive_framesync == 0)
-    M17decodeLSF(state);
+      M17decodeLSF(state);
 
   if (opts->payload == 1)
   {
@@ -893,7 +893,7 @@ void processM17LSF_debug(dsd_opts * opts, dsd_state * state, uint8_t * m17_depun
   if (crc_err == 0)
     M17decodeLSF(state);
   else if (opts->aggressive_framesync == 0)
-    M17decodeLSF(state);
+      M17decodeLSF(state);
 
   if (opts->payload == 1)
   {
@@ -994,7 +994,7 @@ void processM17LSF_debug2(dsd_opts * opts, dsd_state * state, uint8_t * m17_rnd_
   if (crc_err == 0)
     M17decodeLSF(state);
   else if (opts->aggressive_framesync == 0)
-    M17decodeLSF(state);
+      M17decodeLSF(state);
 
   if (opts->payload == 1)
   {
@@ -1297,7 +1297,7 @@ void encodeM17STR(dsd_opts * opts, dsd_state * state)
   char d40[11] = "DSD-FME  "; //DST
   char s40[11] = "DSD-FME  "; //SRC
   //end User Defined Variables
-  
+
   //configure User Defined Variables, if defined at CLI
   if (state->m17_can_en != 0) //is 0 a valid number?
     can = state->m17_can_en;
@@ -1307,6 +1307,12 @@ void encodeM17STR(dsd_opts * opts, dsd_state * state)
 
   if (state->str50b[0] != 0)
     sprintf (d40, "%s", state->str50b);
+
+  //if special values, then assign them
+  if (strcmp (d40, "BROADCAST") == 0)
+    dst = 0xFFFFFFFFFFFF;
+  if (strcmp (d40, "ALL") == 0)
+    dst = 0xFFFFFFFFFFFF;
   //end
   
   int i, j, k, x;    //basic utility counters
@@ -2300,6 +2306,12 @@ void encodeM17PKT(dsd_opts * opts, dsd_state * state)
   // s40[10] = '\0';
   // d40[10] = '\0';
 
+  //if special values, then assign them
+  if (strcmp (d40, "BROADCAST") == 0)
+    dst = 0xFFFFFFFFFFFF;
+  if (strcmp (d40, "ALL") == 0)
+    dst = 0xFFFFFFFFFFFF;
+
   //debug
   // fprintf (stderr, " SRC: %s; DST: %s; SRC_D: %llX; DST_D: %llX; SLEN %d; DLEN: %d;", s40, d40, src, dst, strlen(s40), strlen(d40) );