Added guard clause for NetworkMap.TryGetValue and others for graceful error handling

Author: zbalkan

TechnitiumLibrary.Net/NetworkMap.cs

@@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License
 using System;
 using System.Collections.Generic;
 using System.Net;
+using System.Net.Sockets;
 
 namespace TechnitiumLibrary.Net
 {
@@ -28,6 +29,7 @@ public class NetworkMap<T>
         #region variables
 
         readonly List<IpEntry> _ipLookupList;
+        AddressFamily _networkFamily = AddressFamily.Unspecified;
         bool _sorted;
 
         #endregion
@@ -105,6 +107,16 @@ public void Add(NetworkAddress networkAddress, T value)
         {
             lock (_ipLookupList)
             {
+                // The first entry decides what kind of network map
+                // we are creating
+                if (_networkFamily == AddressFamily.Unspecified)
+                {
+                    _networkFamily = networkAddress.AddressFamily;
+                }
+                else if (_networkFamily != networkAddress.AddressFamily)
+                {
+                    throw new InvalidOperationException("Cannot add network address of different address family to the map.");
+                }
                 _ipLookupList.Add(new IpEntry(networkAddress.Address, value));
                 _ipLookupList.Add(new IpEntry(networkAddress.GetLastAddress(), value));
 
@@ -119,12 +131,19 @@ public bool Remove(string networkAddress)
 
         public bool Remove(NetworkAddress networkAddress)
         {
+            if (networkAddress.AddressFamily != _networkFamily)
+            {
+                return false;
+            }
+
             lock (_ipLookupList)
             {
                 bool v1 = _ipLookupList.Remove(new IpEntry(networkAddress.Address));
                 bool v2 = _ipLookupList.Remove(new IpEntry(networkAddress.GetLastAddress()));
 
                 _sorted = false;
+
+                if (_ipLookupList.Count == 0) _networkFamily = AddressFamily.Unspecified; // reset internal address family, class may be reused.
                 return v1 & v2;
             }
         }
@@ -136,6 +155,12 @@ public bool TryGetValue(string address, out T value)
 
         public bool TryGetValue(IPAddress address, out T value)
         {
+            if (address.AddressFamily != _networkFamily)
+            {
+                value = default;
+                return false;
+            }
+
             if (!_sorted)
             {
                 lock (_ipLookupList)
@@ -149,7 +174,6 @@ public bool TryGetValue(IPAddress address, out T value)
             }
 
             IpEntry findEntry = new IpEntry(address);
-
             IpEntry floorEntry = GetFloorEntry(findEntry);
             IpEntry ceilingEntry = GetCeilingEntry(findEntry);
 
@@ -244,4 +268,4 @@ public T Value
             #endregion
         }
     }
-}
+}