修正Listen端口0时，某些情况无法将实际端口正确写回Port属性的BUG

VSBrilyakov · May 25, 2017 · 50f4ec9 · 50f4ec9
1 parent a5950fd
commit 50f4ec9
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/Net/Net.CrossHttpParams.pas b/Net/Net.CrossHttpParams.pas
@@ -344,6 +344,11 @@   TFormField = class
     /// </param>
     function AsString(AEncoding: TEncoding = nil): string;
 
+    /// <summary>
+    ///   释放流数据
+    /// </summary>
+    procedure FreeValue;
+
     /// <summary>
     ///   名称
     /// </summary>
@@ -766,7 +771,7 @@   TSessions = class(TSessionsBase)
 implementation
 
 uses
-  Utils.Utils;
+  Utils.Utils, Utils.DateTime;
 
 { TNameValue }
 
@@ -1208,15 +1213,20 @@ constructor TFormField.Create;
 
 destructor TFormField.Destroy;
 begin
-  if Assigned(FValue) then
-    FreeAndNil(FValue);
+  FreeValue;
 
   if FAutoDeleteFile and (FFilePath <> '') and TFile.Exists(FFilePath) then
     TFile.Delete(FFilePath);
 
   inherited;
 end;
 
+procedure TFormField.FreeValue;
+begin
+  if Assigned(FValue) then
+    FreeAndNil(FValue);
+end;
+
 function TFormField.AsBytes: TBytes;
 var
   LBytesStream: TBytesStream;

diff --git a/Net/Net.CrossServer.pas b/Net/Net.CrossServer.pas
@@ -106,15 +106,26 @@ procedure TCrossServer.Stop;
 
 procedure TCrossServer.TriggerListened(ASocket: THandle);
 var
+  LPort: Word;
   LAddr: TRawSockAddrIn;
   LStuff: string;
 begin
   inherited;
 
+  LPort := AtomicCmpExchange(FPort, 0, 0);
+
   // 如果是监听的随机端口
   // 则在监听成功之后将实际的端口取出来
-  if (FPort = 0) and (TSocketAPI.GetSockName(ASocket, @LAddr.Addr, LAddr.AddrLen) = 0) then
-    TSocketAPI.ExtractAddrInfo(@LAddr.Addr, LAddr.AddrLen, LStuff, FPort);
+  if (LPort = 0) then
+  begin
+    FillChar(LAddr, SizeOf(TRawSockAddrIn), 0);
+    LAddr.AddrLen := SizeOf(LAddr.Addr6);
+    if (TSocketAPI.GetSockName(ASocket, @LAddr.Addr, LAddr.AddrLen) = 0) then
+    begin
+      TSocketAPI.ExtractAddrInfo(@LAddr.Addr, LAddr.AddrLen, LStuff, LPort);
+      AtomicExchange(FPort, LPort);
+    end;
+  end;
 end;
 
 end.
diff --git a/Net/Net.CrossSocket.pas b/Net/Net.CrossSocket.pas
@@ -405,6 +405,12 @@   TCrossSocket = class(TCustomCrossSocket)
     ///     <item>
     ///       '::', 监听所有IPv6地址
     ///     </item>
+    ///     <item>
+    ///       '127.0.0.1', 监听本地IPv4回环地址
+    ///     </item>
+    ///     <item>
+    ///       '::1', 监听本地IPv6回环地址
+    ///     </item>
     ///   </list>
     /// </param>
     /// <param name="APort">
@@ -420,7 +426,7 @@   TCrossSocket = class(TCustomCrossSocket)
     ///       非0, 调用失败
     ///     </item>
     ///   </list>
-    ///   当OnListened触发时才表明监听成功 <br />
+    ///   当OnListened触发时才表明监听成功
     /// </returns>
     function Listen(const AHost: string; APort: Word;
       const ACallback: TProc<THandle, Boolean> = nil): Integer; override;
@@ -835,6 +841,7 @@ procedure TCustomCrossSocket.TriggerConnected(ASocket: THandle;
       (LConnection as TCrossConnection).FOwner := Self;
       (LConnection as TCrossConnection).FSocket := ASocket;
       (LConnection as TCrossConnection).FConnectType := AConnectType;
+      FillChar(LAddr, SizeOf(TRawSockAddrIn), 0);
       LAddr.AddrLen := SizeOf(LAddr.Addr6);
       if (TSocketAPI.GetPeerName(ASocket, @LAddr.Addr, LAddr.AddrLen) = 0) then
         TSocketAPI.ExtractAddrInfo(@LAddr.Addr, LAddr.AddrLen,

diff --git a/Net/Net.CrossSslServer.pas b/Net/Net.CrossSslServer.pas
@@ -87,7 +87,7 @@ procedure TCrossSslServer.Start(const ACallback: TProc<Boolean>);
   StartLoop;
 
   Listen(FAddr, FPort,
-    procedure(ASuccess: Boolean)
+    procedure(ASocket: THandle; ASuccess: Boolean)
     begin
       if not ASuccess then
         AtomicExchange(FStarted, 0);