added lcorelocalips: code to get local v4 and v6 IPs in a central place

[lcore.git] / dnscore.pas

diff --git a/dnscore.pas b/dnscore.pas
index d0dbbf035f329d8e7304e32f588fdad907d09eca..18e40c9f8c9ea8067ae55b48c23f133fea36caec 100644 (file)
--- a/dnscore.pas
+++ b/dnscore.pas
@@ -204,7 +204,6 @@ procedure reportlag(id:integer;lag:integer); //lag should be in microseconds and
 \r
 \r
 {$ifdef ipv6}\r
 \r
 \r
 {$ifdef ipv6}\r

-function getv6localips:tbiniplist;\r

 procedure initpreferredmode;\r
 \r
 var\r
 procedure initpreferredmode;\r
 \r
 var\r


@@ -223,7 +222,7 @@ uses
   {$ifdef win32}\r
     windows,\r
   {$endif}\r
   {$ifdef win32}\r
     windows,\r
   {$endif}\r

-\r
+  lcorelocalips,\r

   sysutils;\r
 \r
 \r
   sysutils;\r
 \r
 \r


@@ -750,43 +749,8 @@ begin
 end;\r
 \r
 \r
 end;\r
 \r
 \r

-\r

 {$ifdef ipv6}\r
 \r
 {$ifdef ipv6}\r
 \r

-{$ifdef linux}\r
-function getv6localips:tbiniplist;\r
-var\r
-  t:textfile;\r
-  s,s2:ansistring;\r
-  ip:tbinip;\r
-  a:integer;\r
-begin\r
-  result := biniplist_new;\r
-\r
-  assignfile(t,'/proc/net/if_inet6');\r
-  {$i-}reset(t);{$i+}\r
-  if ioresult <> 0 then exit; {none found, return empty list}\r
-\r
-  while not eof(t) do begin\r
-    readln(t,s);\r
-    s2 := '';\r
-    for a := 0 to 7 do begin\r
-      if (s2 <> '') then s2 := s2 + ':';\r
-      s2 := s2 + copy(s,(a shl 2)+1,4);\r
-    end;\r
-    ipstrtobin(s2,ip);\r
-    if ip.family <> 0 then biniplist_add(result,ip);\r
-  end;\r
-  closefile(t);\r
-end;\r
-\r
-{$else}\r
-function getv6localips:tbiniplist;\r
-begin\r
-  result := biniplist_new;\r
-end;\r
-{$endif}\r
-\r

 procedure initpreferredmode;\r
 var\r
   l:tbiniplist;\r
 procedure initpreferredmode;\r
 var\r
   l:tbiniplist;\r