X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/2579cad7a973072619a7fc17ff6af9cc75264972..7b8a26e75924ecff47d3e347eb4e2685656c728e:/dnssync.pas?ds=inline

diff --git a/dnssync.pas b/dnssync.pas
index 79ace01..f5eafa6 100644
--- a/dnssync.pas
+++ b/dnssync.pas
@@ -13,7 +13,7 @@ interface
   uses
     dnscore,
     binipstuff,
-    {$ifdef win32}
+    {$ifdef mswindows}
       winsock,
       windows,
     {$else}
@@ -31,9 +31,9 @@ interface
 
 //convert a name to an IP
 //will return v4 or v6 depending on what seems favorable, or manual preference setting
-//on error the binip will have a family of 0 (other fiels are also currently
+//on error the binip will have a family of 0 (other fields are also currently
 //zeroed out but may be used for further error information in future)
-//timeout is in miliseconds, it is ignored when using windows dns
+//timeout is in milliseconds, it is ignored when using windows dns
 function forwardlookup(name:ansistring;timeout:integer):tbinip;
 
 //convert a name to a list of all IP's returned
@@ -60,12 +60,12 @@ const
 
 implementation
 
-{$ifdef win32}
+{$ifdef mswindows}
   uses dnswin;
 {$endif}
 
 
-{$ifndef win32}
+{$ifndef mswindows}
 {$define syncdnscore}
 {$endif}
 
@@ -76,7 +76,7 @@ type tdnsstatearr=array[0..numsock-1] of tdnsstate;
 {$ifdef syncdnscore}
 
 
-{$ifdef win32}
+{$ifdef mswindows}
   const
     winsocket = 'wsock32.dll';
   function sendto(s: TSocket; const Buf; len, flags: Integer; var addrto: TinetSockAddrV; tolen: Integer): Integer; stdcall; external    winsocket name 'sendto';
@@ -87,7 +87,7 @@ type tdnsstatearr=array[0..numsock-1] of tdnsstate;
 
 
 function getts:integer;
-{$ifdef win32}
+{$ifdef mswindows}
 begin
   result := GetTickCount and tsmask;
 {$else}
@@ -117,7 +117,7 @@ var
   a,b:integer;
 
   Src    : TInetSockAddrV;
-  Srcx   : {$ifdef win32}sockaddr_in{$else}TInetSockAddrV{$endif} absolute Src;
+  Srcx   : {$ifdef mswindows}sockaddr_in{$else}TInetSockAddrV{$endif} absolute Src;
   SrcLen : Integer;
   fromip:tbinip;
   fromport:ansistring;
@@ -132,7 +132,7 @@ procedure setupsocket;
 var
   inAddrtemp : TInetSockAddrV;
   biniptemp:tbinip;
-  a,retrycount:integer;
+  a,retrycount,porttemp:integer;
   bindresult:boolean;
 begin
   biniptemp := getcurrentsystemnameserverbin(id);
@@ -144,15 +144,21 @@ begin
   for a := 0 to numsockused-1 do begin
     retrycount := 5;
     repeat
-      makeinaddrv(biniptemp,inttostr( 1024 + randominteger(65536 - 1024) ),inaddrtemp);
+      if (retrycount <= 1) then begin
+        porttemp := 0; //for the last attempt let the OS decide
+      end else begin
+        porttemp := 1024 + randominteger(65536 - 1024);
+      end;
+
+      makeinaddrv(biniptemp,inttostr( porttemp ),inaddrtemp);
 
       fd[a] := Socket(biniptemp.family,SOCK_DGRAM,0);
-      bindresult := {$ifdef win32}Not{$endif} Bind(fd[a],inAddrtemp,inaddrsize(inaddrtemp));
+      bindresult := {$ifdef mswindows}Not{$endif} Bind(fd[a],inAddrtemp,inaddrsize(inaddrtemp));
       dec(retrycount);
     until (retrycount <= 0) or (bindresult);
 
     If (not bindresult) Then begin
-      {$ifdef win32}
+      {$ifdef mswindows}
         raise Exception.create('unable to bind '+inttostr(WSAGetLastError));
       {$else}
         raise Exception.create('unable to bind '+inttostr(socketError));
@@ -180,7 +186,7 @@ begin
 
   ip := getcurrentsystemnameserverbin(id);
 
-  {$ifdef ipv6}{$ifdef win32}
+  {$ifdef ipv6}{$ifdef mswindows}
   if toaddr[socknum].family = AF_INET6 then if (useaf = 0) then useaf := useaf_preferv6;
   {$endif}{$endif}
 
@@ -321,7 +327,7 @@ begin
     exit; //it was an IP address, no need for dns
   end;
 
-  {$ifdef win32}
+  {$ifdef mswindows}
   if usewindns then begin
     if (useaf = useaf_v4) then a := af_inet else if (useaf = useaf_v6) then a := af_inet6 else a := 0;
     result := winforwardlookuplist(name,a,dummy);
@@ -392,7 +398,7 @@ var
   numsockused:integer;
   state:tdnsstatearr;
 begin
-  {$ifdef win32}
+  {$ifdef mswindows}
     if usewindns then begin
       result := winreverselookup(ip,dummy);
       exit;
@@ -406,7 +412,7 @@ begin
   {$endif}
 end;
 
-{$ifdef win32}
+{$ifdef mswindows}
   var
     wsadata : twsadata;