Crypto, call handling, and scan logic improvements

rc2-dvm/Configuration.cs

@@ -135,6 +135,10 @@ public class TalkgroupConfigObject
         /// Whether or not this talkgroup is included in the scanlist
         /// </summary>
         public bool Scan = true;
+        /// <summary>
+        /// Whether the talkgroup is nuisance deleted (should not be configured in the yml, internal use only)
+        /// </summary>
+        public bool NuisanceDeleted = false;
     }
 
     /// <summary>
@@ -253,6 +257,10 @@ public class NetworkConfigObject
         /// Whether to enable additional debug messages
         /// </summary>
         public bool Debug = false;
+        /// <summary>
+        /// List of allowed subnets/networks for incoming WebRTC connections
+        /// </summary>
+        public List<IPNetwork> AllowedNetworks = new();
     }
 
     public class EncryptionConfigObject

rc2-dvm/FneSystemBase.P25.cs

@@ -495,25 +495,6 @@ protected override void P25DataReceived(object sender, P25DataReceivedEvent e)
                 foreach (VirtualChannel channel in RC2DVM.VirtualChannels)
                 {
                     channel.P25DataReceived(e, pktTime);
-                    /**
-                    // Don't send to channels that are transmitting
-                    if (channel.IsTransmitting()) {
-                        Log.Logger.Debug("({0:l}) Not sending data from P25 TG {1} to channel {2:l}, channel is currently transmitting", RC2DVM.fneSystem.SystemName, e.DstId, channel.Config.Name);
-                        continue; 
-                    }
-                    // Send data to any channel on the TG
-                    if (channel.IsTalkgroupSelected(VocoderMode.P25, e.DstId))
-                    {
-                        Log.Logger.Debug("({0:l}) P25 TG {1} {2:l} -> {3:l}", RC2DVM.fneSystem.SystemName, e.DstId, Enum.GetName(typeof(P25DUID), e.DUID), channel.Config.Name);
-                        channel.P25DataReceived(e, pktTime);
-                    }
-                    // Send to any channel with the ATG configured
-                    else if (channel.Config.AnnouncementGroup == e.DstId)
-                    {
-                        Log.Logger.Debug("({0:l}) P25 ATG {1} {2:l} -> {3:l}", RC2DVM.fneSystem.SystemName, e.DstId, Enum.GetName(typeof(P25DUID), e.DUID), channel.Config.Name);
-                        channel.P25DataReceived(e, pktTime);
-                    }
-                    // Send to any channel with the talkgroup in its scanlist*/
                 }
 
                 return;

rc2-dvm/Radio.DVM.cs

@@ -19,6 +19,7 @@ internal class DVMRadio : Radio
             SoftkeyName.HOME,
             SoftkeyName.SCAN,
             SoftkeyName.SEC,
+            SoftkeyName.DEL
         };
 
         // Talkgroup list
@@ -39,8 +40,9 @@ internal class DVMRadio : Radio
         public DVMRadio(
             string name, bool rxOnly,
             IPAddress listenAddress, int listenPort,
+            List<IPNetwork> allowedNetworks,
             List<TalkgroupConfigObject> talkgroups, VirtualChannel vChannel, 
-            Action<short[]> txAudioCallback, int txAudioSampleRate) : base(name, "", rxOnly, listenAddress, listenPort, DVMSoftkeys, null, null, txAudioCallback, txAudioSampleRate)
+            Action<short[]> txAudioCallback, int txAudioSampleRate) : base(name, "", rxOnly, listenAddress, listenPort, allowedNetworks, DVMSoftkeys, null, null, txAudioCallback, txAudioSampleRate)
         {
             this.talkgroups = talkgroups;
             this.vChannel = vChannel;
@@ -98,17 +100,29 @@ public override bool ReleaseButton(SoftkeyName name)
                         Log.Logger.Warning("Talkgroup security is strapped secure, cannot toggle secure mode");
                         return false;
                     }
-                    // If current talkgroup is not set up for encryption, bonk
+                    // If current talkgroup is not set up for encryption
                     if (vChannel.CurrentTalkgroup.KeyId == 0 || vChannel.CurrentTalkgroup.AlgId == P25Defines.P25_ALGO_UNENCRYPT)
                     {
-                        Log.Logger.Warning("Talkgroup is not configured for secure operation, cannot toggle secure mode");
-                        return false;
+                        // If we have secure enabled, disable it
+                        if (vChannel.Secure)
+                        {
+                            vChannel.Secure = false;
+                            Log.Logger.Information("Disabling secure mode for radio {name:l}, channel not configured for encryption", vChannel.Config.Name);
+                        }
+                        else
+                        {
+                            Log.Logger.Warning("Talkgroup is not configured for secure operation, cannot toggle secure mode");
+                            return false;
+                        } 
+                    }
+                    else
+                    {
+                        // Toggle secure status
+                        vChannel.Secure = !vChannel.Secure;
+                        Log.Logger.Information("Toggling secure mode for radio {name:l}: {state:l}", vChannel.Config.Name, (vChannel.Secure ? "ON" : "OFF"));
                     }
-                    // Toggle secure status
-                    vChannel.Secure = !vChannel.Secure;
-                    Log.Logger.Information("Toggling secure mode for radio {name:l}: {state:l}", vChannel.Config.Name, (vChannel.Secure ? "ON" : "OFF"));
                     // Return channel setup success/failure
-                    return vChannel.SetupChannel();
+                    return vChannel.SetupChannelCrypto();
 
                 // HOME
                 case SoftkeyName.HOME:
@@ -117,6 +131,10 @@ public override bool ReleaseButton(SoftkeyName name)
                 // SCAN
                 case SoftkeyName.SCAN:
                     return vChannel.ToggleScan();
+
+                // DEL (Nuisance Delete)
+                case SoftkeyName.DEL:
+                    return vChannel.NuisanceDelete();
 
                 // Handle unhandled buttons
                 default: