Merge pull request #2 from F4FXL/CallsignSuffix

Callsign suffix

src/ccallsign.cpp

@@ -76,6 +76,9 @@ CCallsign::CCallsign(const char *sz, uint32 dmrid)
             if ( callsign != NULL )
             {
                 ::memcpy(m_Callsign, callsign->m_Callsign, sizeof(m_Callsign));
+#if (REMOVE_CALLSIGN_SUFFIX == 1)
+                ::memcpy(m_Suffix, callsign->m_Suffix, sizeof(m_Suffix));
+#endif
             }
         }
         g_DmridDir.Unlock();
@@ -85,7 +88,11 @@ CCallsign::CCallsign(const char *sz, uint32 dmrid)
 CCallsign::CCallsign(const CCallsign &callsign)
 {
     ::memcpy(m_Callsign, callsign.m_Callsign, sizeof(m_Callsign));
+#if (REMOVE_CALLSIGN_SUFFIX == 1)
+    ::memset(m_Suffix, ' ', sizeof(m_Suffix));
+#else
     ::memcpy(m_Suffix, callsign.m_Suffix, sizeof(m_Suffix));
+#endif
     m_Module = callsign.m_Module;
     m_uiDmrid = callsign.m_uiDmrid;
 }
@@ -229,14 +236,18 @@ void CCallsign::SetModule(char c)
 void CCallsign::SetSuffix(const char *sz)
 {
     ::memset(m_Suffix, ' ', sizeof(m_Suffix));
+#if (REMOVE_CALLSIGN_SUFFIX == 1)    
     ::memcpy(m_Suffix, sz, MIN(strlen(sz), sizeof(m_Suffix)));
+#endif
 }
 
 void CCallsign::SetSuffix(const uint8 *buffer, int len)
 {
-    len = MIN(len, sizeof(m_Suffix));
     ::memset(m_Suffix, ' ', sizeof(m_Suffix));
+#if (REMOVE_CALLSIGN_SUFFIX == 0)    
+    len = MIN(len, sizeof(m_Suffix));
     ::memcpy(m_Suffix, buffer, len);
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////

src/cdvheaderpacket.cpp

@@ -68,6 +68,7 @@ CDvHeaderPacket::CDvHeaderPacket(uint32 my, const CCallsign &ur, const CCallsign
     m_csRPT1 = rpt1;
     m_csRPT2 = rpt2;
     m_csMY = CCallsign("", my);
+    m_csMY.SetSuffix("DMR");
 }
 
 // YSF constructor
@@ -83,6 +84,7 @@ CDvHeaderPacket::CDvHeaderPacket(const CCallsign &my, const CCallsign &ur, const
     m_csRPT1 = rpt1;
     m_csRPT2 = rpt2;
     m_csMY = my;
+    m_csMY.SetSuffix("YSF");
 }
 
 

src/main.h

@@ -158,6 +158,9 @@
 #define YSFNODEDB_PATH                  "/xlxd/ysfnode.dat"                 // local file path
 #define YSFNODEDB_REFRESH_RATE          180                                 // in minutes
 
+//Set to 1 to get rid of Suffixes for legal reasons e.g. LX
+#define REMOVE_CALLSIGN_SUFFIX          0
+
 // xml & json reporting -----------------------------------------
 
 #define LASTHEARD_USERS_MAX_SIZE        100