Implement IConnectionEndPointFeature in TransportConnection

Co-authored-by: BrennanConroy <7574801+BrennanConroy@users.noreply.github.com>
dotnet · Copilot · May 29, 2025 · May 29, 2025 · May 30, 2025 · Jun 7, 2025
commit 55b9034369f8d409262ea84b5b9bdad67b319fc3
@@ -3,6 +3,7 @@
 
 using System.Buffers;
 using System.IO.Pipelines;
+using System.Net;
 using Microsoft.AspNetCore.Connections.Features;
 
 #nullable enable
@@ -37,4 +38,16 @@ CancellationToken IConnectionLifetimeFeature.ConnectionClosed
     }
 
     void IConnectionLifetimeFeature.Abort() => Abort(new ConnectionAbortedException("The connection was aborted by the application via IConnectionLifetimeFeature.Abort()."));
+
+    EndPoint? IConnectionEndPointFeature.LocalEndPoint
+    {
+        get => LocalEndPoint;
+        set => LocalEndPoint = value;
+    }
+
+    EndPoint? IConnectionEndPointFeature.RemoteEndPoint
+    {
+        get => RemoteEndPoint;
+        set => RemoteEndPoint = value;
+    }
 }
@@ -18,14 +18,16 @@ internal partial class TransportConnection : IFeatureCollection,
                                                  IConnectionTransportFeature,
                                                  IConnectionItemsFeature,
                                                  IMemoryPoolFeature,
-                                                 IConnectionLifetimeFeature
+                                                 IConnectionLifetimeFeature,
+                                                 IConnectionEndPointFeature
     {
         // Implemented features
         internal protected IConnectionIdFeature? _currentIConnectionIdFeature;
         internal protected IConnectionTransportFeature? _currentIConnectionTransportFeature;
         internal protected IConnectionItemsFeature? _currentIConnectionItemsFeature;
         internal protected IMemoryPoolFeature? _currentIMemoryPoolFeature;
         internal protected IConnectionLifetimeFeature? _currentIConnectionLifetimeFeature;
+        internal protected IConnectionEndPointFeature? _currentIConnectionEndPointFeature;
 
         // Other reserved feature slots
         internal protected IPersistentStateFeature? _currentIPersistentStateFeature;
@@ -48,6 +50,7 @@ private void FastReset()
             _currentIConnectionItemsFeature = this;
             _currentIMemoryPoolFeature = this;
             _currentIConnectionLifetimeFeature = this;
+            _currentIConnectionEndPointFeature = this;
 
             _currentIPersistentStateFeature = null;
             _currentIConnectionSocketFeature = null;
@@ -180,6 +183,10 @@ private void ExtraFeatureSet(Type key, object? value)
                 {
                     feature = _currentIConnectionMetricsTagsFeature;
                 }
+                else if (key == typeof(IConnectionEndPointFeature))
+                {
+                    feature = _currentIConnectionEndPointFeature;
+                }
                 else if (MaybeExtra != null)
                 {
                     feature = ExtraFeatureGet(key);
@@ -244,6 +251,10 @@ private void ExtraFeatureSet(Type key, object? value)
                 {
                     _currentIConnectionMetricsTagsFeature = (IConnectionMetricsTagsFeature?)value;
                 }
+                else if (key == typeof(IConnectionEndPointFeature))
+                {
+                    _currentIConnectionEndPointFeature = (IConnectionEndPointFeature?)value;
+                }
                 else
                 {
                     ExtraFeatureSet(key, value);
@@ -310,6 +321,10 @@ private void ExtraFeatureSet(Type key, object? value)
             {
                 feature = Unsafe.As<IConnectionMetricsTagsFeature?, TFeature?>(ref _currentIConnectionMetricsTagsFeature);
             }
+            else if (typeof(TFeature) == typeof(IConnectionEndPointFeature))
+            {
+                feature = Unsafe.As<IConnectionEndPointFeature?, TFeature?>(ref _currentIConnectionEndPointFeature);
+            }
             else if (MaybeExtra != null)
             {
                 feature = (TFeature?)(ExtraFeatureGet(typeof(TFeature)));
@@ -382,6 +397,10 @@ private void ExtraFeatureSet(Type key, object? value)
             {
                 _currentIConnectionMetricsTagsFeature = Unsafe.As<TFeature?, IConnectionMetricsTagsFeature?>(ref feature);
             }
+            else if (typeof(TFeature) == typeof(IConnectionEndPointFeature))
+            {
+                _currentIConnectionEndPointFeature = Unsafe.As<TFeature?, IConnectionEndPointFeature?>(ref feature);
+            }
             else
             {
                 ExtraFeatureSet(typeof(TFeature), feature);
@@ -442,6 +461,10 @@ private IEnumerable<KeyValuePair<Type, object>> FastEnumerable()
             {
                 yield return new KeyValuePair<Type, object>(typeof(IConnectionMetricsTagsFeature), _currentIConnectionMetricsTagsFeature);
             }
+            if (_currentIConnectionEndPointFeature != null)
+            {
+                yield return new KeyValuePair<Type, object>(typeof(IConnectionEndPointFeature), _currentIConnectionEndPointFeature);
+            }
 
             if (MaybeExtra != null)
             {

@@ -24,7 +24,8 @@ public static string GenerateFile()
             "IStreamIdFeature",
             "IStreamAbortFeature",
             "IStreamClosedFeature",
-            "IConnectionMetricsTagsFeature"
+            "IConnectionMetricsTagsFeature",
+            "IConnectionEndPointFeature"
         };
 
         var implementedFeatures = new[]
@@ -33,7 +34,8 @@ public static string GenerateFile()
             "IConnectionTransportFeature",
             "IConnectionItemsFeature",
             "IMemoryPoolFeature",
-            "IConnectionLifetimeFeature"
+            "IConnectionLifetimeFeature",
+            "IConnectionEndPointFeature"
         };
 
         var usings = $@"