move ipv6 connectivity check from dnscore init to a reusable function in lcorelocalips

[lcore.git] / lcorernd.pas

diff --git a/lcorernd.pas b/lcorernd.pas
index b76ab4934ffe4c15365f12467442e3d186b2dccb..b43530551e21bddfc7571d7c38183a0b10d8ea74 100644 (file)
--- a/lcorernd.pas
+++ b/lcorernd.pas
@@ -4,7 +4,9 @@
   ----------------------------------------------------------------------------- }\r
 \r
 unit lcorernd;\r
   ----------------------------------------------------------------------------- }\r
 \r
 unit lcorernd;\r

-\r
+{$ifdef fpc}\r
+  {$mode delphi}\r
+{$endif}\r

 interface\r
 \r
 {$include lcoreconfig.inc}\r
 interface\r
 \r
 {$include lcoreconfig.inc}\r


@@ -143,6 +145,13 @@ uses
     {$endif}\r
   {$endif}\r
   fastmd5,sysutils;\r
     {$endif}\r
   {$endif}\r
   fastmd5,sysutils;\r

+{$endif}\r
+\r
+const\r
+  wordsizeshift=2;\r
+  wordsize=1 shl wordsizeshift;\r
+\r
+{$ifndef nolcorernd}\r

 \r
 {$ifdef unix}{$include unixstuff.inc}{$endif}\r
 \r
 \r
 {$ifdef unix}{$include unixstuff.inc}{$endif}\r
 \r


@@ -168,19 +177,17 @@ type
   hashtype=tmd5;\r
 \r
 const\r
   hashtype=tmd5;\r
 \r
 const\r

-  wordsizeshift=2;\r
-  wordsize=1 shl wordsizeshift;\r

   //wordsize check commented out for d3 compatibility\r
   //{ $if (wordsize <> sizeof(wordtype))}'wordsizeshift must be setcorrectly'{ $ifend}\r
   hashsize=sizeof(hashtype);\r
   halfhashsize=hashsize div 2;\r
   hashdwords=hashsize div wordsize;\r
   pooldwords=3*hashdwords;\r
   //wordsize check commented out for d3 compatibility\r
   //{ $if (wordsize <> sizeof(wordtype))}'wordsizeshift must be setcorrectly'{ $ifend}\r
   hashsize=sizeof(hashtype);\r
   halfhashsize=hashsize div 2;\r
   hashdwords=hashsize div wordsize;\r
   pooldwords=3*hashdwords;\r

-  seeddwords=32;\r
+  seeddwords=40;\r

   hashpasssize=48; {this number has to be small enough that hashing this size uses only one block transform}\r
 \r
 var\r
   hashpasssize=48; {this number has to be small enough that hashing this size uses only one block transform}\r
 \r
 var\r

-  {the seed part of this buffer must be at least as big as the OS seed (windows: 120 bytes, unix: 36 bytes)}\r
+  //the seed part of this buffer must be at least as big as the OS seed (windows: 120 bytes for 32 bits, 160 bytes for 64 bits, unix: 36 bytes)\r

   pool:array[0..(pooldwords+seeddwords-1)] of wordtype;\r
   reseedcountdown:integer;\r
 \r
   pool:array[0..(pooldwords+seeddwords-1)] of wordtype;\r
   reseedcountdown:integer;\r
 \r