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

* Handle recursion for address queries, CNames are also possible (bug ID 34480)

Browse Source 
git-svn-id: trunk@42934 -
This commit is contained in:
michael 2019-09-07 15:02:12 +00:00
parent aee20cd54d
commit 560c0b228e
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1033,7 +1033,7 @@ begin
end; end;
end; end;
Function ResolveAddressAt(Resolver : Integer; Address : String; Var Names : Array of String) : Integer; Function ResolveAddressAt(Resolver : Integer; Address : String; Var Names : Array of String; Recurse: Integer) : Integer;
Var Var
@ -1056,13 +1056,29 @@ begin
I:=0; I:=0;
While (I<=MaxAnswer) and NextRR(Ans.Payload,AnsStart,AnsLen,RR) do While (I<=MaxAnswer) and NextRR(Ans.Payload,AnsStart,AnsLen,RR) do
begin begin
if (Ntohs(RR.AType)=DNSQRY_PTR) and (1=NtoHS(RR.AClass)) then Case Ntohs(RR.AType) of
DNSQRY_PTR:
if (1=NtoHS(RR.AClass)) then
begin begin
Names[i]:=BuildName(Ans.Payload,AnsStart,AnsLen); Names[i]:=BuildName(Ans.Payload,AnsStart,AnsLen);
inc(Result); inc(Result);
RR.RDLength := ntohs(RR.RDLength); RR.RDLength := ntohs(RR.RDLength);
Inc(AnsStart,RR.RDLength); Inc(AnsStart,RR.RDLength);
end; end;
DNSQRY_CNAME:
begin
if Recurse >= MaxRecursion then
begin
Result := -1;
exit;
end;
rr.rdlength := ntohs(rr.rdlength);
setlength(Address, rr.rdlength);
address := stringfromlabel(ans.payload, ansstart);
Result := ResolveAddressAt(Resolver, Address, Names, Recurse+1);
exit;
end;
end;
Inc(I); Inc(I);
end; end;
end; end;
@ -1084,7 +1100,7 @@ begin
S:=Format('%d.%d.%d.%d.in-addr.arpa',[nt.s_bytes[4],nt.s_bytes[3],nt.s_bytes[2],nt.s_bytes[1]]); S:=Format('%d.%d.%d.%d.in-addr.arpa',[nt.s_bytes[4],nt.s_bytes[3],nt.s_bytes[2],nt.s_bytes[1]]);
While (Result=0) and (I<=high(DNSServers)) do While (Result=0) and (I<=high(DNSServers)) do
begin begin
Result:=ResolveAddressAt(I,S,Addresses); Result:=ResolveAddressAt(I,S,Addresses,1);
Inc(I); Inc(I);
end; end;
end; end;
@ -1111,7 +1127,7 @@ begin
I := 0; I := 0;
While (Result=0) and (I<=high(DNSServers)) do While (Result=0) and (I<=high(DNSServers)) do
begin begin
Result:=ResolveAddressAt(I,S,Addresses); Result:=ResolveAddressAt(I,S,Addresses,1);
Inc(I); Inc(I);
end; end;
end; end;