diff --git a/.gitignore b/.gitignore index 8315180..c443dc0 100644 --- a/.gitignore +++ b/.gitignore @@ -289,3 +289,6 @@ __pycache__/ *.xsd.cs src/System.Net.IPNetwork.TestProject.NetCore/coverage.net5.0.opencover.xml coverage.xml + +# macOS +.DS_Store diff --git a/src/System.Net.IPNetwork/Filter.cs b/src/System.Net.IPNetwork/Filter.cs index 76237b3..518fd04 100644 --- a/src/System.Net.IPNetwork/Filter.cs +++ b/src/System.Net.IPNetwork/Filter.cs @@ -15,19 +15,3 @@ public enum Filter /// Usable, } - -/// -/// Represents different filters for a collection of items. -/// -public enum FilterEnum -{ - /// - /// Every IPAdresses are returned - /// - All, - - /// - /// Returns only usable IPAdresses - /// - Usable, -} \ No newline at end of file diff --git a/src/System.Net.IPNetwork/IPNetwork2Contains.cs b/src/System.Net.IPNetwork/IPNetwork2Contains.cs index 98de52c..783eebd 100644 --- a/src/System.Net.IPNetwork/IPNetwork2Contains.cs +++ b/src/System.Net.IPNetwork/IPNetwork2Contains.cs @@ -68,38 +68,6 @@ public bool Contains(IPNetwork2 contains) return result; } - /// - /// return true if ipaddress is contained in network. - /// - /// The network. - /// The ip address to test. - /// true if ipaddress is contained into the IP Network; otherwise, false. - public static bool Contains(IPNetwork2 network, IPAddress ipaddress) - { - if (network == null) - { - throw new ArgumentNullException(nameof(network)); - } - - return network.Contains(ipaddress); - } - - /// - /// return true is network2 is fully contained in network. - /// - /// The network. - /// The network to test. - /// true if network2 is contained into the IP Network; otherwise, false. - public static bool Contains(IPNetwork2 network, IPNetwork2 network2) - { - if (network == null) - { - throw new ArgumentNullException(nameof(network)); - } - - return network.Contains(network2); - } - private static BigInteger CreateBroadcast(ref BigInteger network, BigInteger netmask, AddressFamily family) { int width = family == AddressFamily.InterNetwork ? 4 : 16; diff --git a/src/System.Net.IPNetwork/IPNetwork2IANAblock.cs b/src/System.Net.IPNetwork/IPNetwork2IANAblock.cs index af77887..d56ae44 100644 --- a/src/System.Net.IPNetwork/IPNetwork2IANAblock.cs +++ b/src/System.Net.IPNetwork/IPNetwork2IANAblock.cs @@ -179,22 +179,6 @@ public static bool IsIANAReserved(IPAddress ipaddress) return IsIANAReservedIPv4(ipaddress); } - /// - /// return true if ipnetwork is contained in - /// any IANA reserved block (IPv4 or IPv6). - /// - /// The IPNetwork to test. - /// true if the ipnetwork is in an IANA reserved block; otherwise, false. - public static bool IsIANAReserved(IPNetwork2 ipnetwork) - { - if (ipnetwork == null) - { - throw new ArgumentNullException(nameof(ipnetwork)); - } - - return ipnetwork.IsIANAReserved(); - } - /// /// return true if this ipnetwork is contained in /// any IANA reserved block (IPv4 or IPv6). diff --git a/src/System.Net.IPNetwork/IPNetwork2ListIPAddress.cs b/src/System.Net.IPNetwork/IPNetwork2ListIPAddress.cs index 7a7b0e9..c1f3150 100644 --- a/src/System.Net.IPNetwork/IPNetwork2ListIPAddress.cs +++ b/src/System.Net.IPNetwork/IPNetwork2ListIPAddress.cs @@ -18,15 +18,4 @@ public IPAddressCollection ListIPAddress(Filter filter = Filter.All) { return new IPAddressCollection(this, filter); } - - /// - /// List all ip addresses in a subnet. - /// - /// Filter IPAdresses from IPNetwork. - /// The filterted IPAdresses contained in ipnetwork. - public IPAddressCollection ListIPAddress(FilterEnum filter) - { - var newFilter = filter == FilterEnum.Usable ? Filter.Usable : Filter.All; - return new IPAddressCollection(this, newFilter); - } } \ No newline at end of file diff --git a/src/System.Net.IPNetwork/IPNetwork2Overlap.cs b/src/System.Net.IPNetwork/IPNetwork2Overlap.cs index 06b2d09..910cf38 100644 --- a/src/System.Net.IPNetwork/IPNetwork2Overlap.cs +++ b/src/System.Net.IPNetwork/IPNetwork2Overlap.cs @@ -11,22 +11,6 @@ namespace System.Net; /// public sealed partial class IPNetwork2 { - /// - /// return true is network2 overlap network. - /// - /// The network. - /// The network to test. - /// true if network2 overlaps into the IP Network; otherwise, false. - public static bool Overlap(IPNetwork2 network, IPNetwork2 network2) - { - if (network == null) - { - throw new ArgumentNullException(nameof(network)); - } - - return network.Overlap(network2); - } - /// /// return true is network2 overlap network. /// diff --git a/src/System.Net.IPNetwork/IPNetwork2Print.cs b/src/System.Net.IPNetwork/IPNetwork2Print.cs index 86d5f26..fd9d617 100644 --- a/src/System.Net.IPNetwork/IPNetwork2Print.cs +++ b/src/System.Net.IPNetwork/IPNetwork2Print.cs @@ -11,21 +11,6 @@ namespace System.Net; /// public sealed partial class IPNetwork2 { - /// - /// Print an ipnetwork in a clear representation string. - /// - /// The IPNetwork to print. - /// Dump an IPNetwork representation as string. - public static string Print(IPNetwork2 ipnetwork) - { - if (ipnetwork == null) - { - throw new ArgumentNullException(nameof(ipnetwork)); - } - - return ipnetwork.Print(); - } - /// /// Print an ipnetwork in a clear representation string. /// diff --git a/src/System.Net.IPNetwork/IPNetwork2Subnet.cs b/src/System.Net.IPNetwork/IPNetwork2Subnet.cs index 3e0fa13..ddaa73f 100644 --- a/src/System.Net.IPNetwork/IPNetwork2Subnet.cs +++ b/src/System.Net.IPNetwork/IPNetwork2Subnet.cs @@ -41,43 +41,6 @@ public IPNetworkCollection Subnet(byte cidr1) return ipnetworkCollection; } - /// - /// Subnet a network into multiple nets of cidr mask - /// Subnet 192.168.0.0/24 into cidr 25 gives 192.168.0.0/25, 192.168.0.128/25 - /// Subnet 10.0.0.0/8 into cidr 9 gives 10.0.0.0/9, 10.128.0.0/9. - /// - /// The network to subnet. - /// A byte representing the CIDR to be used to subnet the network. - /// A IPNetworkCollection split by CIDR. - public static IPNetworkCollection Subnet(IPNetwork2 network, byte cidr) - { - if (!InternalSubnet(false, network, cidr, out IPNetworkCollection? ipnetworkCollection)) - { - throw new ArgumentException("Invalid CIDR.", nameof(cidr)); - } - - return ipnetworkCollection; - } - - /// - /// Subnet a network into multiple nets of cidr mask - /// Subnet 192.168.0.0/24 into cidr 25 gives 192.168.0.0/25, 192.168.0.128/25 - /// Subnet 10.0.0.0/8 into cidr 9 gives 10.0.0.0/9, 10.128.0.0/9. - /// - /// The network to subnet. - /// A byte representing the CIDR to be used to subnet the network. - /// The resulting subnetted IPNetwork. - /// true if network was split successfully; otherwise, false. - public static bool TrySubnet(IPNetwork2 network, byte cidr, out IPNetworkCollection? ipnetworkCollection) - { - if (network == null) - { - throw new ArgumentNullException(nameof(network)); - } - - return InternalSubnet(true, network, cidr, out ipnetworkCollection); - } - /// /// Splits a given IP network into smaller subnets of the specified CIDR size. /// diff --git a/src/System.Net.IPNetwork/IPNetwork2Supernet.cs b/src/System.Net.IPNetwork/IPNetwork2Supernet.cs index 05c6b8d..863b85c 100644 --- a/src/System.Net.IPNetwork/IPNetwork2Supernet.cs +++ b/src/System.Net.IPNetwork/IPNetwork2Supernet.cs @@ -44,50 +44,6 @@ public bool TrySupernet(IPNetwork2 network2, [NotNullWhen(true)] out IPNetwork2? return InternalSupernet(true, this, network2, out supernet); } - /// - /// Supernet two consecutive cidr equal subnet into a single one - /// 192.168.0.0/24 + 192.168.1.0/24 = 192.168.0.0/23 - /// 10.1.0.0/16 + 10.0.0.0/16 = 10.0.0.0/15 - /// 192.168.0.0/24 + 192.168.0.0/25 = 192.168.0.0/24. - /// - /// The first network. - /// The second network. - /// A super netted IP Network. - public static IPNetwork2 Supernet(IPNetwork2 network1, IPNetwork2 network2) - { - if (!InternalSupernet(false, network1, network2, out IPNetwork2? supernet)) - { - throw new ArgumentException("Failed to supernet networks.", nameof(network2)); - } - - return supernet; - } - - /// - /// Try to supernet two consecutive cidr equal subnet into a single one - /// 192.168.0.0/24 + 192.168.1.0/24 = 192.168.0.0/23 - /// 10.1.0.0/16 + 10.0.0.0/16 = 10.0.0.0/15 - /// 192.168.0.0/24 + 192.168.0.0/25 = 192.168.0.0/24. - /// - /// The first network. - /// The second network. - /// The resulting IPNetwork. - /// true if network1 and network2 were super netted successfully; otherwise, false. - public static bool TrySupernet(IPNetwork2 network1, IPNetwork2 network2, [NotNullWhen(true)] out IPNetwork2? supernet) - { - if (network1 == null) - { - throw new ArgumentNullException(nameof(network1)); - } - - if (network2 == null) - { - throw new ArgumentNullException(nameof(network2)); - } - - return InternalSupernet(true, network1, network2, out supernet); - } - /// /// Attempts to merge two adjacent IP networks with equal CIDR values into a single supernet. /// diff --git a/src/TestProject/ContainsUnitTest.cs b/src/TestProject/ContainsUnitTest.cs index fe6317c..98678eb 100644 --- a/src/TestProject/ContainsUnitTest.cs +++ b/src/TestProject/ContainsUnitTest.cs @@ -49,35 +49,6 @@ public void TestContainsAdrress(string network1, string networkOrAddress, bool e Assert.AreEqual(expected, result, "contains"); } - /// - /// Test. - /// - [TestMethod] - public void TestContainsStatic3() - { - IPNetwork2 ipnetwork = null; - IPNetwork2 ipnetwork2 = null; - - Assert.ThrowsExactly(() => - { - IPNetwork2.Contains(ipnetwork, ipnetwork2); - }); - } - - /// - /// Test. - /// - [TestMethod] - public void TestContainsStatic4() - { - IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1; - IPNetwork2 ipnetwork2 = IPNetwork2.IANA_CBLK_RESERVED1; - - bool result = IPNetwork2.Contains(ipnetwork, ipnetwork2); - - Assert.IsTrue(result, "result"); - } - /// /// Test. /// @@ -93,34 +64,6 @@ public void TestContains8() }); } - /// - /// Test. - /// - [TestMethod] - public void TestContainsStatic1() - { - IPNetwork2 ipnetwork = null; - IPAddress ipaddress = null; - - Assert.ThrowsExactly(() => - { - IPNetwork2.Contains(ipnetwork, ipaddress); - }); - } - - /// - /// Test. - /// - [TestMethod] - public void TestContainsStatic2() - { - IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; - var ipaddress = IPAddress.Parse("10.0.0.1"); - - bool result = IPNetwork2.Contains(ipnetwork, ipaddress); - Assert.IsTrue(result, "result"); - } - /// /// Test. /// diff --git a/src/TestProject/IPAddressCollectionUnitTest.cs b/src/TestProject/IPAddressCollectionUnitTest.cs index ed3bc8f..5607a5c 100644 --- a/src/TestProject/IPAddressCollectionUnitTest.cs +++ b/src/TestProject/IPAddressCollectionUnitTest.cs @@ -535,28 +535,4 @@ public void Test_ipv6_DefaultNetmask() var ipnetwork = IPNetwork2.Parse("::1"); Assert.AreEqual(64, ipnetwork.Cidr, "Cidr"); } - - /// - /// Test. - /// - [TestMethod] - [Obsolete("Obsolete")] - public void TestListIPAddressFilterEnumAll() - { - var ipn = IPNetwork2.Parse("192.168.1.0/29"); - using IPAddressCollection ips = ipn.ListIPAddress(FilterEnum.All); - Assert.HasCount(8, ips, "Count"); - } - - /// - /// Test. - /// - [TestMethod] - [Obsolete("Obsolete")] - public void TestListIPAddressFilterEnumUsable() - { - var ipn = IPNetwork2.Parse("192.168.1.0/29"); - using IPAddressCollection ips = ipn.ListIPAddress(FilterEnum.Usable); - Assert.HasCount(6, ips, "Count"); - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkIanaBlocksTests.cs b/src/TestProject/IPNetworkTest/IPNetworkIanaBlocksTests.cs index 04cad59..9247f5c 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkIanaBlocksTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkIanaBlocksTests.cs @@ -95,30 +95,6 @@ public void TestIana7() }); } - /// - /// Test is a null ipnetwork is in IANA block. - /// - [TestMethod] - public void TestIana8() - { - IPNetwork2 ipnetwork = null; - Assert.ThrowsExactly(() => - { - IPNetwork2.IsIANAReserved(ipnetwork); - }); - } - - /// - /// Tests IANA_blocks functionality with IANABlk1. - /// - [TestMethod] - public void TestIanaBlk1() - { - IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; - bool result = IPNetwork2.IsIANAReserved(ipnetwork); - Assert.IsTrue(result, "result"); - } - /// /// Tests IANA_blocks functionality with IANA9. /// diff --git a/src/TestProject/IPNetworkTest/IPNetworkOverlapTests.cs b/src/TestProject/IPNetworkTest/IPNetworkOverlapTests.cs index 09b8e94..9cd687e 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkOverlapTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkOverlapTests.cs @@ -10,35 +10,6 @@ namespace TestProject.IPNetworkTest; [TestClass] public class IPNetworkOverlapTests { - /// - /// Test overlap. - /// - [TestMethod] - public void TestOverlap1() - { - IPNetwork2 network1 = null; - IPNetwork2 network2 = null; - - Assert.ThrowsExactly(() => - { - IPNetwork2.Overlap(network1, network2); - }); - } - - /// - /// Tests Overlap functionality with Overlap Static2. - /// - [TestMethod] - public void TestOverlapStatic2() - { - IPNetwork2 network1 = IPNetwork2.IANA_ABLK_RESERVED1; - IPNetwork2 network2 = IPNetwork2.IANA_ABLK_RESERVED1; - - bool result = IPNetwork2.Overlap(network1, network2); - - Assert.IsTrue(result, "result"); - } - /// /// Test. /// diff --git a/src/TestProject/IPNetworkTest/IPNetworkPrintTests.cs b/src/TestProject/IPNetworkTest/IPNetworkPrintTests.cs index ea61ac0..9ec2775 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkPrintTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkPrintTests.cs @@ -31,26 +31,4 @@ public void Print() Assert.AreEqual(expected, print, "Print"); } - /// - /// Test. - /// - [TestMethod] - public void PrintNull() - { - IPNetwork2 ipn = null; - Assert.ThrowsExactly(() => - IPNetwork2.Print(ipn)); - } - - /// - /// Tests Print functionality. - /// - [TestMethod] - public void PrintStatic() - { - IPNetwork2 ipn = IPNetwork2.IANA_ABLK_RESERVED1; -#pragma warning disable 0618 - IPNetwork2.Print(ipn); -#pragma warning restore 0618 - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs index 18fae54..ec5ddf0 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs @@ -10,32 +10,6 @@ namespace TestProject.IPNetworkTest; [TestClass] public class IPNetworkSubnetTests { - /// - /// Test. - /// - [TestMethod] - public void TestSubnet1() - { - IPNetwork2 ipnetwork = null; - byte cidr = 9; - Assert.ThrowsExactly(() => - IPNetwork2.Subnet(ipnetwork, cidr)); - } - - /// - /// Tests Subnet functionality with Subnet Static1. - /// - [TestMethod] - public void TestSubnetStatic1() - { - IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; - byte cidr = 9; - - IPNetworkCollection subnets = IPNetwork2.Subnet(ipnetwork, cidr); - Assert.IsNotNull(subnets); - Assert.AreEqual(2, subnets.Count); - } - /// /// Test. /// diff --git a/src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs index 37b27a2..0ecad54 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs @@ -167,19 +167,6 @@ public void TestSupernet7() /// /// Tests Supernet functionality with Supernet Static1. /// - [TestMethod] - public void TestSupernetStatic1() - { - var network1 = IPNetwork2.Parse("192.168.0.1/25"); - var network2 = IPNetwork2.Parse("192.168.0.1/24"); - var expected = IPNetwork2.Parse("192.168.0.0/24"); -#pragma warning disable CS0618 // Type or member is obsolete - var supernet = IPNetwork2.Supernet(network1, network2); -#pragma warning restore CS0618 // Type or member is obsolete - - Assert.AreEqual(expected, supernet, "supernet"); - } - /// /// Test to supernet continuous networks. /// diff --git a/src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs index 5feba12..32fd14f 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs @@ -32,34 +32,6 @@ public void TestInternalSubnet2() }); } - /// - /// Test a null network. - /// - [TestMethod] - public void TestTrySubnet1() - { - Assert.ThrowsExactly(() => - { -#pragma warning disable 0618 - IPNetwork2.TrySubnet(null, 9, out _); -#pragma warning restore 0618 - }); - } - - /// - /// Tests Try Subnet functionality with Try Subnet Static1. - /// - [TestMethod] - public void TestTrySubnetStatic1() - { - IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; - byte cidr = 9; - - bool result = IPNetwork2.TrySubnet(ipnetwork, cidr, out IPNetworkCollection subnets); - Assert.IsTrue(result); - Assert.IsNotNull(subnets); - } - /// /// Tests Try Subnet functionality with Try Subnet3. /// diff --git a/src/TestProject/IPNetworkTest/IPNetworkTrySupernetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTrySupernetTests.cs index 097c1ae..ea95287 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTrySupernetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTrySupernetTests.cs @@ -25,34 +25,6 @@ public void TestTrySupernet1() Assert.IsTrue(result); } - /// - /// Test. - /// - [TestMethod] - public void TestTrySupernet2() - { - IPNetwork2 network1 = null; - var network2 = IPNetwork2.Parse("192.168.11.1/24"); - Assert.ThrowsExactly(() => - { - IPNetwork2.TrySupernet(network1, network2, out var _); - }); - } - - /// - /// Tests Try Supernet functionality with Try Supernet Static2. - /// - [TestMethod] - public void TestTrySupernetStatic2() - { - IPNetwork2 network1 = IPNetwork2.IANA_ABLK_RESERVED1; - var network2 = IPNetwork2.Parse("192.168.21.1/24"); - bool supernetted = IPNetwork2.TrySupernet(network1, network2, out IPNetwork2 supernet); - - Assert.IsFalse(supernetted); - Assert.IsNull(supernet); - } - /// /// Tests Try Supernet functionality with Try Supernet3. /// diff --git a/src/TestProject/IPNetworkV6/IPNetworkV6TrySupernetTests.cs b/src/TestProject/IPNetworkV6/IPNetworkV6TrySupernetTests.cs index c50cb27..153e4de 100644 --- a/src/TestProject/IPNetworkV6/IPNetworkV6TrySupernetTests.cs +++ b/src/TestProject/IPNetworkV6/IPNetworkV6TrySupernetTests.cs @@ -25,21 +25,6 @@ public void TestTrySupernet1() Assert.AreEqual(supernetExpected, supernet, "supernet"); } - /// - /// Test. - /// - [TestMethod] - public void TestTrySupernet2() - { - IPNetwork2 network1 = null; - var network2 = IPNetwork2.Parse("2001:db8::/64"); - - Assert.ThrowsExactly(() => - { - IPNetwork2.TrySupernet(network1, network2, out var _); - }); - } - /// /// Test. ///