From 0adfe669aa893eb7e5626d01034a298e2af1c6fc Mon Sep 17 00:00:00 2001
From: yury <jura@cp-lab.com>
Date: Sat, 20 Aug 2016 11:47:02 +0000
Subject: [PATCH] * android: Fixed netdb. Load DNS servers from system
 properties.

git-svn-id: trunk@34355 -
---
 packages/fcl-net/src/netdb.pp | 63 ++++++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/packages/fcl-net/src/netdb.pp b/packages/fcl-net/src/netdb.pp
index e770e5e05f..4978b5e833 100644
--- a/packages/fcl-net/src/netdb.pp
+++ b/packages/fcl-net/src/netdb.pp
@@ -131,8 +131,11 @@ Var
   CheckHostsFileAge     : Boolean; 
   TimeOutS,TimeOutMS    : Longint;
   
-  
+{$ifdef android}
+Function GetDNSServers : Integer;
+{$else}
 Function GetDNSServers(FN : String) : Integer;
+{$endif android}
 
 Function ResolveName(HostName : String; Var Addresses : Array of THostAddr) : Integer;
 Function ResolveName6(HostName : String; Var Addresses : Array of THostAddr6) : Integer;
@@ -463,6 +466,54 @@ end;
    Resolve.conf handling
   ---------------------------------------------------------------------}
 
+{$ifdef android}
+
+Function GetDNSServers: Integer;
+var
+  i: integer;
+  s: string;
+  H : THostAddr;
+begin
+  Result:=0;
+  SetLength(DNSServers, 9);
+  for i:=1 to 9 do
+    begin
+      s:=GetSystemProperty(PAnsiChar('net.dns' + IntToStr(i)));
+      if s = '' then
+        break;
+      H:=StrToNetAddr(s);
+      if H.s_bytes[1] <> 0 then
+        begin
+          DNSServers[Result]:=H;
+          Inc(Result);
+        end;
+    end;
+  SetLength(DNSServers, Result);
+end;
+
+var
+  LastChangeProp: string;
+
+Procedure CheckResolveFile;
+var
+  n, v: string;
+begin
+  if not CheckResolveFileAge then
+    exit;
+  n:=GetSystemProperty('net.change');
+  if n <> '' then
+    v:=GetSystemProperty(PAnsiChar(n))
+  else
+    v:='';
+  n:=n + '=' + v;
+  if LastChangeProp = n then
+    exit;
+  LastChangeProp:=n;
+  GetDNSServers;
+end;
+
+{$else}
+
 Var
   ResolveFileAge  : Longint;
   ResolveFileName : String;
@@ -550,6 +601,8 @@ begin
     end;  
 end;
 
+{$endif android}
+
 { ---------------------------------------------------------------------
     Payload handling functions.
   ---------------------------------------------------------------------}
@@ -1443,9 +1496,6 @@ end;
 
 Procedure InitResolver;
 
-//Var
-//  I : Integer;
-
 begin
   TimeOutS :=5;
   TimeOutMS:=0;
@@ -1464,9 +1514,14 @@ begin
 {$ENDIF UNIX_ETC}
   If FileExists (EtcPath + SHostsFile) then
     HostsList := ProcessHosts (EtcPath + SHostsFile);
+{$ifdef android}
+  CheckResolveFileAge:=True;
+  CheckResolveFile;
+{$else}
   CheckResolveFileAge:=False;
   If FileExists(EtcPath + SResolveFile) then
     GetDNsservers(EtcPath + SResolveFile)
+{$endif android}
 {$IFDEF OS2}
   else if FileExists(EtcPath + SResolveFile2) then
     GetDNsservers(EtcPath + SResolveFile2)