fix incompatible type

zamronypj · Jul 8, 2019 · 0c9c34a · 0c9c34a
1 parent 8bfbb4a
commit 0c9c34a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Libs/Socket/InetSocketSvrImpl.pas b/Libs/Socket/InetSocketSvrImpl.pas
@@ -101,7 +101,7 @@ implementation
     procedure TInetSocketSvr.bind();
     begin
         FInetAddr.sin_family := AF_INET;
-        FInetAddr.sin_port := ShortHostToNet(FPort);
+        FInetAddr.sin_port := htons(FPort);
         FInetAddr.sin_addr.s_addr := LongWord(StrToNetAddr(FHost));
         if fpBind(fListenSocket, @FInetAddr, sizeof(FInetAddr)) <> 0 then
         begin
@@ -116,8 +116,10 @@ implementation
      * @return client socket which data can be read
      *-----------------------------------------------*)
     function TInetSocketSvr.accept(listenSocket : longint) : longint;
+    var addrLen : TSockLen;
     begin
-        result := fpAccept(listenSocket, @FInetAddr, sizeof(FInetAddr));
+        addrLen := sizeof(FInetAddr);
+        result := fpAccept(listenSocket, @FInetAddr, @addrLen);
     end;
 
 end.
diff --git a/Libs/Socket/UnixSocketSvrImpl.pas b/Libs/Socket/UnixSocketSvrImpl.pas
@@ -119,8 +119,11 @@ implementation
      * @return client socket which data can be read
      *-----------------------------------------------*)
     function TUnixSocketSvr.accept(listenSocket : longint) : longint;
+    var addrLen : TSockLen;
     begin
-        result := fpAccept(listenSocket, @FUnixAddr, fSocketAddrLen);
+        addrLen := fSocketAddrLen;
+        result := fpAccept(listenSocket, @FUnixAddr, @addrLen);
+        fSocketAddrLen := addrLen;
     end;
 
     (*!-----------------------------------------------