Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f6e8034
Chore: file scoped namespace
lduchosal Mar 29, 2025
ea13e52
Feat: sign assembly
lduchosal Mar 29, 2025
9507714
Fix: documentation and warnings
lduchosal Mar 29, 2025
12bd551
Chore: split IPNetwork2 into multiple partial classes
lduchosal Mar 29, 2025
3866507
Chore: split IPNetwork2
lduchosal Mar 29, 2025
86f3561
Chore: document partial classes
lduchosal Mar 29, 2025
65e0cab
Fix: order methodes
lduchosal Mar 29, 2025
8f3cc9a
Chore: documentd
lduchosal Mar 29, 2025
b65ff9b
Chore: cleanup
lduchosal Mar 29, 2025
4ffef5d
Feat: document and code cleanup
lduchosal Mar 29, 2025
1bae8a6
Fix: unit tests
lduchosal Mar 29, 2025
635d704
Fix: unit tests
lduchosal Mar 29, 2025
2e547a6
Chore: file scoped namespace
lduchosal Mar 29, 2025
62c38b3
Feat: sign assembly
lduchosal Mar 29, 2025
1bad7f5
Fix: documentation and warnings
lduchosal Mar 29, 2025
4b56d10
Chore: split IPNetwork2 into multiple partial classes
lduchosal Mar 29, 2025
ac88690
Chore: split IPNetwork2
lduchosal Mar 29, 2025
6a57e8a
Chore: document partial classes
lduchosal Mar 29, 2025
ddcfdc4
Fix: order methodes
lduchosal Mar 29, 2025
85ce100
Chore: cleanup
lduchosal Mar 29, 2025
cc41998
Feat: document and code cleanup
lduchosal Mar 29, 2025
fcabb99
Fix: unit tests
lduchosal Mar 29, 2025
7fc103f
Fix: unit tests
lduchosal Mar 29, 2025
7939bc7
Merge remote-tracking branch 'origin/feat/code-quality' into feat/cod…
lduchosal Mar 29, 2025
abc6272
Fix: Assert IsTrue IsFalse
lduchosal Mar 29, 2025
b8dcad7
Fix: code
lduchosal Mar 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ConsoleApplication/ActionEnum.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace System.Net;

/// <summary>
/// Switch and actions
/// Switch and actions.
/// </summary>
public enum ActionEnum
{
Expand Down
3 changes: 1 addition & 2 deletions src/System.Net.IPNetwork/BigIntegerExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,7 @@ public static string ToOctalString(this BigInteger bigint)
///
/// </summary>
/// <param name="input">The positive number to bitwise reverse.</param>
/// <param name="width">The width of the parameter.
/// </param>
/// <param name="width">The width of the parameter.</param>
/// <returns>A number representing the input bitwise reversed.</returns>
public static BigInteger PositiveReverse(this BigInteger input, int width)
{
Expand Down
27 changes: 13 additions & 14 deletions src/System.Net.IPNetwork/CidrClassLess.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,20 @@ public sealed class CidrClassLess : ICidrGuess
/// <returns>true if ip was converted successfully; otherwise, false.</returns>
public bool TryGuessCidr(string ip, out byte cidr)
{
IPAddress ipaddress = null;
bool parsed = IPAddress.TryParse(string.Format("{0}", ip), out ipaddress);
if (parsed == false)
{
cidr = 0;
return false;
}

if (ipaddress.AddressFamily == AddressFamily.InterNetworkV6)
{
cidr = 128;
return true;
}
bool parsed = IPAddress.TryParse(string.Format("{0}", ip), out IPAddress ipaddress);
if (parsed == false)
{
cidr = 0;
return false;
}

cidr = 32;
if (ipaddress.AddressFamily == AddressFamily.InterNetworkV6)
{
cidr = 128;
return true;
}

cidr = 32;
return true;
}
}
2 changes: 1 addition & 1 deletion src/System.Net.IPNetwork/IPNetwork2ToCidr.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private static void InternalToCidr(bool tryParse, IPAddress netmask, out byte? c
return;
}

bool parsed = IPNetwork2.TryToBigInteger(netmask, out BigInteger? uintNetmask2);
IPNetwork2.TryToBigInteger(netmask, out BigInteger? uintNetmask2);

// 20180217 lduchosal
// impossible to reach code.
Expand Down
5 changes: 2 additions & 3 deletions src/System.Net.IPNetwork/IPNetwork2TryGuessCidr.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,13 @@ public static bool TryGuessCidr(string ip, out byte cidr)
/// <returns>true if cidr was converted successfully; otherwise, false.</returns>
public static bool TryParseCidr(string sidr, AddressFamily family, out byte? cidr)
{
byte b = 0;
if (!byte.TryParse(sidr, out b))
if (!byte.TryParse(sidr, out byte b))
{
cidr = null;
return false;
}

if (!IPNetwork2.TryToNetmask(b, family, out IPAddress netmask))
if (!IPNetwork2.TryToNetmask(b, family, out IPAddress _))
{
cidr = null;
return false;
Expand Down
2 changes: 2 additions & 0 deletions src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
}

var ipnetwork = new IPNetwork2(0, startIP.AddressFamily, 0);
// ReSharper disable once ConditionIsAlwaysTrueOrFalse

Check warning on line 52 in src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs

View workflow job for this annotation

GitHub Actions / build

Check warning on line 52 in src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs

View workflow job for this annotation

GitHub Actions / build

Check warning on line 52 in src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs

View workflow job for this annotation

GitHub Actions / build

Check warning on line 52 in src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs

View workflow job for this annotation

GitHub Actions / build

for (byte cidr = 32; cidr >= 0; cidr--)
{
var wideSubnet = IPNetwork2.Parse(start, cidr);
Expand Down Expand Up @@ -151,6 +152,7 @@
}

var ipn = new IPNetwork2(0, family, 0);
// ReSharper disable once ConditionIsAlwaysTrueOrFalse

Check warning on line 155 in src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs

View workflow job for this annotation

GitHub Actions / build

Check warning on line 155 in src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs

View workflow job for this annotation

GitHub Actions / build

Check warning on line 155 in src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs

View workflow job for this annotation

GitHub Actions / build

Check warning on line 155 in src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs

View workflow job for this annotation

GitHub Actions / build

for (byte cidr = nnin0.cidr; cidr >= 0; cidr--)
{
var wideSubnet = new IPNetwork2(uintNnin0, family, cidr);
Expand Down
30 changes: 12 additions & 18 deletions src/TestProject/CidrClassFullIpv4UnitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ public void TestTryGuessCidrNull()
{
var cidrguess = new CidrClassFull();

byte cidr;
bool parsed = cidrguess.TryGuessCidr(null, out cidr);
bool parsed = cidrguess.TryGuessCidr(null, out byte cidr);

Assert.AreEqual(false, parsed, "parsed");
Assert.IsFalse(parsed, "parsed");
Assert.AreEqual(0, cidr, "cidr");
}

Expand All @@ -33,10 +32,9 @@ public void TestTryGuessCidrA()
{
var cidrguess = new CidrClassFull();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out cidr);
bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(8, cidr, "cidr");
}

Expand All @@ -48,10 +46,9 @@ public void TestTryGuessCidrB()
{
var cidrguess = new CidrClassFull();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out cidr);
bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(16, cidr, "cidr");
}

Expand All @@ -63,10 +60,9 @@ public void TestTryGuessCidrC()
{
var cidrguess = new CidrClassFull();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out cidr);
bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(24, cidr, "cidr");
}

Expand All @@ -78,10 +74,9 @@ public void TestTryGuessCidrD()
{
var cidrguess = new CidrClassFull();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out cidr);
bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(24, cidr, "cidr");
}

Expand All @@ -93,10 +88,9 @@ public void TestTryGuessCidrE()
{
var cidrguess = new CidrClassFull();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out cidr);
bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(24, cidr, "cidr");
}
}
15 changes: 6 additions & 9 deletions src/TestProject/CidrClassFullIpv6UnitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ public void TestIpV6TryGuessCidrNull()
{
var cidrguess = new CidrClassFull();

byte cidr;
bool parsed = cidrguess.TryGuessCidr(null, out cidr);
bool parsed = cidrguess.TryGuessCidr(null, out byte cidr);

Assert.AreEqual(false, parsed, "parsed");
Assert.IsFalse(parsed, "parsed");
Assert.AreEqual(0, cidr, "cidr");
}

Expand All @@ -33,10 +32,9 @@ public void TestIpV6TryGuessCidr1()
{
var cidrguess = new CidrClassFull();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("::", out cidr);
bool parsed = cidrguess.TryGuessCidr("::", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(64, cidr, "cidr");
}

Expand All @@ -48,10 +46,9 @@ public void TestIpV6TryGuessCidr2()
{
var cidrguess = new CidrClassFull();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out cidr);
bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(64, cidr, "cidr");
}
}
45 changes: 18 additions & 27 deletions src/TestProject/CidrClassLessUnitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ public void TestTryGuessCidrNull()
{
var cidrguess = new CidrClassLess();

byte cidr;
bool parsed = cidrguess.TryGuessCidr(null, out cidr);
bool parsed = cidrguess.TryGuessCidr(null, out byte cidr);

Assert.AreEqual(false, parsed, "parsed");
Assert.IsFalse(parsed, "parsed");
Assert.AreEqual(0, cidr, "cidr");
}

Expand All @@ -35,10 +34,9 @@ public void TestTryGuessCidrA()
{
var cidrguess = new CidrClassLess();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out cidr);
bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(32, cidr, "cidr");
}

Expand All @@ -50,10 +48,9 @@ public void TestTryGuessCidrB()
{
var cidrguess = new CidrClassLess();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out cidr);
bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(32, cidr, "cidr");
}

Expand All @@ -65,10 +62,9 @@ public void TestTryGuessCidrC()
{
var cidrguess = new CidrClassLess();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out cidr);
bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(32, cidr, "cidr");
}

Expand All @@ -80,10 +76,9 @@ public void TestTryGuessCidrD()
{
var cidrguess = new CidrClassLess();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out cidr);
bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(32, cidr, "cidr");
}

Expand All @@ -95,10 +90,9 @@ public void TestTryGuessCidrE()
{
var cidrguess = new CidrClassLess();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out cidr);
bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(32, cidr, "cidr");
}

Expand All @@ -114,10 +108,9 @@ public void TestIpV6TryGuessCidrNull()
{
var cidrguess = new CidrClassLess();

byte cidr;
bool parsed = cidrguess.TryGuessCidr(null, out cidr);
bool parsed = cidrguess.TryGuessCidr(null, out byte cidr);

Assert.AreEqual(false, parsed, "parsed");
Assert.IsFalse(parsed, "parsed");
Assert.AreEqual(0, cidr, "cidr");
}

Expand All @@ -129,10 +122,9 @@ public void TestIpV6TryGuessCidr1()
{
var cidrguess = new CidrClassLess();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("::", out cidr);
bool parsed = cidrguess.TryGuessCidr("::", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(128, cidr, "cidr");
}

Expand All @@ -144,10 +136,9 @@ public void TestIpV6TryGuessCidr2()
{
var cidrguess = new CidrClassLess();

byte cidr;
bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out cidr);
bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out byte cidr);

Assert.AreEqual(true, parsed, "parsed");
Assert.IsTrue(parsed, "parsed");
Assert.AreEqual(128, cidr, "cidr");
}

Expand Down
8 changes: 4 additions & 4 deletions src/TestProject/ContainsUnitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void TestContainsStatic3()
IPNetwork2 ipnetwork2 = null;

#pragma warning disable 0618
bool result = IPNetwork2.Contains(ipnetwork, ipnetwork2);
IPNetwork2.Contains(ipnetwork, ipnetwork2);
#pragma warning restore 0618
}

Expand Down Expand Up @@ -91,7 +91,7 @@ public void TestContains8()
var ipnetwork = IPNetwork2.Parse("0.0.0.0/0");
IPNetwork2 ipnetwork2 = null;

bool result = ipnetwork.Contains(ipnetwork2);
ipnetwork.Contains(ipnetwork2);
}

/// <summary>
Expand All @@ -105,7 +105,7 @@ public void TestContainsStatic1()
IPAddress ipaddress = null;

#pragma warning disable 0618
bool result = IPNetwork2.Contains(ipnetwork, ipaddress);
IPNetwork2.Contains(ipnetwork, ipaddress);
#pragma warning restore 0618
}

Expand Down Expand Up @@ -134,7 +134,7 @@ public void TestContains10()
var ipnetwork = IPNetwork2.Parse("0.0.0.0/0");
IPAddress ipaddress = null;

bool result = ipnetwork.Contains(ipaddress);
ipnetwork.Contains(ipaddress);
}

/// <summary>
Expand Down
Loading
Loading