Skip to content

Refactor RTP string comparisons to use string.Equals #1660

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

Merged
sipsorcery merged 1 commit into from
Jun 1, 2026
Merged

Refactor RTP string comparisons to use string.Equals #1660

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
11 changes: 3 additions & 8 deletions src/SIPSorcery/net/RTP/RTPHeaderExtensions/TransportWideCCExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,9 @@ public class TransportWideCCExtension : RTPHeaderExtension

public override bool MatchesExtension(string uri)
{
switch (uri.ToLower())
{
case RTP_HEADER_EXTENSION_URI:
case "urn:ietf:params:rtp-hdrext:transport-wide-cc": //official urn registered with IANA
case "http://www.webrtc.org/experiments/rtp-hdrext/transport-wide-cc-02":
return true;
}
return false;
return string.Equals(uri, RTP_HEADER_EXTENSION_URI, StringComparison.OrdinalIgnoreCase) ||
string.Equals(uri, "urn:ietf:params:rtp-hdrext:transport-wide-cc", StringComparison.OrdinalIgnoreCase) ||
string.Equals(uri, "http://www.webrtc.org/experiments/rtp-hdrext/transport-wide-cc-02", StringComparison.OrdinalIgnoreCase);
}


Expand Down
34 changes: 18 additions & 16 deletions src/SIPSorcery/net/RTP/RTPSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
Expand Down Expand Up @@ -666,35 +667,36 @@ protected void AddRemoteSDPSsrcAttributes(SDPMediaTypesEnum mediaType, List<SDPS

protected void LogRemoteSDPSsrcAttributes()
{
string str = "Audio:[ ";
var stringBuilder = new StringBuilder("Audio:[ ");
foreach (var audioRemoteSDPSsrcAttribute in audioRemoteSDPSsrcAttributes)
{
foreach (var attr in audioRemoteSDPSsrcAttribute)
{
str += attr.SSRC + " - ";
stringBuilder.Append(attr.SSRC).Append(" - ");
}
}
str += "] \r\n Video: [ ";
stringBuilder.Append("] \r\n Video: [ ");
foreach (var videoRemoteSDPSsrcAttribute in videoRemoteSDPSsrcAttributes)
{
str += " [";
stringBuilder.Append(" [");
foreach (var attr in videoRemoteSDPSsrcAttribute)
{
str += attr.SSRC + " - ";
stringBuilder.Append(attr.SSRC).Append(" - ");
}
str += "] ";
stringBuilder.Append("] ");
}
str += "] \r\n Text: [ ";
stringBuilder.Append("] \r\n Text: [ ");
foreach (var textRemoteSDPSsrcAttribute in textRemoteSDPSsrcAttributes)
{
str += " [";
stringBuilder.Append(" [");
foreach (var attr in textRemoteSDPSsrcAttribute)
{
str += attr.SSRC + " - ";
stringBuilder.Append(attr.SSRC).Append(" - ");
}
str += "] ";
stringBuilder.Append("] ");
}
str += " ]";
stringBuilder.Append(" ]");
var str = stringBuilder.ToString();
logger.LogDebug("LogRemoteSDPSsrcAttributes: {RemoteSDPSsrcAttributes}", str);
}

Expand Down Expand Up @@ -1231,16 +1233,16 @@ public virtual SetDescriptionResultEnum SetRemoteDescription(SdpType sdpType, SD
// Adjust the local track's RTP event capability if the remote party has specified a different payload ID.
var currentLocalTrackCapabilities = currentMediaStream.LocalTrack.Capabilities;
SDPAudioVideoMediaFormat? localRTPEventCapabilities = null;
if (currentLocalTrackCapabilities.Any(x => x.Name().ToLower() == SDP.TELEPHONE_EVENT_ATTRIBUTE))
if (currentLocalTrackCapabilities.Any(x => string.Equals(x.Name(), SDP.TELEPHONE_EVENT_ATTRIBUTE, StringComparison.OrdinalIgnoreCase)))
{
localRTPEventCapabilities = currentLocalTrackCapabilities.First(x => x.Name().ToLower() == SDP.TELEPHONE_EVENT_ATTRIBUTE);
localRTPEventCapabilities = currentLocalTrackCapabilities.First(x => string.Equals(x.Name(), SDP.TELEPHONE_EVENT_ATTRIBUTE, StringComparison.OrdinalIgnoreCase));
}
else
{
localRTPEventCapabilities = MediaStream.DefaultRTPEventFormat;
}

currentMediaStream.LocalTrack.Capabilities = capabilities.Where(x => x.Name().ToLower() != SDP.TELEPHONE_EVENT_ATTRIBUTE).ToList();
currentMediaStream.LocalTrack.Capabilities = capabilities.Where(x => !string.Equals(x.Name(), SDP.TELEPHONE_EVENT_ATTRIBUTE, StringComparison.OrdinalIgnoreCase)).ToList();
if (localRTPEventCapabilities != null)
{
currentMediaStream.LocalTrack.Capabilities.Add(localRTPEventCapabilities.Value);
Expand All @@ -1251,7 +1253,7 @@ public virtual SetDescriptionResultEnum SetRemoteDescription(SdpType sdpType, SD
if (!commonEventFormat.IsEmpty())
{
currentMediaStream.NegotiatedRtpEventPayloadID = commonEventFormat.ID;
currentMediaStream.LocalTrack.Capabilities.RemoveAll(x => x.Name().ToLower() == SDP.TELEPHONE_EVENT_ATTRIBUTE);
currentMediaStream.LocalTrack.Capabilities.RemoveAll(x => string.Equals(x.Name(), SDP.TELEPHONE_EVENT_ATTRIBUTE, StringComparison.OrdinalIgnoreCase));
currentMediaStream.LocalTrack.Capabilities.Add(commonEventFormat);
}
}
Expand Down Expand Up @@ -1295,7 +1297,7 @@ public virtual SetDescriptionResultEnum SetRemoteDescription(SdpType sdpType, SD

if (currentMediaStream.MediaType == SDPMediaTypesEnum.audio)
{
if (capabilities?.Where(x => x.Name().ToLower() != SDP.TELEPHONE_EVENT_ATTRIBUTE).Count() == 0)
if (capabilities?.Where(x => !string.Equals(x.Name(), SDP.TELEPHONE_EVENT_ATTRIBUTE, StringComparison.OrdinalIgnoreCase)).Count() == 0)
{
return SetDescriptionResultEnum.AudioIncompatible;
}
Expand Down
6 changes: 3 additions & 3 deletions src/SIPSorcery/net/RTP/Streams/AudioStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public async Task SendDtmfEvent(RTPEvent rtpEvent, CancellationToken cancellatio
{
if (rtpEventInProgress)
{
logger.LogWarning(nameof(SendDtmfEvent) + " an RTPEvent is already in progress.");
logger.LogWarning("{Method} an RTPEvent is already in progress.", nameof(SendDtmfEvent));
return;
}

Expand Down Expand Up @@ -285,12 +285,12 @@ public virtual Task SendDtmf(byte key, CancellationToken ct)
public void CheckAudioFormatsNegotiation()
{
if (LocalTrack != null &&
LocalTrack.Capabilities.Where(x => x.Name().ToLower() != SDP.TELEPHONE_EVENT_ATTRIBUTE).Count() > 0)
LocalTrack.Capabilities.Where(x => !string.Equals(x.Name(), SDP.TELEPHONE_EVENT_ATTRIBUTE, StringComparison.OrdinalIgnoreCase)).Count() > 0)
{
OnAudioFormatsNegotiatedByIndex?.Invoke(
Index,
LocalTrack.Capabilities
.Where(x => x.Name().ToLower() != SDP.TELEPHONE_EVENT_ATTRIBUTE)
.Where(x => !string.Equals(x.Name(), SDP.TELEPHONE_EVENT_ATTRIBUTE, StringComparison.OrdinalIgnoreCase))
.Select(x => x.ToAudioFormat()).ToList());
}
}
Expand Down
Loading