R04J32 Merge to Master

configs/adj_site_map.example.yml

@@ -0,0 +1,14 @@
+#
+# Digital Voice Modem - Adj. Site Map
+#
+
+# 
+# Peer List
+#
+peers:
+    # Peer ID.
+  - peerId: 1234567
+    # Flag indicating whether this talkgroup is active or not.
+    active: true
+    # List of peer IDs that are neighbors for this peer.
+    neighbors: []

configs/bridge-config.example.yml

@@ -125,6 +125,11 @@ system:
     # Textual Name
     identity: BRIDGE
 
+    # Network ID (WACN).
+    netId: BB800
+    # System ID.
+    sysId: 001
+
     # PCM audio gain for received (from digital network) audio frames.
     #   - This is used to apply gain to the decoded IMBE/AMBE audio, post-decoding.
     rxAudioGain: 1.0
@@ -145,7 +150,7 @@ system:
     #   - (Not used when utilizing external USB vocoder!)
     vocoderEncoderAudioGain: 3.0
 
-    # Audio transmit mode (1 - DMR, 2 - P25).
+    # Audio transmit mode (1 - DMR, 2 - P25, 3 - Analog).
     txMode: 1
 
     # Relative sample level for VOX to activate.
@@ -179,3 +184,9 @@ system:
     trace: false
     # Flag indicating whether or not debug logging is enabled.
     debug: false
+
+    # RTS PTT Configuration
+    # Flag indicating whether RTS PTT control is enabled.
+    rtsPttEnable: false
+    # Serial port device for RTS PTT control (e.g., /dev/ttyUSB0).
+    rtsPttPort: "/dev/ttyUSB0"

configs/config.example.yml

@@ -155,6 +155,10 @@ protocols:
         ignoreAffiliationCheck: false
         # Flag indicating the host should send a network grant demand for conventional traffic.
         convNetGrantDemand: false
+        # Flag indicating the fallback legacy group registration for radios that do not support group affiliation. 
+        #   (Useful for alerting the FNE to affiliations to TGIDs for radios that do not properly support group 
+        #    affiliation.)
+        legacyGroupReg: false
         # Flag indicating whether or not received RF embedded LC data only should be transmitted.
         embeddedLCOnly: false
         # Flag indicating whether talker alias data should be dumped to the log.
@@ -240,12 +244,16 @@ protocols:
         #   (This applies only in conventional operations where channel granting is utilized and RF-only talkgroup
         #    steering is required.)
         disableNetworkGrant: false
+        # Flag indicating whether or not TGID 0 (P25 blackhole talkgroup) will be allowed.
+        #   (Normally this should *never* be enabled, it is here to support poorly behaved systems that transmit
+        #    TGID 0 for some reason.)
+        forceAllowTG0: false
         # Flag indicating whether or not a TGID will be tested for affiliations before being granted.
         ignoreAffiliationCheck: false
         # Flag indicating that the host will attempt to automatically inhibit unauthorized RIDs (those not in the
         # RID ACL list).
         inhibitUnauthorized: false
-        # Flag indicating the fallback legacy group grant for radios that do not support group affilition to 
+        # Flag indicating the fallback legacy group grant for radios that do not support group affiliation to 
         # have group grants transmitted. (Useful for alerting the FNE to affiliations to TGIDs for radios that
         # do not properly support group affiliation.)
         legacyGroupGrnt: true
@@ -267,6 +275,8 @@ protocols:
         dumpDataPacket: false
         # Flag indicating whether or not this host will repeat P25 data traffic.
         repeatDataPacket: true
+        # Flag indicating whether or not the host will ignore CRC errors in P25 PDU data packets.
+        ignoreDataCRC: false
         # Flag indicating whether verbose dumping of P25 TSBK data is enabled.
         dumpTsbkData: false
         # Amount of time to hang after a voice call.
@@ -278,7 +288,7 @@ protocols:
         # Flag indicating that unit-to-unit availiability checks should be performed for a private call.
         unitToUnitAvailCheck: false
         # Flag indicating explicit source ID support is enabled.
-        allowExplicitSourceId: true
+        allowExplicitSourceId: false
         # Flag indicating whether or not the host will respond to SNDCP data requests.
         sndcpSupport: false
         # BER/Error threshold for silencing voice packets. (0 or 1233 disables)
@@ -319,6 +329,10 @@ protocols:
 
         # Flag indicating whether or not a TGID will be tested for affiliations before being granted.
         ignoreAffiliationCheck: false
+        # Flag indicating the fallback legacy group registration for radios that do not support group affiliation. 
+        #   (Useful for alerting the FNE to affiliations to TGIDs for radios that do not properly support group 
+        #    affiliation.)
+        legacyGroupReg: false
         # Flag indicating the host should verify group affiliation.
         verifyAff: false
         # Flag indicating the host should verify unit registration.
@@ -470,6 +484,10 @@ system:
         pSuperGroup: FFFE
         # Announcment Talkgroup Group.
         announcementGroup: FFFE
+        # Default Talkgroup for idle network traffic.
+        #   NOTE: TGID 0 is used here to indicate "promiscuous" mode, where first-come-first-serve traffic from the network
+        #     is allowed.
+        defaultNetIdleTalkgroup: 0
 
         # DMR network ID.
         dmrNetId: 1
@@ -532,8 +550,12 @@ system:
         # Amount of time to wait before starting DMR transmissions after a signal is received.
         dmrRxDelay: 7
         # Amount of packet correlations that should occur before P25 data is returned from the modem to the host.
-        # (Note: Changing this value will impact P25 protocol stability, and should not be altered.)
-        p25CorrCount: 8
+        #   (Note: Changing this value will impact P25 protocol stability, and should not be altered. This is set to
+        #     a default value of 2 for fast synchronization of a P25 signal, if the air modem is having difficulty
+        #     synchronizing to a P25 signal, this value can be increased to 3 or 4, or beyond. It should be noted that
+        #     increasing this value will increase the time it takes to synchronize to a P25 signal, and may cause
+        #     issues with P25 voice calls (especially encrypted voice calls).)
+        p25CorrCount: 2
         # Size (in bytes) of the DMR transmit FIFO buffer. It is not recommended to adjust this unless absolutely
         # necessary, excessive sizes will cause delays in transmitted frames due to excessive buffering.
         #   Calculation Formula: (DMR Frame Size (33 bytes) * x Frames) + Pad Bytes = FIFO Buffer Size Bytes
@@ -626,6 +648,9 @@ system:
             jitter: 200
             # Timer which will reset local/remote call flags if frames aren't received longer than this time in ms
             callTimeout: 200
+            # Flag indicating whether or not the V.24 modem is operating in full-duplex mode.
+            #  (This enables DVM to repeat incoming V.24 frames back out after processing.)
+            fullDuplex: false
             # Flag indicating when operating in V.24 UDP mode, the FSC protocol should be used to negotiate connection.
             fsc: false
             # Sets the heartbeat interval for the FSC connection.

configs/fne-config.example.yml

@@ -48,6 +48,10 @@ master:
     # Flag indicating whether or not verbose debug logging is enabled.
     debug: false
 
+    # Flag indicating whether or not denied traffic will be logged.
+    #   (This is useful for debugging talkgroup rules and other ACL issues, but can be very noisy on a busy system.)
+    logDenials: false
+
     # Maximum number of concurrent packet processing workers.
     workers: 16
 
@@ -70,6 +74,8 @@ master:
     allowP25Traffic: true
     # Flag indicating whether or not NXDN traffic will be passed.
     allowNXDNTraffic: true
+    # Flag indicating whether or not analog traffic will be passed.
+    allowAnalogTraffic: false
 
     # Flag indicating whether packet data will be passed.
     disablePacketData: false
@@ -87,6 +93,8 @@ master:
 
     # Flag indicating whether or not a grant responses will only be sent to TGs with affiliations, if the TG is configured for affiliation gating.
     restrictGrantToAffiliatedOnly: false
+    # Flag indicating whether or not a private call will only be routed to the network peers the RID registers with.
+    restrictPrivateCallToRegOnly: false
 
     # Flag indicating whether or not a adjacent site broadcasts will pass to any peers.
     disallowAdjStsBcast: false
@@ -103,9 +111,14 @@ master:
     # Flag indicating whether or not a TDULC call terminations will pass to any peers.
     disallowCallTerm: false
 
-    # Flag indicating that traffic headers will be filtered by destination ID (i.e. valid RID or valid TGID).
-    filterHeaders: true
-    # Flag indicating that terminators will be filtered by destination ID (i.e. valid RID or valid TGID).
+    # Flag indicating whether or not the FNE will mask all outbound traffic to use the FNE's own peer ID.
+    #   (This is useful for FNEs that are public facing, and the originating traffic peer ID should be masked.)
+    maskOutboundPeerID: false
+    # Flag indicating whether or not the FNE will mask only non-Peer-Link outbound traffic to use the FNE's own peer ID.
+    #   (This is useful for networked FNEs that are have a mix of connections, and the originating traffic peer ID to non-Peer-Link FNEs should be masked.)
+    maskOutboundPeerIDForNonPeerLink: false
+
+    # Flag indicating that P25 terminators will be filtered by destination ID (i.e. valid RID or valid TGID).
     filterTerminators: true
 
     # Flag indicating the FNE will drop all inbound Unit-to-Unit calls.
@@ -150,6 +163,15 @@ master:
         # Amount of time between updates of talkgroup rules file. (minutes)
         time: 30
 
+    #
+    # Adj. Site Map Configuration
+    #
+    adj_site_map:
+        # Full path to the Adj. Site Map file.
+        file: adj_site_map.yml
+        # Amount of time between updates of Adj. Site Map file. (minutes)
+        time: 30
+
 #
 # External Peers
 #

configs/patch-config.example.yml

@@ -60,21 +60,62 @@ network:
     sourceTGID: 1
     # Source Slot for received/transmitted audio frames.
     sourceSlot: 1
+
+    # Source Traffic Encryption
+    srcTek:
+      # Flag indicating whether or not traffic encryption is enabled.
+      enable: false
+      # Traffic Encryption Key Algorithm
+      #   aes - AES-256 Encryption
+      #   arc4 - ARC4/ADP Encryption
+      tekAlgo: "aes"
+      # Traffic Encryption Key ID
+      tekKeyId: 1
+
     # Destination Talkgroup ID for transmitted/received audio frames.
     destinationTGID: 1
     # Destination Slot for received/transmitted audio frames.
     destinationSlot: 1
 
+    # Destination Traffic Encryption
+    dstTek:
+      # Flag indicating whether or not traffic encryption is enabled.
+      enable: false
+      # Traffic Encryption Key Algorithm
+      #   aes - AES-256 Encryption
+      #   arc4 - ARC4/ADP Encryption
+      tekAlgo: "aes"
+      # Traffic Encryption Key ID
+      tekKeyId: 1
+
     # Flag indicating whether or not the patch is two-way.
     twoWay: false
 
+    # Hostname/IP address of MMDVM gateway to connect to.
+    mmdvmGatewayAddress: 127.0.0.1
+    # Port number to connect to.
+    mmdvmGatewayPort: 42020
+    # Local port number for gateway to connect to.
+    localGatewayPort: 32010
+
 system:
     # Textual Name
     identity: PATCH
 
+    # Network ID (WACN).
+    netId: BB800
+    # System ID.
+    sysId: 001
+
     # Digital mode (1 - DMR, 2 - P25).
     digiMode: 1
 
+    # Flag indicating whether a network grant demand packet will be sent before audio.
+    grantDemand: false
+
+    # Flag indicating whether or not the patch is from/to a MMDVM P25 reflector.
+    mmdvmP25Reflector: false
+
     # Flag indicating whether or not trace logging is enabled.
     trace: false
     # Flag indicating whether or not debug logging is enabled.

configs/peer_list.example.dat

@@ -1,9 +1,9 @@
 #
 # This file sets the valid peer IDs allowed on a FNE.
 #
-# Entry Format: "Peer ID,Peer Password,Peer Link (1 = Enabled / 0 = Disabled),Peer Alias (optional),Can Request Keys (1 = Enabled / 0 = Disabled),<newline>"
-#1234,,0,,1,
-#5678,MYSECUREPASSWORD,0,,0,
-#9876,MYSECUREPASSWORD,1,,0,
-#5432,MYSECUREPASSWORD,,Peer Alias 1,0,
-#1012,MYSECUREPASSWORD,1,Peer Alias 2,1,
+# Entry Format: "Peer ID,Peer Password,Peer Link (1 = Enabled / 0 = Disabled),Peer Alias (optional),Can Request Keys (1 = Enabled / 0 = Disabled),Can Issue Inhibit (1 = Enabled / 0 = Disabled)<newline>"
+#1234,,0,,1,0,
+#5678,MYSECUREPASSWORD,0,,0,0,
+#9876,MYSECUREPASSWORD,1,,0,0,
+#5432,MYSECUREPASSWORD,,Peer Alias 1,0,0,
+#1012,MYSECUREPASSWORD,1,Peer Alias 2,1,0,

src/CMakeLists.txt

@@ -42,6 +42,7 @@ if (ENABLE_SETUP_TUI)
     target_link_libraries(dvmhost PRIVATE common ${OPENSSL_LIBRARIES} asio::asio finalcut Threads::Threads util)
 else ()
     if (COMPILE_WIN32)
+        target_sources(dvmhost PRIVATE ${dvmhost_RC})
         target_link_libraries(dvmhost PRIVATE common ${OPENSSL_LIBRARIES} asio::asio Threads::Threads)
     else ()
         target_link_libraries(dvmhost PRIVATE common ${OPENSSL_LIBRARIES} asio::asio Threads::Threads util)
@@ -60,7 +61,7 @@ set(CPACK_PACKAGE_VENDOR "DVMProject")
 
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "The DVM Host software provides the host computer implementation of a mixed-mode DMR, P25 and/or NXDN or dedicated-mode DMR, P25 or NXDN repeater system that talks to the actual modem hardware. The host software; is the portion of a complete Over-The-Air modem implementation that performs the data processing, decision making and FEC correction for a digital repeater.")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "DVMProject Authors")
-set(CPACK_DEBIAN_PACKAGE_VERSION "R04Hxx")
+set(CPACK_DEBIAN_PACKAGE_VERSION "R04Jxx")
 set(CPACK_DEBIAN_PACKAGE_RELEASE "0")
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/dvmproject")
 
@@ -76,6 +77,9 @@ include(CPack)
 #
 include(src/fne/CMakeLists.txt)
 add_executable(dvmfne ${common_INCLUDE} ${dvmfne_SRC})
+if (COMPILE_WIN32)
+    target_sources(dvmfne PRIVATE ${dvmfne_RC})
+endif (COMPILE_WIN32)
 target_link_libraries(dvmfne PRIVATE common ${OPENSSL_LIBRARIES} asio::asio Threads::Threads)
 target_include_directories(dvmfne PRIVATE ${OPENSSL_INCLUDE_DIR} src src/fne)
 
@@ -128,6 +132,9 @@ endif (ENABLE_TUI_SUPPORT AND (NOT DISABLE_TUI_APPS))
 #
 include(src/remote/CMakeLists.txt)
 add_executable(dvmcmd ${common_INCLUDE} ${dvmcmd_SRC})
+if (COMPILE_WIN32)
+    target_sources(dvmcmd PRIVATE ${dvmcmd_RC})
+endif (COMPILE_WIN32)
 target_link_libraries(dvmcmd PRIVATE common ${OPENSSL_LIBRARIES} asio::asio Threads::Threads)
 target_include_directories(dvmcmd PRIVATE ${OPENSSL_INCLUDE_DIR} src src/remote)
 
@@ -137,6 +144,7 @@ target_include_directories(dvmcmd PRIVATE ${OPENSSL_INCLUDE_DIR} src src/remote)
 include(src/bridge/CMakeLists.txt)
 add_executable(dvmbridge ${common_INCLUDE} ${bridge_SRC})
 if (COMPILE_WIN32)
+    target_sources(dvmbridge PRIVATE ${bridge_RC})
     target_link_libraries(dvmbridge PRIVATE common vocoder ${OPENSSL_LIBRARIES} asio::asio Threads::Threads)
 else ()
     if (ARCH STREQUAL "arm64" OR ARCH STREQUAL "armhf")
@@ -153,6 +161,7 @@ target_include_directories(dvmbridge PRIVATE ${OPENSSL_INCLUDE_DIR} src src/brid
 include(src/patch/CMakeLists.txt)
 add_executable(dvmpatch ${common_INCLUDE} ${patch_SRC})
 if (COMPILE_WIN32)
+    target_sources(dvmpatch PRIVATE ${patch_RC})
     target_link_libraries(dvmpatch PRIVATE common ${OPENSSL_LIBRARIES} asio::asio Threads::Threads)
 else ()
     target_link_libraries(dvmpatch PRIVATE common ${OPENSSL_LIBRARIES} dl asio::asio Threads::Threads)

src/CompilerOptions.cmake

@@ -35,6 +35,7 @@ option(DEBUG_NXDN_SACCH "" off)
 option(DEBUG_NXDN_UDCH "" off)
 option(DEBUG_NXDN_LICH "" off)
 option(DEBUG_NXDN_CAC "" off)
+option(DEBUG_NXDN_RTCH "" off)
 option(DEBUG_P25_PDU_DATA "" off)
 option(DEBUG_P25_HDU "" off)
 option(DEBUG_P25_LDU1 "" off)
@@ -96,6 +97,10 @@ if (DEBUG_NXDN_CAC)
     message(CHECK_START "NXDN CAC Debug")
     add_definitions(-DDEBUG_NXDN_CAC)
 endif (DEBUG_NXDN_CAC)
+if (DEBUG_NXDN_RTCH)
+    message(CHECK_START "NXDN RTCH Debug")
+    add_definitions(-DDEBUG_NXDN_RTCH)
+endif (DEBUG_NXDN_RTCH)
 if (DEBUG_P25_PDU_DATA)
     message(CHECK_START "P25 PDU Data Debug")
     add_definitions(-DDEBUG_P25_PDU_DATA)

src/bridge/CMakeLists.txt

@@ -4,7 +4,7 @@
 # * GPLv2 Open Source. Use is subject to license terms.
 # * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # *
-# *  Copyright (C) 2024 Bryan Biedenkapp, N2PLL
+# *  Copyright (C) 2024,2025 Bryan Biedenkapp, N2PLL
 # *
 # */
 file(GLOB bridge_SRC
@@ -16,6 +16,14 @@ file(GLOB bridge_SRC
 
     "src/bridge/network/*.h"
     "src/bridge/network/*.cpp"
+    "src/bridge/win32/*.h"
     "src/bridge/*.h"
     "src/bridge/*.cpp"
 )
+
+#
+# Windows Resource Scripts
+#
+file(GLOB bridge_RC
+    "src/bridge/win32/*.rc"
+)