Переглянути джерело

* fix use of deprecated fields.

git-svn-id: trunk@29387 -
marco 10 роки тому
батько
коміт
f2d4792342

+ 6 - 6
packages/fcl-net/src/fpsock.pp

@@ -512,9 +512,9 @@ var
   SockAddr: TInetSockAddr;
 begin
   inherited DoConnect;
-  SockAddr.Family := AF_INET;
-  SockAddr.Port := ShortHostToNet(Port);
-  SockAddr.Addr := Cardinal(HostAddr);
+  SockAddr.sin_Family := AF_INET;
+  SockAddr.sin_Port := ShortHostToNet(Port);
+  SockAddr.sin_Addr.s_addr := Cardinal(HostAddr);
   if Sockets.FpConnect(Stream.Handle, @SockAddr, SizeOf(SockAddr))<>0 Then
     if (SocketError <> sys_EINPROGRESS) and (SocketError <> 0) then
       raise ESocketError.CreateFmt(SSocketConnectFailed,
@@ -558,9 +558,9 @@ begin
       Sockets.fpSetSockOpt(Socket, SOL_SOCKET, SO_REUSEADDR,
         @TrueValue, SizeOf(TrueValue));
       FStream := TSocketStream.Create(Socket);
-      Addr.Family := AF_INET;
-      Addr.Port := ShortHostToNet(Port);
-      Addr.Addr := 0;
+      Addr.sin_Family := AF_INET;
+      Addr.sin_Port := ShortHostToNet(Port);
+      Addr.sin_Addr.s_addr := 0;
       if  fpBind(Socket, @Addr, SizeOf(Addr))<>0 then
         raise ESocketError.CreateFmt(SSocketBindingError,
           [Port, StrError(SocketError)]);

+ 3 - 3
packages/fcl-net/src/netdb.pp

@@ -763,9 +763,9 @@ begin
     exit;
   With SA do
     begin
-    family:=AF_INET;
-    port:=htons(DNSport);
-    addr:=cardinal(DNSServers[Resolver]); // dnsservers already in net order
+    sin_family:=AF_INET;
+    sin_port:=htons(DNSport);
+    sin_addr.s_addr:=cardinal(DNSServers[Resolver]); // dnsservers already in net order
     end;
   fpsendto(sock,@qry,qrylen+12,0,@SA,SizeOf(SA));
   // Wait for answer.

+ 5 - 5
utils/fppkg/lnet/lcommon.pp

@@ -512,15 +512,15 @@ end;
 procedure FillAddressInfo(var aAddrInfo: TLSocketAddress; const aFamily: sa_family_t;
   const Address: string; const aPort: Word);
 begin
-  aAddrInfo.IPv4.family := aFamily;
-  aAddrInfo.IPv4.Port := htons(aPort);
+  aAddrInfo.IPv4.sin_family := aFamily;
+  aAddrInfo.IPv4.sin_Port := htons(aPort);
 
   case aFamily of
     LAF_INET  :
       begin
-        aAddrInfo.IPv4.Addr := StrToNetAddr(Address);
-        if (Address <> LADDR_ANY) and (aAddrInfo.IPv4.Addr = 0) then
-          aAddrInfo.IPv4.Addr := StrToNetAddr(GetHostIP(Address));
+        aAddrInfo.IPv4.sin_Addr.s_addr := StrToNetAddr(Address);
+        if (Address <> LADDR_ANY) and (aAddrInfo.IPv4.sin_Addr.s_addr = 0) then
+          aAddrInfo.IPv4.sin_Addr.s_addr := StrToNetAddr(GetHostIP(Address));
       end;
     LAF_INET6 :
       begin