Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .nuget/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.exe
25 changes: 3 additions & 22 deletions Source/NETworkManager.Models/Network/IPv4Address.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,7 @@ public static bool IsMulticast(IPAddress ipAddress)
/// <returns>IP addresses as string.</returns>
public static object ConvertIPAddressListToString(IEnumerable<IPAddress> ipAddresses, string delimiter = null)
{
var result = string.Empty;

foreach (var ipAddr in ipAddresses)
{
if (!string.IsNullOrEmpty(result))
result += delimiter ?? Environment.NewLine;

result += ipAddr.ToString();
}

return result;
return string.Join(delimiter ?? Environment.NewLine, ipAddresses);
}

/// <summary>
Expand All @@ -121,16 +111,7 @@ public static object ConvertIPAddressListToString(IEnumerable<IPAddress> ipAddre
public static object ConvertIPAddressWithSubnetmaskListToString(Tuple<IPAddress, IPAddress>[] ipAddresses,
string delimiter = null)
{
var result = string.Empty;

foreach (var ipAddr in ipAddresses)
{
if (!string.IsNullOrEmpty(result))
result += delimiter ?? Environment.NewLine;

result += ipAddr.Item1 + "/" + Subnetmask.ConvertSubnetmaskToCidr(ipAddr.Item2);
}

return result;
return string.Join(delimiter ?? Environment.NewLine,
ipAddresses.Select(ipAddr => $"{ipAddr.Item1}/{Subnetmask.ConvertSubnetmaskToCidr(ipAddr.Item2)}"));
}
}
5 changes: 1 addition & 4 deletions Source/NETworkManager.Models/Network/Subnetmask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ public static SubnetmaskInfo GetFromCidr(int cidr)

public static string ConvertCidrToSubnetmask(int cidr)
{
var bits = string.Empty;

for (var i = 0; i < cidr; i++)
bits += "1";
var bits = new string('1', cidr);

return IPv4Address.ToHumanString(bits.PadRight(32, '0'));
}
Expand Down