Added QuicException.TransportErrorCode#88550

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
ManickaP merged 6 commits into from
Jul 17, 2023
Merged

Added QuicException.TransportErrorCode #88550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f2acad7
Added QuicException.TransportErrorCode
AlexRadch Jul 9, 2023
b5c80dc
Code review by Tomas Weinfurt @wfurt
AlexRadch Jul 9, 2023
2a98a42
@ManickaP Marie Píchová code review
AlexRadch Jul 10, 2023
f70bd29
@ManickaP Marie Píchová code review
AlexRadch Jul 10, 2023
a41c1ec
@ManickaP Marie Píchová code review
AlexRadch Jul 10, 2023
1772b0d
Feedback about error code casts
ManickaP Jul 17, 2023
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 src/libraries/System.Net.Quic/ref/System.Net.Quic.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public sealed partial class QuicException : System.IO.IOException
{
public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
public long? ApplicationErrorCode { get { throw null; } }
public long? TransportErrorCode { get { throw null; } }
public System.Net.Quic.QuicError QuicError { get { throw null; } }
}
public sealed partial class QuicListener : System.IAsyncDisposable
Expand Down
11 changes: 2 additions & 9 deletions src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicHelpers.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,11 +67,7 @@ internal static unsafe T GetMsQuicParameter<T>(MsQuicSafeHandle handle, uint par
&length,
(byte*)&value);

if (StatusFailed(status))
{
throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"GetParam({handle}, {parameter}) failed");
}

ThrowHelper.ThrowIfMsQuicError(status, $"GetParam({handle}, {parameter}) failed");

@stephentoubstephentoubJul 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.

@ManickaPManickaPJul 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to address this in some of my future PRs. Or @wfurt do you think you could revert these two in #88614?

@wfurtwfurtJul 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is ok in interim as it is only perf optimization. I feel it is more important to get the API out.

return value;
}

Expand All@@ -84,9 +80,6 @@ internal static unsafe void SetMsQuicParameter<T>(MsQuicSafeHandle handle, uint
(uint)sizeof(T),
(byte*)&value);

if (StatusFailed(status))
{
throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"SetParam({handle}, {parameter}) failed");
}
ThrowHelper.ThrowIfMsQuicError(status, $"SetParam({handle}, {parameter}) failed");

@stephentoubstephentoubJul 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.

}
}
29 changes: 15 additions & 14 deletions src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.Quic;
using System.Security.Authentication;
using System.Net.Security;
using System.Net.Sockets;
using static Microsoft.Quic.MsQuic;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;

namespace System.Net.Quic;

Expand DownExpand Up@@ -38,21 +38,21 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
else if (status == QUIC_STATUS_INVALID_STATE)
{
// If status == QUIC_STATUS_INVALID_STATE, we have closed the connection.
exception = ThrowHelper.GetOperationAbortedException();
exception = GetOperationAbortedException();
return true;
}
else if (StatusFailed(status))
{
exception = ThrowHelper.GetExceptionForMsQuicStatus(status);
exception = GetExceptionForMsQuicStatus(status);
return true;
}
exception = null;
return false;
}

internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
internal static Exception GetExceptionForMsQuicStatus(int status, long? errorCode = default, string? message = null)
{
Exception ex = GetExceptionInternal(status, message);
Exception ex = GetExceptionInternal(status, errorCode, message);
if (status != 0)
{
// Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -61,17 +61,17 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

return ex;

static Exception GetExceptionInternal(int status, string? message)
static Exception GetExceptionInternal(int status, long? errorCode, string? message)
{
//
// Start by checking for statuses mapped to QuicError enum
//
if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, SR.net_quic_connection_refused);
if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, SR.net_quic_timeout);
if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, SR.net_quic_ver_neg_error);
if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, SR.net_quic_connection_idle);
if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, SR.net_quic_protocol_error);
if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, SR.net_quic_protocol_error);
if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, errorCode, SR.net_quic_connection_refused);
if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, errorCode, SR.net_quic_timeout);
if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, errorCode, SR.net_quic_ver_neg_error);
if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, errorCode, SR.net_quic_connection_idle);
if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, errorCode, SR.net_quic_protocol_error);
if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, errorCode, SR.net_quic_protocol_error);

//
// Transport errors will throw SocketException
Expand All@@ -81,7 +81,7 @@ static Exception GetExceptionInternal(int status, string? message)
if (status == QUIC_STATUS_UNREACHABLE) return new SocketException((int)SocketError.HostUnreachable);

//
// TLS and certificate erros throw AuthenticationException to match SslStream
// TLS and certificate errors throw AuthenticationException to match SslStream
//
if (status == QUIC_STATUS_TLS_ERROR ||
status == QUIC_STATUS_CERT_EXPIRED ||
Expand DownExpand Up@@ -125,11 +125,12 @@ static Exception GetExceptionInternal(int status, string? message)
}
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal static void ThrowIfMsQuicError(int status, string? message = null)
{
if (StatusFailed(status))
{
throw GetExceptionForMsQuicStatus(status, message);
throw GetExceptionForMsQuicStatus(status, message: message);
}
}

Expand Down
8 changes: 3 additions & 5 deletions src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public sealed partial class QuicConnection : IAsyncDisposable
/// <summary>
/// The actual secret structure wrapper passed to MsQuic.
/// </summary>
private MsQuicTlsSecret? _tlsSecret;
private readonly MsQuicTlsSecret? _tlsSecret;
#endif

/// <summary>
Expand DownExpand Up@@ -304,7 +304,7 @@ private async ValueTask FinishConnectAsync(QuicClientConnectionOptions options,

// RFC 6066 forbids IP literals
// DNI mapping is handled by MsQuic
var hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
string hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
? string.Empty
: options.ClientAuthenticationOptions.TargetHost ?? string.Empty;

Expand DownExpand Up@@ -492,9 +492,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
}
private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
{
// TODO: we should propagate transport error code.
// https://github.com/dotnet/runtime/issues/72666
Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, (long)data.ErrorCode));
_connectedTcs.TrySetException(exception);
_acceptQueue.Writer.TryComplete(exception);
return QUIC_STATUS_SUCCESS;
Expand Down
31 changes: 30 additions & 1 deletion src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,18 @@ public sealed class QuicException : IOException
/// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
/// <param name="message">The message for the exception.</param>
public QuicException(QuicError error, long? applicationErrorCode, string message)
: this(error, applicationErrorCode, message, null)
: this(error, applicationErrorCode, null, message, null)
{ }

/// <summary>
/// Initializes a new instance of the <see cref='QuicException'/> class.
/// </summary>
/// <param name="error">The error associated with the exception.</param>
/// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
/// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
/// <param name="message">The message for the exception.</param>
internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message)
: this(error, applicationErrorCode, transportErrorCode, message, null)
{ }

/// <summary>
Expand All@@ -28,10 +39,23 @@ public QuicException(QuicError error, long? applicationErrorCode, string message
/// <param name="message">The message for the exception.</param>
/// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
internal QuicException(QuicError error, long? applicationErrorCode, string message, Exception? innerException)
: this(error, applicationErrorCode, null, message, innerException)
{ }

/// <summary>
/// Initializes a new instance of the <see cref='QuicException'/> class.
/// </summary>
/// <param name="error">The error associated with the exception.</param>
/// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
/// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
/// <param name="message">The message for the exception.</param>
/// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
Comment thread
AlexRadch marked this conversation as resolved.
: base(message, innerException)
{
QuicError = error;
ApplicationErrorCode = applicationErrorCode;
TransportErrorCode = transportErrorCode;
}

/// <summary>
Expand All@@ -46,4 +70,9 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
/// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
/// </remarks>
public long? ApplicationErrorCode { get; }

/// <summary>
/// The transport protocol error code associated with the error.
/// </summary>
public long? TransportErrorCode { get; }
}
8 changes: 2 additions & 6 deletions src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -581,13 +581,9 @@ private unsafe int HandleEventShutdownComplete(ref SHUTDOWN_COMPLETE_DATA data)
// It's local shutdown by app, this side called QuicConnection.CloseAsync, throw QuicError.OperationAborted.
(shutdownByApp: true, closedRemotely: false) => ThrowHelper.GetOperationAbortedException(),
// It's remote shutdown by transport, we received a CONNECTION_CLOSE frame with a QUIC transport error code, throw error based on the status.
// TODO: we should propagate the transport error code
// https://github.com/dotnet/runtime/issues/72666
(shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, $"Shutdown by transport {data.ConnectionErrorCode}"),
(shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode, $"Shutdown by transport {data.ConnectionErrorCode}"),
// It's local shutdown by transport, most likely due to a timeout, throw error based on the status.
// TODO: we should propagate the transport error code
// https://github.com/dotnet/runtime/issues/72666
(shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus),
(shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode),
};
_startedTcs.TrySetException(exception);
_receiveTcs.TrySetException(exception, final: true);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Added QuicException.TransportErrorCode#88550

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

ManickaP
merged 6 commits into

from

Jul 17, 2023
 Merged


Added QuicException.TransportErrorCode
#88550
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2acad7

Added QuicException.TransportErrorCode


AlexRadch Jul 9, 2023
b5c80dc

Code review by Tomas Weinfurt @wfurt


AlexRadch Jul 9, 2023
2a98a42

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
f70bd29

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
a41c1ec

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
1772b0d

Feedback about error code casts


ManickaP Jul 17, 2023

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
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
Expand Down

11 changes: 2 additions & 9 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,11 +67,7 @@ internal static unsafe T GetMsQuicParameter<T>(MsQuicSafeHandle handle, uint par
 &length,
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"GetParam({handle}, {parameter}) failed");
 }

 ThrowHelper.ThrowIfMsQuicError(status, $"GetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
@ManickaPManickaPJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to address this in some of my future PRs. Or @wfurt do you think you could revert these two in #88614?
@wfurtwfurtJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is ok in interim as it is only perf optimization. I feel it is more important to get the API out.
 return value;
 }

Expand All@@ -84,9 +80,6 @@ internal static unsafe void SetMsQuicParameter<T>(MsQuicSafeHandle handle, uint
 (uint)sizeof(T),
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"SetParam({handle}, {parameter}) failed");
 }
 ThrowHelper.ThrowIfMsQuicError(status, $"SetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
 }
}

29 changes: 15 additions & 14 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.Quic;
using System.Security.Authentication;
using System.Net.Security;
using System.Net.Sockets;
using static Microsoft.Quic.MsQuic;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;

namespace System.Net.Quic;

Expand DownExpand Up@@ -38,21 +38,21 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 else if (status == QUIC_STATUS_INVALID_STATE)
 {
 // If status == QUIC_STATUS_INVALID_STATE, we have closed the connection.
 exception = ThrowHelper.GetOperationAbortedException();
 exception = GetOperationAbortedException();
 return true;
 }
 else if (StatusFailed(status))
 {
 exception = ThrowHelper.GetExceptionForMsQuicStatus(status);
 exception = GetExceptionForMsQuicStatus(status);
 return true;
 }
 exception = null;
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, long? errorCode = default, string? message = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, errorCode, message);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -61,17 +61,17 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, long? errorCode, string? message)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
 //
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, errorCode, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, errorCode, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, errorCode, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, errorCode, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, errorCode, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, errorCode, SR.net_quic_protocol_error);

 //
 // Transport errors will throw SocketException
Expand All@@ -81,7 +81,7 @@ static Exception GetExceptionInternal(int status, string? message)
 if (status == QUIC_STATUS_UNREACHABLE) return new SocketException((int)SocketError.HostUnreachable);

 //
 // TLS and certificate erros throw AuthenticationException to match SslStream
 // TLS and certificate errors throw AuthenticationException to match SslStream
 //
 if (status == QUIC_STATUS_TLS_ERROR ||
 status == QUIC_STATUS_CERT_EXPIRED ||
Expand DownExpand Up@@ -125,11 +125,12 @@ static Exception GetExceptionInternal(int status, string? message)
 }
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 internal static void ThrowIfMsQuicError(int status, string? message = null)
 {
 if (StatusFailed(status))
 {
 throw GetExceptionForMsQuicStatus(status, message);
 throw GetExceptionForMsQuicStatus(status, message: message);
 }
 }

Expand Down

8 changes: 3 additions & 5 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public sealed partial class QuicConnection : IAsyncDisposable
 /// <summary>
 /// The actual secret structure wrapper passed to MsQuic.
 /// </summary>
 private MsQuicTlsSecret? _tlsSecret;
 private readonly MsQuicTlsSecret? _tlsSecret;
#endif

 /// <summary>
Expand DownExpand Up@@ -304,7 +304,7 @@ private async ValueTask FinishConnectAsync(QuicClientConnectionOptions options,

 // RFC 6066 forbids IP literals
 // DNI mapping is handled by MsQuic
var hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
string hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
 ? string.Empty
 : options.ClientAuthenticationOptions.TargetHost ?? string.Empty;

Expand DownExpand Up@@ -492,9 +492,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

31 changes: 30 additions & 1 deletion
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,18 @@ public sealed class QuicException : IOException
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 public QuicException(QuicError error, long? applicationErrorCode, string message)
 : this(error, applicationErrorCode, message, null)
 : this(error, applicationErrorCode, null, message, null)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message)
 : this(error, applicationErrorCode, transportErrorCode, message, null)
 { }

 /// <summary>
Expand All@@ -28,10 +39,23 @@ public QuicException(QuicError error, long? applicationErrorCode, string message
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, string message, Exception? innerException)
 : this(error, applicationErrorCode, null, message, innerException)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
Comment thread
AlexRadch marked this conversation as resolved.

 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
Expand All@@ -46,4 +70,9 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport protocol error code associated with the error.
 /// </summary>
 public long? TransportErrorCode { get; }
}

8 changes: 2 additions & 6 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -581,13 +581,9 @@ private unsafe int HandleEventShutdownComplete(ref SHUTDOWN_COMPLETE_DATA data)
 // It's local shutdown by app, this side called QuicConnection.CloseAsync, throw QuicError.OperationAborted.
 (shutdownByApp: true, closedRemotely: false) => ThrowHelper.GetOperationAbortedException(),
 // It's remote shutdown by transport, we received a CONNECTION_CLOSE frame with a QUIC transport error code, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, $"Shutdown by transport {data.ConnectionErrorCode}"),
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode, $"Shutdown by transport {data.ConnectionErrorCode}"),
 // It's local shutdown by transport, most likely due to a timeout, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus),
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode),
 };
 _startedTcs.TrySetException(exception);
 _receiveTcs.TrySetException(exception, final: true);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Added QuicException.TransportErrorCode#88550

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

ManickaP
merged 6 commits into

from

Jul 17, 2023
 Merged


Added QuicException.TransportErrorCode
#88550
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2acad7

Added QuicException.TransportErrorCode


AlexRadch Jul 9, 2023
b5c80dc

Code review by Tomas Weinfurt @wfurt


AlexRadch Jul 9, 2023
2a98a42

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
f70bd29

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
a41c1ec

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
1772b0d

Feedback about error code casts


ManickaP Jul 17, 2023

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
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
Expand Down

11 changes: 2 additions & 9 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,11 +67,7 @@ internal static unsafe T GetMsQuicParameter<T>(MsQuicSafeHandle handle, uint par
 &length,
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"GetParam({handle}, {parameter}) failed");
 }

 ThrowHelper.ThrowIfMsQuicError(status, $"GetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
@ManickaPManickaPJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to address this in some of my future PRs. Or @wfurt do you think you could revert these two in #88614?
@wfurtwfurtJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is ok in interim as it is only perf optimization. I feel it is more important to get the API out.
 return value;
 }

Expand All@@ -84,9 +80,6 @@ internal static unsafe void SetMsQuicParameter<T>(MsQuicSafeHandle handle, uint
 (uint)sizeof(T),
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"SetParam({handle}, {parameter}) failed");
 }
 ThrowHelper.ThrowIfMsQuicError(status, $"SetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
 }
}

29 changes: 15 additions & 14 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.Quic;
using System.Security.Authentication;
using System.Net.Security;
using System.Net.Sockets;
using static Microsoft.Quic.MsQuic;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;

namespace System.Net.Quic;

Expand DownExpand Up@@ -38,21 +38,21 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 else if (status == QUIC_STATUS_INVALID_STATE)
 {
 // If status == QUIC_STATUS_INVALID_STATE, we have closed the connection.
 exception = ThrowHelper.GetOperationAbortedException();
 exception = GetOperationAbortedException();
 return true;
 }
 else if (StatusFailed(status))
 {
 exception = ThrowHelper.GetExceptionForMsQuicStatus(status);
 exception = GetExceptionForMsQuicStatus(status);
 return true;
 }
 exception = null;
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, long? errorCode = default, string? message = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, errorCode, message);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -61,17 +61,17 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, long? errorCode, string? message)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
 //
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, errorCode, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, errorCode, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, errorCode, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, errorCode, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, errorCode, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, errorCode, SR.net_quic_protocol_error);

 //
 // Transport errors will throw SocketException
Expand All@@ -81,7 +81,7 @@ static Exception GetExceptionInternal(int status, string? message)
 if (status == QUIC_STATUS_UNREACHABLE) return new SocketException((int)SocketError.HostUnreachable);

 //
 // TLS and certificate erros throw AuthenticationException to match SslStream
 // TLS and certificate errors throw AuthenticationException to match SslStream
 //
 if (status == QUIC_STATUS_TLS_ERROR ||
 status == QUIC_STATUS_CERT_EXPIRED ||
Expand DownExpand Up@@ -125,11 +125,12 @@ static Exception GetExceptionInternal(int status, string? message)
 }
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 internal static void ThrowIfMsQuicError(int status, string? message = null)
 {
 if (StatusFailed(status))
 {
 throw GetExceptionForMsQuicStatus(status, message);
 throw GetExceptionForMsQuicStatus(status, message: message);
 }
 }

Expand Down

8 changes: 3 additions & 5 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public sealed partial class QuicConnection : IAsyncDisposable
 /// <summary>
 /// The actual secret structure wrapper passed to MsQuic.
 /// </summary>
 private MsQuicTlsSecret? _tlsSecret;
 private readonly MsQuicTlsSecret? _tlsSecret;
#endif

 /// <summary>
Expand DownExpand Up@@ -304,7 +304,7 @@ private async ValueTask FinishConnectAsync(QuicClientConnectionOptions options,

 // RFC 6066 forbids IP literals
 // DNI mapping is handled by MsQuic
var hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
string hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
 ? string.Empty
 : options.ClientAuthenticationOptions.TargetHost ?? string.Empty;

Expand DownExpand Up@@ -492,9 +492,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

31 changes: 30 additions & 1 deletion
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,18 @@ public sealed class QuicException : IOException
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 public QuicException(QuicError error, long? applicationErrorCode, string message)
 : this(error, applicationErrorCode, message, null)
 : this(error, applicationErrorCode, null, message, null)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message)
 : this(error, applicationErrorCode, transportErrorCode, message, null)
 { }

 /// <summary>
Expand All@@ -28,10 +39,23 @@ public QuicException(QuicError error, long? applicationErrorCode, string message
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, string message, Exception? innerException)
 : this(error, applicationErrorCode, null, message, innerException)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
Comment thread
AlexRadch marked this conversation as resolved.

 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
Expand All@@ -46,4 +70,9 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport protocol error code associated with the error.
 /// </summary>
 public long? TransportErrorCode { get; }
}

8 changes: 2 additions & 6 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -581,13 +581,9 @@ private unsafe int HandleEventShutdownComplete(ref SHUTDOWN_COMPLETE_DATA data)
 // It's local shutdown by app, this side called QuicConnection.CloseAsync, throw QuicError.OperationAborted.
 (shutdownByApp: true, closedRemotely: false) => ThrowHelper.GetOperationAbortedException(),
 // It's remote shutdown by transport, we received a CONNECTION_CLOSE frame with a QUIC transport error code, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, $"Shutdown by transport {data.ConnectionErrorCode}"),
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode, $"Shutdown by transport {data.ConnectionErrorCode}"),
 // It's local shutdown by transport, most likely due to a timeout, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus),
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode),
 };
 _startedTcs.TrySetException(exception);
 _receiveTcs.TrySetException(exception, final: true);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Added QuicException.TransportErrorCode#88550

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

ManickaP
merged 6 commits into

from

Jul 17, 2023
 Merged


Added QuicException.TransportErrorCode
#88550
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2acad7

Added QuicException.TransportErrorCode


AlexRadch Jul 9, 2023
b5c80dc

Code review by Tomas Weinfurt @wfurt


AlexRadch Jul 9, 2023
2a98a42

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
f70bd29

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
a41c1ec

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
1772b0d

Feedback about error code casts


ManickaP Jul 17, 2023

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
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
Expand Down

11 changes: 2 additions & 9 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,11 +67,7 @@ internal static unsafe T GetMsQuicParameter<T>(MsQuicSafeHandle handle, uint par
 &length,
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"GetParam({handle}, {parameter}) failed");
 }

 ThrowHelper.ThrowIfMsQuicError(status, $"GetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
@ManickaPManickaPJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to address this in some of my future PRs. Or @wfurt do you think you could revert these two in #88614?
@wfurtwfurtJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is ok in interim as it is only perf optimization. I feel it is more important to get the API out.
 return value;
 }

Expand All@@ -84,9 +80,6 @@ internal static unsafe void SetMsQuicParameter<T>(MsQuicSafeHandle handle, uint
 (uint)sizeof(T),
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"SetParam({handle}, {parameter}) failed");
 }
 ThrowHelper.ThrowIfMsQuicError(status, $"SetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
 }
}

29 changes: 15 additions & 14 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.Quic;
using System.Security.Authentication;
using System.Net.Security;
using System.Net.Sockets;
using static Microsoft.Quic.MsQuic;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;

namespace System.Net.Quic;

Expand DownExpand Up@@ -38,21 +38,21 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 else if (status == QUIC_STATUS_INVALID_STATE)
 {
 // If status == QUIC_STATUS_INVALID_STATE, we have closed the connection.
 exception = ThrowHelper.GetOperationAbortedException();
 exception = GetOperationAbortedException();
 return true;
 }
 else if (StatusFailed(status))
 {
 exception = ThrowHelper.GetExceptionForMsQuicStatus(status);
 exception = GetExceptionForMsQuicStatus(status);
 return true;
 }
 exception = null;
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, long? errorCode = default, string? message = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, errorCode, message);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -61,17 +61,17 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, long? errorCode, string? message)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
 //
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, errorCode, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, errorCode, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, errorCode, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, errorCode, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, errorCode, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, errorCode, SR.net_quic_protocol_error);

 //
 // Transport errors will throw SocketException
Expand All@@ -81,7 +81,7 @@ static Exception GetExceptionInternal(int status, string? message)
 if (status == QUIC_STATUS_UNREACHABLE) return new SocketException((int)SocketError.HostUnreachable);

 //
 // TLS and certificate erros throw AuthenticationException to match SslStream
 // TLS and certificate errors throw AuthenticationException to match SslStream
 //
 if (status == QUIC_STATUS_TLS_ERROR ||
 status == QUIC_STATUS_CERT_EXPIRED ||
Expand DownExpand Up@@ -125,11 +125,12 @@ static Exception GetExceptionInternal(int status, string? message)
 }
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 internal static void ThrowIfMsQuicError(int status, string? message = null)
 {
 if (StatusFailed(status))
 {
 throw GetExceptionForMsQuicStatus(status, message);
 throw GetExceptionForMsQuicStatus(status, message: message);
 }
 }

Expand Down

8 changes: 3 additions & 5 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public sealed partial class QuicConnection : IAsyncDisposable
 /// <summary>
 /// The actual secret structure wrapper passed to MsQuic.
 /// </summary>
 private MsQuicTlsSecret? _tlsSecret;
 private readonly MsQuicTlsSecret? _tlsSecret;
#endif

 /// <summary>
Expand DownExpand Up@@ -304,7 +304,7 @@ private async ValueTask FinishConnectAsync(QuicClientConnectionOptions options,

 // RFC 6066 forbids IP literals
 // DNI mapping is handled by MsQuic
var hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
string hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
 ? string.Empty
 : options.ClientAuthenticationOptions.TargetHost ?? string.Empty;

Expand DownExpand Up@@ -492,9 +492,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

31 changes: 30 additions & 1 deletion
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,18 @@ public sealed class QuicException : IOException
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 public QuicException(QuicError error, long? applicationErrorCode, string message)
 : this(error, applicationErrorCode, message, null)
 : this(error, applicationErrorCode, null, message, null)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message)
 : this(error, applicationErrorCode, transportErrorCode, message, null)
 { }

 /// <summary>
Expand All@@ -28,10 +39,23 @@ public QuicException(QuicError error, long? applicationErrorCode, string message
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, string message, Exception? innerException)
 : this(error, applicationErrorCode, null, message, innerException)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
Comment thread
AlexRadch marked this conversation as resolved.

 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
Expand All@@ -46,4 +70,9 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport protocol error code associated with the error.
 /// </summary>
 public long? TransportErrorCode { get; }
}

8 changes: 2 additions & 6 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -581,13 +581,9 @@ private unsafe int HandleEventShutdownComplete(ref SHUTDOWN_COMPLETE_DATA data)
 // It's local shutdown by app, this side called QuicConnection.CloseAsync, throw QuicError.OperationAborted.
 (shutdownByApp: true, closedRemotely: false) => ThrowHelper.GetOperationAbortedException(),
 // It's remote shutdown by transport, we received a CONNECTION_CLOSE frame with a QUIC transport error code, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, $"Shutdown by transport {data.ConnectionErrorCode}"),
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode, $"Shutdown by transport {data.ConnectionErrorCode}"),
 // It's local shutdown by transport, most likely due to a timeout, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus),
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode),
 };
 _startedTcs.TrySetException(exception);
 _receiveTcs.TrySetException(exception, final: true);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Added QuicException.TransportErrorCode#88550

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

ManickaP
merged 6 commits into

from

Jul 17, 2023
 Merged


Added QuicException.TransportErrorCode
#88550
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2acad7

Added QuicException.TransportErrorCode


AlexRadch Jul 9, 2023
b5c80dc

Code review by Tomas Weinfurt @wfurt


AlexRadch Jul 9, 2023
2a98a42

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
f70bd29

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
a41c1ec

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
1772b0d

Feedback about error code casts


ManickaP Jul 17, 2023

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
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
Expand Down

11 changes: 2 additions & 9 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,11 +67,7 @@ internal static unsafe T GetMsQuicParameter<T>(MsQuicSafeHandle handle, uint par
 &length,
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"GetParam({handle}, {parameter}) failed");
 }

 ThrowHelper.ThrowIfMsQuicError(status, $"GetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
@ManickaPManickaPJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to address this in some of my future PRs. Or @wfurt do you think you could revert these two in #88614?
@wfurtwfurtJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is ok in interim as it is only perf optimization. I feel it is more important to get the API out.
 return value;
 }

Expand All@@ -84,9 +80,6 @@ internal static unsafe void SetMsQuicParameter<T>(MsQuicSafeHandle handle, uint
 (uint)sizeof(T),
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"SetParam({handle}, {parameter}) failed");
 }
 ThrowHelper.ThrowIfMsQuicError(status, $"SetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
 }
}

29 changes: 15 additions & 14 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.Quic;
using System.Security.Authentication;
using System.Net.Security;
using System.Net.Sockets;
using static Microsoft.Quic.MsQuic;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;

namespace System.Net.Quic;

Expand DownExpand Up@@ -38,21 +38,21 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 else if (status == QUIC_STATUS_INVALID_STATE)
 {
 // If status == QUIC_STATUS_INVALID_STATE, we have closed the connection.
 exception = ThrowHelper.GetOperationAbortedException();
 exception = GetOperationAbortedException();
 return true;
 }
 else if (StatusFailed(status))
 {
 exception = ThrowHelper.GetExceptionForMsQuicStatus(status);
 exception = GetExceptionForMsQuicStatus(status);
 return true;
 }
 exception = null;
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, long? errorCode = default, string? message = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, errorCode, message);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -61,17 +61,17 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, long? errorCode, string? message)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
 //
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, errorCode, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, errorCode, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, errorCode, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, errorCode, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, errorCode, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, errorCode, SR.net_quic_protocol_error);

 //
 // Transport errors will throw SocketException
Expand All@@ -81,7 +81,7 @@ static Exception GetExceptionInternal(int status, string? message)
 if (status == QUIC_STATUS_UNREACHABLE) return new SocketException((int)SocketError.HostUnreachable);

 //
 // TLS and certificate erros throw AuthenticationException to match SslStream
 // TLS and certificate errors throw AuthenticationException to match SslStream
 //
 if (status == QUIC_STATUS_TLS_ERROR ||
 status == QUIC_STATUS_CERT_EXPIRED ||
Expand DownExpand Up@@ -125,11 +125,12 @@ static Exception GetExceptionInternal(int status, string? message)
 }
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 internal static void ThrowIfMsQuicError(int status, string? message = null)
 {
 if (StatusFailed(status))
 {
 throw GetExceptionForMsQuicStatus(status, message);
 throw GetExceptionForMsQuicStatus(status, message: message);
 }
 }

Expand Down

8 changes: 3 additions & 5 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public sealed partial class QuicConnection : IAsyncDisposable
 /// <summary>
 /// The actual secret structure wrapper passed to MsQuic.
 /// </summary>
 private MsQuicTlsSecret? _tlsSecret;
 private readonly MsQuicTlsSecret? _tlsSecret;
#endif

 /// <summary>
Expand DownExpand Up@@ -304,7 +304,7 @@ private async ValueTask FinishConnectAsync(QuicClientConnectionOptions options,

 // RFC 6066 forbids IP literals
 // DNI mapping is handled by MsQuic
var hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
string hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
 ? string.Empty
 : options.ClientAuthenticationOptions.TargetHost ?? string.Empty;

Expand DownExpand Up@@ -492,9 +492,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

31 changes: 30 additions & 1 deletion
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,18 @@ public sealed class QuicException : IOException
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 public QuicException(QuicError error, long? applicationErrorCode, string message)
 : this(error, applicationErrorCode, message, null)
 : this(error, applicationErrorCode, null, message, null)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message)
 : this(error, applicationErrorCode, transportErrorCode, message, null)
 { }

 /// <summary>
Expand All@@ -28,10 +39,23 @@ public QuicException(QuicError error, long? applicationErrorCode, string message
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, string message, Exception? innerException)
 : this(error, applicationErrorCode, null, message, innerException)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
Comment thread
AlexRadch marked this conversation as resolved.

 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
Expand All@@ -46,4 +70,9 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport protocol error code associated with the error.
 /// </summary>
 public long? TransportErrorCode { get; }
}

8 changes: 2 additions & 6 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -581,13 +581,9 @@ private unsafe int HandleEventShutdownComplete(ref SHUTDOWN_COMPLETE_DATA data)
 // It's local shutdown by app, this side called QuicConnection.CloseAsync, throw QuicError.OperationAborted.
 (shutdownByApp: true, closedRemotely: false) => ThrowHelper.GetOperationAbortedException(),
 // It's remote shutdown by transport, we received a CONNECTION_CLOSE frame with a QUIC transport error code, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, $"Shutdown by transport {data.ConnectionErrorCode}"),
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode, $"Shutdown by transport {data.ConnectionErrorCode}"),
 // It's local shutdown by transport, most likely due to a timeout, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus),
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode),
 };
 _startedTcs.TrySetException(exception);
 _receiveTcs.TrySetException(exception, final: true);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Added QuicException.TransportErrorCode#88550

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

ManickaP
merged 6 commits into

from

Jul 17, 2023
 Merged


Added QuicException.TransportErrorCode
#88550
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2acad7

Added QuicException.TransportErrorCode


AlexRadch Jul 9, 2023
b5c80dc

Code review by Tomas Weinfurt @wfurt


AlexRadch Jul 9, 2023
2a98a42

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
f70bd29

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
a41c1ec

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
1772b0d

Feedback about error code casts


ManickaP Jul 17, 2023

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
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
Expand Down

11 changes: 2 additions & 9 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,11 +67,7 @@ internal static unsafe T GetMsQuicParameter<T>(MsQuicSafeHandle handle, uint par
 &length,
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"GetParam({handle}, {parameter}) failed");
 }

 ThrowHelper.ThrowIfMsQuicError(status, $"GetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
@ManickaPManickaPJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to address this in some of my future PRs. Or @wfurt do you think you could revert these two in #88614?
@wfurtwfurtJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is ok in interim as it is only perf optimization. I feel it is more important to get the API out.
 return value;
 }

Expand All@@ -84,9 +80,6 @@ internal static unsafe void SetMsQuicParameter<T>(MsQuicSafeHandle handle, uint
 (uint)sizeof(T),
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"SetParam({handle}, {parameter}) failed");
 }
 ThrowHelper.ThrowIfMsQuicError(status, $"SetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
 }
}

29 changes: 15 additions & 14 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.Quic;
using System.Security.Authentication;
using System.Net.Security;
using System.Net.Sockets;
using static Microsoft.Quic.MsQuic;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;

namespace System.Net.Quic;

Expand DownExpand Up@@ -38,21 +38,21 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 else if (status == QUIC_STATUS_INVALID_STATE)
 {
 // If status == QUIC_STATUS_INVALID_STATE, we have closed the connection.
 exception = ThrowHelper.GetOperationAbortedException();
 exception = GetOperationAbortedException();
 return true;
 }
 else if (StatusFailed(status))
 {
 exception = ThrowHelper.GetExceptionForMsQuicStatus(status);
 exception = GetExceptionForMsQuicStatus(status);
 return true;
 }
 exception = null;
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, long? errorCode = default, string? message = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, errorCode, message);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -61,17 +61,17 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, long? errorCode, string? message)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
 //
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, errorCode, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, errorCode, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, errorCode, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, errorCode, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, errorCode, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, errorCode, SR.net_quic_protocol_error);

 //
 // Transport errors will throw SocketException
Expand All@@ -81,7 +81,7 @@ static Exception GetExceptionInternal(int status, string? message)
 if (status == QUIC_STATUS_UNREACHABLE) return new SocketException((int)SocketError.HostUnreachable);

 //
 // TLS and certificate erros throw AuthenticationException to match SslStream
 // TLS and certificate errors throw AuthenticationException to match SslStream
 //
 if (status == QUIC_STATUS_TLS_ERROR ||
 status == QUIC_STATUS_CERT_EXPIRED ||
Expand DownExpand Up@@ -125,11 +125,12 @@ static Exception GetExceptionInternal(int status, string? message)
 }
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 internal static void ThrowIfMsQuicError(int status, string? message = null)
 {
 if (StatusFailed(status))
 {
 throw GetExceptionForMsQuicStatus(status, message);
 throw GetExceptionForMsQuicStatus(status, message: message);
 }
 }

Expand Down

8 changes: 3 additions & 5 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public sealed partial class QuicConnection : IAsyncDisposable
 /// <summary>
 /// The actual secret structure wrapper passed to MsQuic.
 /// </summary>
 private MsQuicTlsSecret? _tlsSecret;
 private readonly MsQuicTlsSecret? _tlsSecret;
#endif

 /// <summary>
Expand DownExpand Up@@ -304,7 +304,7 @@ private async ValueTask FinishConnectAsync(QuicClientConnectionOptions options,

 // RFC 6066 forbids IP literals
 // DNI mapping is handled by MsQuic
var hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
string hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
 ? string.Empty
 : options.ClientAuthenticationOptions.TargetHost ?? string.Empty;

Expand DownExpand Up@@ -492,9 +492,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

31 changes: 30 additions & 1 deletion
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,18 @@ public sealed class QuicException : IOException
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 public QuicException(QuicError error, long? applicationErrorCode, string message)
 : this(error, applicationErrorCode, message, null)
 : this(error, applicationErrorCode, null, message, null)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message)
 : this(error, applicationErrorCode, transportErrorCode, message, null)
 { }

 /// <summary>
Expand All@@ -28,10 +39,23 @@ public QuicException(QuicError error, long? applicationErrorCode, string message
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, string message, Exception? innerException)
 : this(error, applicationErrorCode, null, message, innerException)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
Comment thread
AlexRadch marked this conversation as resolved.

 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
Expand All@@ -46,4 +70,9 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport protocol error code associated with the error.
 /// </summary>
 public long? TransportErrorCode { get; }
}

8 changes: 2 additions & 6 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -581,13 +581,9 @@ private unsafe int HandleEventShutdownComplete(ref SHUTDOWN_COMPLETE_DATA data)
 // It's local shutdown by app, this side called QuicConnection.CloseAsync, throw QuicError.OperationAborted.
 (shutdownByApp: true, closedRemotely: false) => ThrowHelper.GetOperationAbortedException(),
 // It's remote shutdown by transport, we received a CONNECTION_CLOSE frame with a QUIC transport error code, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, $"Shutdown by transport {data.ConnectionErrorCode}"),
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode, $"Shutdown by transport {data.ConnectionErrorCode}"),
 // It's local shutdown by transport, most likely due to a timeout, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus),
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode),
 };
 _startedTcs.TrySetException(exception);
 _receiveTcs.TrySetException(exception, final: true);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Added QuicException.TransportErrorCode#88550

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

ManickaP
merged 6 commits into

from

Jul 17, 2023
 Merged


Added QuicException.TransportErrorCode
#88550
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2acad7

Added QuicException.TransportErrorCode


AlexRadch Jul 9, 2023
b5c80dc

Code review by Tomas Weinfurt @wfurt


AlexRadch Jul 9, 2023
2a98a42

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
f70bd29

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
a41c1ec

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
1772b0d

Feedback about error code casts


ManickaP Jul 17, 2023

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
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
Expand Down

11 changes: 2 additions & 9 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,11 +67,7 @@ internal static unsafe T GetMsQuicParameter<T>(MsQuicSafeHandle handle, uint par
 &length,
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"GetParam({handle}, {parameter}) failed");
 }

 ThrowHelper.ThrowIfMsQuicError(status, $"GetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
@ManickaPManickaPJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to address this in some of my future PRs. Or @wfurt do you think you could revert these two in #88614?
@wfurtwfurtJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is ok in interim as it is only perf optimization. I feel it is more important to get the API out.
 return value;
 }

Expand All@@ -84,9 +80,6 @@ internal static unsafe void SetMsQuicParameter<T>(MsQuicSafeHandle handle, uint
 (uint)sizeof(T),
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"SetParam({handle}, {parameter}) failed");
 }
 ThrowHelper.ThrowIfMsQuicError(status, $"SetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
 }
}

29 changes: 15 additions & 14 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.Quic;
using System.Security.Authentication;
using System.Net.Security;
using System.Net.Sockets;
using static Microsoft.Quic.MsQuic;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;

namespace System.Net.Quic;

Expand DownExpand Up@@ -38,21 +38,21 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 else if (status == QUIC_STATUS_INVALID_STATE)
 {
 // If status == QUIC_STATUS_INVALID_STATE, we have closed the connection.
 exception = ThrowHelper.GetOperationAbortedException();
 exception = GetOperationAbortedException();
 return true;
 }
 else if (StatusFailed(status))
 {
 exception = ThrowHelper.GetExceptionForMsQuicStatus(status);
 exception = GetExceptionForMsQuicStatus(status);
 return true;
 }
 exception = null;
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, long? errorCode = default, string? message = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, errorCode, message);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -61,17 +61,17 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, long? errorCode, string? message)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
 //
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, errorCode, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, errorCode, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, errorCode, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, errorCode, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, errorCode, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, errorCode, SR.net_quic_protocol_error);

 //
 // Transport errors will throw SocketException
Expand All@@ -81,7 +81,7 @@ static Exception GetExceptionInternal(int status, string? message)
 if (status == QUIC_STATUS_UNREACHABLE) return new SocketException((int)SocketError.HostUnreachable);

 //
 // TLS and certificate erros throw AuthenticationException to match SslStream
 // TLS and certificate errors throw AuthenticationException to match SslStream
 //
 if (status == QUIC_STATUS_TLS_ERROR ||
 status == QUIC_STATUS_CERT_EXPIRED ||
Expand DownExpand Up@@ -125,11 +125,12 @@ static Exception GetExceptionInternal(int status, string? message)
 }
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 internal static void ThrowIfMsQuicError(int status, string? message = null)
 {
 if (StatusFailed(status))
 {
 throw GetExceptionForMsQuicStatus(status, message);
 throw GetExceptionForMsQuicStatus(status, message: message);
 }
 }

Expand Down

8 changes: 3 additions & 5 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public sealed partial class QuicConnection : IAsyncDisposable
 /// <summary>
 /// The actual secret structure wrapper passed to MsQuic.
 /// </summary>
 private MsQuicTlsSecret? _tlsSecret;
 private readonly MsQuicTlsSecret? _tlsSecret;
#endif

 /// <summary>
Expand DownExpand Up@@ -304,7 +304,7 @@ private async ValueTask FinishConnectAsync(QuicClientConnectionOptions options,

 // RFC 6066 forbids IP literals
 // DNI mapping is handled by MsQuic
var hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
string hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
 ? string.Empty
 : options.ClientAuthenticationOptions.TargetHost ?? string.Empty;

Expand DownExpand Up@@ -492,9 +492,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

31 changes: 30 additions & 1 deletion
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,18 @@ public sealed class QuicException : IOException
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 public QuicException(QuicError error, long? applicationErrorCode, string message)
 : this(error, applicationErrorCode, message, null)
 : this(error, applicationErrorCode, null, message, null)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message)
 : this(error, applicationErrorCode, transportErrorCode, message, null)
 { }

 /// <summary>
Expand All@@ -28,10 +39,23 @@ public QuicException(QuicError error, long? applicationErrorCode, string message
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, string message, Exception? innerException)
 : this(error, applicationErrorCode, null, message, innerException)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
Comment thread
AlexRadch marked this conversation as resolved.

 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
Expand All@@ -46,4 +70,9 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport protocol error code associated with the error.
 /// </summary>
 public long? TransportErrorCode { get; }
}

8 changes: 2 additions & 6 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -581,13 +581,9 @@ private unsafe int HandleEventShutdownComplete(ref SHUTDOWN_COMPLETE_DATA data)
 // It's local shutdown by app, this side called QuicConnection.CloseAsync, throw QuicError.OperationAborted.
 (shutdownByApp: true, closedRemotely: false) => ThrowHelper.GetOperationAbortedException(),
 // It's remote shutdown by transport, we received a CONNECTION_CLOSE frame with a QUIC transport error code, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, $"Shutdown by transport {data.ConnectionErrorCode}"),
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode, $"Shutdown by transport {data.ConnectionErrorCode}"),
 // It's local shutdown by transport, most likely due to a timeout, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus),
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode),
 };
 _startedTcs.TrySetException(exception);
 _receiveTcs.TrySetException(exception, final: true);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Added QuicException.TransportErrorCode#88550

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

ManickaP
merged 6 commits into

from

Jul 17, 2023
 Merged


Added QuicException.TransportErrorCode
#88550
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2acad7

Added QuicException.TransportErrorCode


AlexRadch Jul 9, 2023
b5c80dc

Code review by Tomas Weinfurt @wfurt


AlexRadch Jul 9, 2023
2a98a42

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
f70bd29

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
a41c1ec

@ManickaP Marie Píchová code review


AlexRadch Jul 10, 2023
1772b0d

Feedback about error code casts


ManickaP Jul 17, 2023

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
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
Expand Down

11 changes: 2 additions & 9 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,11 +67,7 @@ internal static unsafe T GetMsQuicParameter<T>(MsQuicSafeHandle handle, uint par
 &length,
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"GetParam({handle}, {parameter}) failed");
 }

 ThrowHelper.ThrowIfMsQuicError(status, $"GetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
@ManickaPManickaPJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to address this in some of my future PRs. Or @wfurt do you think you could revert these two in #88614?
@wfurtwfurtJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is ok in interim as it is only perf optimization. I feel it is more important to get the API out.
 return value;
 }

Expand All@@ -84,9 +80,6 @@ internal static unsafe void SetMsQuicParameter<T>(MsQuicSafeHandle handle, uint
 (uint)sizeof(T),
 (byte*)&value);

 if (StatusFailed(status))
 {
 throw ThrowHelper.GetExceptionForMsQuicStatus(status, $"SetParam({handle}, {parameter}) failed");
 }
 ThrowHelper.ThrowIfMsQuicError(status, $"SetParam({handle}, {parameter}) failed");
@stephentoubstephentoubJul 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now going to allocate a string for the error message even in the success case.
 }
}

29 changes: 15 additions & 14 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.Quic;
using System.Security.Authentication;
using System.Net.Security;
using System.Net.Sockets;
using static Microsoft.Quic.MsQuic;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;

namespace System.Net.Quic;

Expand DownExpand Up@@ -38,21 +38,21 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 else if (status == QUIC_STATUS_INVALID_STATE)
 {
 // If status == QUIC_STATUS_INVALID_STATE, we have closed the connection.
 exception = ThrowHelper.GetOperationAbortedException();
 exception = GetOperationAbortedException();
 return true;
 }
 else if (StatusFailed(status))
 {
 exception = ThrowHelper.GetExceptionForMsQuicStatus(status);
 exception = GetExceptionForMsQuicStatus(status);
 return true;
 }
 exception = null;
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, long? errorCode = default, string? message = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, errorCode, message);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -61,17 +61,17 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, long? errorCode, string? message)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
 //
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_CONNECTION_REFUSED) return new QuicException(QuicError.ConnectionRefused, null, errorCode, SR.net_quic_connection_refused);
 if (status == QUIC_STATUS_CONNECTION_TIMEOUT) return new QuicException(QuicError.ConnectionTimeout, null, errorCode, SR.net_quic_timeout);
 if (status == QUIC_STATUS_VER_NEG_ERROR) return new QuicException(QuicError.VersionNegotiationError, null, errorCode, SR.net_quic_ver_neg_error);
 if (status == QUIC_STATUS_CONNECTION_IDLE) return new QuicException(QuicError.ConnectionIdle, null, errorCode, SR.net_quic_connection_idle);
 if (status == QUIC_STATUS_PROTOCOL_ERROR) return new QuicException(QuicError.TransportError, null, errorCode, SR.net_quic_protocol_error);
 if (status == QUIC_STATUS_ALPN_IN_USE) return new QuicException(QuicError.AlpnInUse, null, errorCode, SR.net_quic_protocol_error);

 //
 // Transport errors will throw SocketException
Expand All@@ -81,7 +81,7 @@ static Exception GetExceptionInternal(int status, string? message)
 if (status == QUIC_STATUS_UNREACHABLE) return new SocketException((int)SocketError.HostUnreachable);

 //
 // TLS and certificate erros throw AuthenticationException to match SslStream
 // TLS and certificate errors throw AuthenticationException to match SslStream
 //
 if (status == QUIC_STATUS_TLS_ERROR ||
 status == QUIC_STATUS_CERT_EXPIRED ||
Expand DownExpand Up@@ -125,11 +125,12 @@ static Exception GetExceptionInternal(int status, string? message)
 }
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 internal static void ThrowIfMsQuicError(int status, string? message = null)
 {
 if (StatusFailed(status))
 {
 throw GetExceptionForMsQuicStatus(status, message);
 throw GetExceptionForMsQuicStatus(status, message: message);
 }
 }

Expand Down

8 changes: 3 additions & 5 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public sealed partial class QuicConnection : IAsyncDisposable
 /// <summary>
 /// The actual secret structure wrapper passed to MsQuic.
 /// </summary>
 private MsQuicTlsSecret? _tlsSecret;
 private readonly MsQuicTlsSecret? _tlsSecret;
#endif

 /// <summary>
Expand DownExpand Up@@ -304,7 +304,7 @@ private async ValueTask FinishConnectAsync(QuicClientConnectionOptions options,

 // RFC 6066 forbids IP literals
 // DNI mapping is handled by MsQuic
var hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
string hostname = TargetHostNameHelper.IsValidAddress(options.ClientAuthenticationOptions.TargetHost)
 ? string.Empty
 : options.ClientAuthenticationOptions.TargetHost ?? string.Empty;

Expand DownExpand Up@@ -492,9 +492,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

31 changes: 30 additions & 1 deletion
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,18 @@ public sealed class QuicException : IOException
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 public QuicException(QuicError error, long? applicationErrorCode, string message)
 : this(error, applicationErrorCode, message, null)
 : this(error, applicationErrorCode, null, message, null)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message)
 : this(error, applicationErrorCode, transportErrorCode, message, null)
 { }

 /// <summary>
Expand All@@ -28,10 +39,23 @@ public QuicException(QuicError error, long? applicationErrorCode, string message
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, string message, Exception? innerException)
 : this(error, applicationErrorCode, null, message, innerException)
 { }

 /// <summary>
 /// Initializes a new instance of the <see cref='QuicException'/> class.
 /// </summary>
 /// <param name="error">The error associated with the exception.</param>
 /// <param name="applicationErrorCode">The application protocol error code associated with the error.</param>
 /// <param name="transportErrorCode">The transport protocol error code associated with the error.</param>
 /// <param name="message">The message for the exception.</param>
 /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
Comment thread
AlexRadch marked this conversation as resolved.

 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
Expand All@@ -46,4 +70,9 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport protocol error code associated with the error.
 /// </summary>
 public long? TransportErrorCode { get; }
}

8 changes: 2 additions & 6 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -581,13 +581,9 @@ private unsafe int HandleEventShutdownComplete(ref SHUTDOWN_COMPLETE_DATA data)
 // It's local shutdown by app, this side called QuicConnection.CloseAsync, throw QuicError.OperationAborted.
 (shutdownByApp: true, closedRemotely: false) => ThrowHelper.GetOperationAbortedException(),
 // It's remote shutdown by transport, we received a CONNECTION_CLOSE frame with a QUIC transport error code, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, $"Shutdown by transport {data.ConnectionErrorCode}"),
 (shutdownByApp: false, closedRemotely: true) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode, $"Shutdown by transport {data.ConnectionErrorCode}"),
 // It's local shutdown by transport, most likely due to a timeout, throw error based on the status.
 // TODO: we should propagate the transport error code
 // https://github.com/dotnet/runtime/issues/72666
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus),
 (shutdownByApp: false, closedRemotely: false) => ThrowHelper.GetExceptionForMsQuicStatus(data.ConnectionCloseStatus, (long)data.ConnectionErrorCode),
 };
 _startedTcs.TrySetException(exception);
 _receiveTcs.TrySetException(exception, final: true);
Expand Down