Skip to content

Avoid generating unnecessary strings for comparison. #1407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid generating unnecessary strings for comparison. #1407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions src/CompilerServices/MemoryExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using System.Text;

namespace SIPSorcery;

internal static class MemoryExtensions
{
public static string ToLowerString(this ReadOnlySpan<char> span)
{
var stringBuilder = new StringBuilder(span.Length);

foreach (var c in span)
{
stringBuilder.Append(char.ToLower(c));
}

return stringBuilder.ToString();
}
}
41 changes: 41 additions & 0 deletions src/CompilerServices/ProtocolTypeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
using System.Net.Sockets;

namespace SIPSorcery;

internal static class ProtocolTypeExtensions
{
public static string ToLowerString(this ProtocolType protocolType)
{
return protocolType switch
{
ProtocolType.IP => "ip",

ProtocolType.Icmp => "icmp",
ProtocolType.Igmp => "igmp",
ProtocolType.Ggp => "ggp",

ProtocolType.IPv4 => "ipv4",
ProtocolType.Tcp => "tcp",
ProtocolType.Pup => "pup",
ProtocolType.Udp => "udp",
ProtocolType.Idp => "idp",
ProtocolType.IPv6 => "ipv6",
ProtocolType.IPv6RoutingHeader => "routing",
ProtocolType.IPv6FragmentHeader => "fragment",
ProtocolType.IPSecEncapsulatingSecurityPayload => "ipsecencapsulatingsecuritypayload",
ProtocolType.IPSecAuthenticationHeader => "ipsecauthenticationheader",
ProtocolType.IcmpV6 => "icmpv6",
ProtocolType.IPv6NoNextHeader => "nonext",
ProtocolType.IPv6DestinationOptions => "dstopts",
ProtocolType.ND => "nd",
ProtocolType.Raw => "raw",

ProtocolType.Ipx => "ipx",
ProtocolType.Spx => "spx",
ProtocolType.SpxII => "spx2",
ProtocolType.Unknown => "unknown",

_ => protocolType.ToString().ToLowerInvariant()
};
}
}
12 changes: 12 additions & 0 deletions src/CompilerServices/StringBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;
using System.Text;

namespace SIPSorcery
{
internal static class StringBuilderExtensions
{
#if NETSTANDARD2_0|| NET462
public static StringBuilder Append(this StringBuilder builder, ReadOnlySpan<char> value) => builder.Append(value.ToString());
#endif
}
}
14 changes: 13 additions & 1 deletion src/SIPSorcery.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,26 @@
<PackageReference Include="Concentus" Version="2.2.2" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" />
<PackageReference Include="DnsClient" Version="1.8.0" />
<PackageReference Include="Roslynator.Analyzers" Version="4.13.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeFixes" Version="4.13.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Refactorings" Version="4.13.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SIPSorcery.WebSocketSharp" Version="0.0.1" />
<PackageReference Include="SIPSorceryMedia.Abstractions" Version="8.0.10" />
<PackageReference Include="System.Net.Security" Version="4.3.2" />
<PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
</ItemGroup>

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net462;net5.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net8.0</TargetFrameworks>
<LangVersion>10.0</LangVersion>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
Expand Down
78 changes: 52 additions & 26 deletions src/core/SIP/SIPConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,43 +616,69 @@ public static class SIPExtensionHeaders
/// <returns>A list of extensions that were understood and a boolean indicating whether any unknown extensions were present.</returns>
public static List<SIPExtensions> ParseSIPExtensions(string extensionList, out string unknownExtensions)
{
List<SIPExtensions> knownExtensions = new List<SIPExtensions>();
unknownExtensions = null;
List<SIPExtensions> knownExtensions = new();
StringBuilder unknownBuilder = null;

if (String.IsNullOrEmpty(extensionList) == false)
if (string.IsNullOrWhiteSpace(extensionList))
{
string[] extensions = extensionList.Trim().Split(',');
unknownExtensions = null;
return knownExtensions;
}

ReadOnlySpan<char> remaining = extensionList.AsSpan();
while (true)
{
int commaIndex = remaining.IndexOf(',');
ReadOnlySpan<char> extension = commaIndex == -1 ? remaining.Trim() : remaining.Slice(0, commaIndex).Trim();

foreach (string extension in extensions)
if (!extension.IsEmpty)
{
if (String.IsNullOrEmpty(extension) == false)
SIPExtensions? parsedExtension = null;
if (extension.Equals(PRACK.AsSpan(), StringComparison.OrdinalIgnoreCase))
{
parsedExtension = SIPExtensions.Prack;
}
else if (extension.Equals(NO_REFER_SUB.AsSpan(), StringComparison.OrdinalIgnoreCase))
{
parsedExtension = SIPExtensions.NoReferSub;
}
else if (extension.Equals(REPLACES.AsSpan(), StringComparison.OrdinalIgnoreCase))
{
parsedExtension = SIPExtensions.Replaces;
}
else if (extension.Equals(SIPREC.AsSpan(), StringComparison.OrdinalIgnoreCase))
{
parsedExtension = SIPExtensions.SipRec;
}
else if (extension.Equals(MULTIPLE_REFER.AsSpan(), StringComparison.OrdinalIgnoreCase))
{
parsedExtension = SIPExtensions.MultipleRefer;
}

if (parsedExtension.HasValue)
{
knownExtensions.Add(parsedExtension.GetValueOrDefault());
}
else
{
string trimmedExtension = extension.Trim().ToLower();
switch (trimmedExtension)
unknownBuilder ??= new StringBuilder();
if (unknownBuilder.Length > 0)
{
case PRACK:
knownExtensions.Add(SIPExtensions.Prack);
break;
case NO_REFER_SUB:
knownExtensions.Add(SIPExtensions.NoReferSub);
break;
case REPLACES:
knownExtensions.Add(SIPExtensions.Replaces);
break;
case SIPREC:
knownExtensions.Add(SIPExtensions.SipRec);
break;
case MULTIPLE_REFER:
knownExtensions.Add(SIPExtensions.MultipleRefer);
break;
default:
unknownExtensions += (unknownExtensions != null) ? $",{extension.Trim()}" : extension.Trim();
break;
unknownBuilder.Append(',');
}
unknownBuilder.Append(extension);
}
}

if (commaIndex == -1)
{
break;
}

remaining = remaining.Slice(commaIndex + 1);
}

unknownExtensions = unknownBuilder?.ToString();
return knownExtensions;
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/core/SIP/SIPEndPoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@ public static SIPEndPoint ParseSIPEndPoint(string sipEndPointStr)
return null;
}

if (sipEndPointStr.ToLower().StartsWith("udp:") ||
sipEndPointStr.ToLower().StartsWith("tcp:") ||
sipEndPointStr.ToLower().StartsWith("tls:") ||
sipEndPointStr.ToLower().StartsWith("ws:") ||
sipEndPointStr.ToLower().StartsWith("wss:"))
if (sipEndPointStr.StartsWith("udp:", StringComparison.OrdinalIgnoreCase) ||
sipEndPointStr.StartsWith("tcp:", StringComparison.OrdinalIgnoreCase) ||
sipEndPointStr.StartsWith("tls:", StringComparison.OrdinalIgnoreCase) ||
sipEndPointStr.StartsWith("ws:", StringComparison.OrdinalIgnoreCase) ||
sipEndPointStr.StartsWith("wss:", StringComparison.OrdinalIgnoreCase))
{
return ParseSerialisedSIPEndPoint(sipEndPointStr);
}
Expand Down
Loading