loaded more proxy info for proxy protocol v1

kerryjiang · Aug 11, 2024 · e512f75 · e512f75
1 parent 6f3ee11
commit e512f75
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/SuperSocket.ProtoBase/ProxyProtocol/ProxyProtocolV1PartReader.cs b/src/SuperSocket.ProtoBase/ProxyProtocol/ProxyProtocolV1PartReader.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Buffers;
-using System.Collections;
-using System.Collections.Generic;
 using System.Net;
+using System.Net.Sockets;
 using System.Text;
-using Microsoft.VisualBasic;
 
 namespace SuperSocket.ProtoBase.ProxyProtocol
 {
@@ -35,9 +33,15 @@ public override bool Process(TPackageInfo package, object filterContext, ref Seq
             var proxyLineReader = new SequenceReader<byte>(proxyLineSequence);
 
             var proxyLine = proxyLineReader.ReadString();
-
-            LoadProxyInfo(filterContext as ProxyInfo, proxyLine, 12, 13);
-
+
+            var proxyInfo = filterContext as ProxyInfo;
+
+            LoadProxyInfo(proxyInfo, proxyLine, 12, 13);
+
+            proxyInfo.Version = 1;
+            proxyInfo.Command = ProxyCommand.PROXY;
+            proxyInfo.ProtocolType = ProtocolType.Tcp;
+
             return true;
         }
 

diff --git a/test/SuperSocket.Tests/ProxyProtocolHostConfigurator.cs b/test/SuperSocket.Tests/ProxyProtocolHostConfigurator.cs
@@ -1,4 +1,6 @@
+using System;
 using System.IO;
+using System.Net;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
@@ -54,7 +56,7 @@ public Socket CreateClient()
         public async ValueTask<Stream> GetClientStream(Socket socket)
         {
             var stream = await _innerHostConfigurator.GetClientStream(socket);
-
+            
             await stream.WriteAsync(_proxyProtocolV2_IPV4_SampleData, 0, _proxyProtocolV2_IPV4_SampleData.Length);
             await stream.FlushAsync();