paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-19 18:51:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix use of deprecated fields.

Browse Source 
git-svn-id: trunk@29387 -
This commit is contained in:
marco 2015-01-04 17:36:48 +00:00
parent 645058353e
commit f2d4792342
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/fcl-net/src/fpsock.pp
View File

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

6
packages/fcl-net/src/netdb.pp
View File

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

10
utils/fppkg/lnet/lcommon.pp
View File

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