X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/f04d9ac0ffbe96ead372b84dad0786daba7f5ed7..85ef2ce64f0cc31a063fccea69fdcc7281d51548:/dnsasync.pas

diff --git a/dnsasync.pas b/dnsasync.pas
index 7a10bbf..8c3ce3a 100755
--- a/dnsasync.pas
+++ b/dnsasync.pas
@@ -15,7 +15,9 @@ uses
     dnswin,
   {$endif}
   lsocket,lcore,
-  classes,binipstuff,dnscore,btime;
+  classes,binipstuff,dnscore,btime,lcorernd;
+
+{$include lcoreconfig.inc}
 
 const
   numsock=1{$ifdef ipv6}+1{$endif};
@@ -33,6 +35,8 @@ type
 
     states: array[0..numsock-1] of tdnsstate;
 
+    destinations: array[0..numsock-1] of tbinip;
+
     dnsserverids : array[0..numsock-1] of integer;
     startts:double;
     {$ifdef win32}
@@ -60,11 +64,6 @@ type
 
     overrideaf : integer;
 
-    //A family value of AF_INET6 will give only
-    //ipv6 results. Any other value will give ipv4 results in preference and ipv6
-    //results if ipv4 results are not available;
-    forwardfamily:integer;
-
     procedure cancel;//cancel an outstanding dns request
     function dnsresult:string; //get result of dnslookup as a string
     procedure dnsresultbin(var binip:tbinip); //get result of dnslookup as a tbinip
@@ -72,6 +71,7 @@ type
     procedure forwardlookup(const name:string); //start forward lookup,
                                                 //preffering ipv4
     procedure reverselookup(const binip:tbinip); //start reverse lookup
+    procedure customlookup(const name:string;querytype:integer); //start custom type lookup
 
     constructor create(aowner:tcomponent); override;
     destructor destroy; override;
@@ -113,16 +113,31 @@ end;
 procedure tdnsasync.receivehandler(sender:tobject;error:word);
 var
   socketno : integer;
+  Src    : TInetSockAddrV;
+  SrcLen : Integer;
+  fromip:tbinip;
+  fromport:string;
 begin
   socketno := tlsocket(sender).tag;
   //writeln('got a reply on socket number ',socketno);
   fillchar(states[socketno].recvpacket,sizeof(states[socketno].recvpacket),0);
-  states[socketno].recvpacketlen := twsocket(sender).Receive(@(states[socketno].recvpacket), SizeOf(states[socketno].recvpacket));
+
+  SrcLen := SizeOf(Src);
+  states[socketno].recvpacketlen := twsocket(sender).ReceiveFrom(@(states[socketno].recvpacket), SizeOf(states[socketno].recvpacket), Src, SrcLen);
+
+  fromip := inaddrvtobinip(Src);
+  fromport := inttostr(htons(src.InAddr.port));
+
+  if ((not comparebinip(fromip,destinations[socketno])) or (fromport <> port)) then begin
+   // writeln('dnsasync received from wrong IP:port ',ipbintostr(fromip),'#',fromport,', expected ',ipbintostr(destinations[socketno]),'#',port);
+    exit;
+  end;
+
   states[socketno].parsepacket := true;
   if states[socketno].resultaction <> action_done then begin
     //we ignore packets that come after we are done
     if dnsserverids[socketno] >= 0 then begin
-      reportlag(dnsserverids[socketno],trunc((unixtimefloat-startts)*1000));
+      reportlag(dnsserverids[socketno],trunc((unixtimefloat-startts)*1000000));
       dnsserverids[socketno] := -1;
     end;
   {  writeln('received reply');}
@@ -138,6 +153,7 @@ function tdnsasync.sendquery(socketno:integer;const packet:tdnspacket;len:intege
 var
   destination : string;
   inaddr : tinetsockaddrv;
+  trytolisten:integer;
 begin
 {  writeln('sendquery ',decodename(state.packet,state.packetlen,12,0,a),' ',state.requesttype);}
   //writeln('trying to send query on socket number ',socketno);
@@ -148,11 +164,20 @@ begin
     if port = '' then port := '53';
     sockets[socketno].Proto := 'udp';
     sockets[socketno].ondataavailable := receivehandler;
-    try
-      sockets[socketno].listen;
-    except
-      result := false;
-      exit;
+
+    {we are going to bind on a random local port for the DNS request, against the kaminsky attack
+    there is a small chance that we're trying to bind on an already used port, so retry a few times}
+    for trytolisten := 3 downto 0 do begin
+      try
+        sockets[socketno].port := inttostr(1024 + randominteger(65536 - 1024));
+        sockets[socketno].listen;
+      except
+        {writeln('failed to listen ',sockets[socketno].localport,' ',trytolisten);}
+        if (trytolisten = 0) then begin
+          result := false;
+          exit;
+        end;
+      end;
     end;
 
   end;
@@ -162,7 +187,13 @@ begin
   end else begin
     destination := getcurrentsystemnameserver(dnsserverids[socketno]);
   end;
-  makeinaddrv(ipstrtobinf(destination),port,inaddr);
+  destinations[socketno] := ipstrtobinf(destination);
+
+  {$ifdef ipv6}{$ifdef win32}
+  if destinations[socketno].family = AF_INET6 then if (requestaf = useaf_default) then requestaf := useaf_preferv6;
+  {$endif}{$endif}
+
+  makeinaddrv(destinations[socketno],port,inaddr);
   sockets[socketno].sendto(inaddr,sizeof(inaddr), @packet,len);
   result := true;
 
@@ -212,7 +243,6 @@ var
   bip : tbinip;
   i : integer;
 begin
-
   ipstrtobin(name,bip);
 
   if bip.family <> 0 then begin
@@ -223,22 +253,25 @@ begin
     exit;
   end;
 
+  if (overridednsserver <> '') and (addr = '') then addr := overridednsserver;
+
   if overrideaf = useaf_default then begin
-    {$ifdef linux}{$ifdef ipv6}initpreferredmode;{$endif}{$endif}
+    {$ifdef ipv6}
+      {$ifdef win32}if not (usewindns and (addr = '')) then{$endif}
+      initpreferredmode;
+    {$endif}
     requestaf := useaf;
   end else begin
     requestaf := overrideaf;
   end;
 
   {$ifdef win32}
-    if usewindns or (addr = '') then begin
+    if usewindns and (addr = '') then begin
       dwas := tdnswinasync.create;
       dwas.onrequestdone := winrequestdone;
-      if forwardfamily = AF_INET6 then begin
-        dwas.forwardlookup(name,true);
-      end else begin
-        dwas.forwardlookup(name,false);
-      end;
+
+      dwas.forwardlookup(name);
+
       exit;
     end;
   {$endif}
@@ -263,10 +296,10 @@ begin
 end;
 
 procedure tdnsasync.reverselookup;
-
 begin
+  if (overridednsserver <> '') and (addr = '') then addr := overridednsserver;
   {$ifdef win32}
-    if usewindns or (addr = '') then begin
+    if usewindns and (addr = '') then begin
       dwas := tdnswinasync.create;
       dwas.onrequestdone := winrequestdone;
       dwas.reverselookup(binip);
@@ -279,6 +312,14 @@ begin
   asyncprocess(0);
 end;
 
+procedure tdnsasync.customlookup;
+begin
+  if (overridednsserver <> '') and (addr = '') then addr := overridednsserver;
+  setstate_custom(name,querytype,states[0]);
+  numsockused := 1;
+  asyncprocess(0);
+end;
+
 function tdnsasync.dnsresult;
 begin
   if states[0].resultstr <> '' then result := states[0].resultstr else begin
@@ -322,7 +363,7 @@ end;
   procedure tdnsasync.winrequestdone(sender:tobject;error:word);
  
   begin
-    if dwas.reverse then begin 
+    if dwas.reverse then begin
       states[0].resultstr := dwas.name;
     end else begin