secondlistener in lcoreconfig

[lcore.git] / dnsasync.pas

diff --git a/dnsasync.pas b/dnsasync.pas
index 0a32459af0a5c04c419652fff26cc9d08b49a742..7a10bbfdc7cc0466942906c68617712309317e22 100755 (executable)
--- a/dnsasync.pas
+++ b/dnsasync.pas
@@ -17,8 +17,11 @@ uses
   lsocket,lcore,\r
   classes,binipstuff,dnscore,btime;\r
 \r
   lsocket,lcore,\r
   classes,binipstuff,dnscore,btime;\r
 \r

+const\r
+  numsock=1{$ifdef ipv6}+1{$endif};\r

 \r
 type\r
 \r
 type\r

+\r

   //after completion or cancelation a dnswinasync may be reused\r
   tdnsasync=class(tcomponent)\r
 \r
   //after completion or cancelation a dnswinasync may be reused\r
   tdnsasync=class(tcomponent)\r
 \r


@@ -26,26 +29,26 @@ type
     //made a load of stuff private that does not appear to be part of the main\r
     //public interface. If you make any of it public again please consider the\r
     //consequences when using windows dns. --plugwash.\r
     //made a load of stuff private that does not appear to be part of the main\r
     //public interface. If you make any of it public again please consider the\r
     //consequences when using windows dns. --plugwash.\r

-    sock:twsocket;\r
-\r
-    sockopen:boolean;\r
-\r
+    sockets: array[0..numsock-1] of tlsocket;\r

 \r
 \r

-    state:tdnsstate;\r
+    states: array[0..numsock-1] of tdnsstate;\r

 \r
 \r

-    dnsserverid:integer;\r
+    dnsserverids : array[0..numsock-1] of integer;\r

     startts:double;\r
     {$ifdef win32}\r
       dwas : tdnswinasync;\r
     {$endif}\r
 \r
     startts:double;\r
     {$ifdef win32}\r
       dwas : tdnswinasync;\r
     {$endif}\r
 \r

-\r
-    procedure asyncprocess;\r
+    numsockused : integer;\r
+    fresultlist : tbiniplist;\r
+    requestaf : integer;\r
+    procedure asyncprocess(socketno:integer);\r

     procedure receivehandler(sender:tobject;error:word);\r
     procedure receivehandler(sender:tobject;error:word);\r

-    function sendquery(const packet:tdnspacket;len:integer):boolean;\r
+    function sendquery(socketno:integer;const packet:tdnspacket;len:integer):boolean;\r

     {$ifdef win32}\r
       procedure winrequestdone(sender:tobject;error:word);\r
     {$endif}\r
     {$ifdef win32}\r
       procedure winrequestdone(sender:tobject;error:word);\r
     {$endif}\r

+\r

   public\r
     onrequestdone:tsocketevent;\r
 \r
   public\r
     onrequestdone:tsocketevent;\r
 \r


@@ -55,6 +58,8 @@ type
     //and special uses.\r
     addr,port:string;\r
 \r
     //and special uses.\r
     addr,port:string;\r
 \r

+    overrideaf : integer;\r
+\r

     //A family value of AF_INET6 will give only\r
     //ipv6 results. Any other value will give ipv4 results in preference and ipv6\r
     //results if ipv4 results are not available;\r
     //A family value of AF_INET6 will give only\r
     //ipv6 results. Any other value will give ipv4 results in preference and ipv6\r
     //results if ipv4 results are not available;\r


@@ -63,6 +68,7 @@ type
     procedure cancel;//cancel an outstanding dns request\r
     function dnsresult:string; //get result of dnslookup as a string\r
     procedure dnsresultbin(var binip:tbinip); //get result of dnslookup as a tbinip\r
     procedure cancel;//cancel an outstanding dns request\r
     function dnsresult:string; //get result of dnslookup as a string\r
     procedure dnsresultbin(var binip:tbinip); //get result of dnslookup as a tbinip\r

+    property dnsresultlist : tbiniplist read fresultlist;\r

     procedure forwardlookup(const name:string); //start forward lookup,\r
                                                 //preffering ipv4\r
     procedure reverselookup(const binip:tbinip); //start reverse lookup\r
     procedure forwardlookup(const name:string); //start forward lookup,\r
                                                 //preffering ipv4\r
     procedure reverselookup(const binip:tbinip); //start reverse lookup\r


@@ -79,78 +85,150 @@ uses sysutils;
 constructor tdnsasync.create;\r
 begin\r
   inherited create(aowner);\r
 constructor tdnsasync.create;\r
 begin\r
   inherited create(aowner);\r

-  dnsserverid := -1;\r
-  sock := twsocket.create(self);\r
+  dnsserverids[0] := -1;\r
+  sockets[0] := twsocket.create(self);\r
+  sockets[0].tag := 0;\r
+  {$ifdef ipv6}\r
+    dnsserverids[1] := -1;\r
+    sockets[1] := twsocket.Create(self);\r
+    sockets[1].tag := 1;\r
+  {$endif}\r

 end;\r
 \r
 destructor tdnsasync.destroy;\r
 end;\r
 \r
 destructor tdnsasync.destroy;\r

+var\r
+  socketno : integer;\r

 begin\r
 begin\r

-  if dnsserverid >= 0 then begin\r
-    reportlag(dnsserverid,-1);\r
-    dnsserverid := -1;\r
+  for socketno := 0 to numsock -1 do begin\r
+    if dnsserverids[socketno] >= 0 then begin\r
+      reportlag(dnsserverids[socketno],-1);\r
+      dnsserverids[socketno] := -1;\r
+    end;\r
+    sockets[socketno].release;\r
+    setstate_request_init('',states[socketno]);\r

   end;\r
   end;\r

-  sock.release;\r
-  setstate_request_init('',state);\r

   inherited destroy;\r
 end;\r
 \r
   inherited destroy;\r
 end;\r
 \r

-procedure tdnsasync.receivehandler;\r
+procedure tdnsasync.receivehandler(sender:tobject;error:word);\r
+var\r
+  socketno : integer;\r

 begin\r
 begin\r

-  if dnsserverid >= 0 then begin\r
-    reportlag(dnsserverid,trunc((unixtimefloat-startts)*1000));\r
-    dnsserverid := -1;\r
+  socketno := tlsocket(sender).tag;\r
+  //writeln('got a reply on socket number ',socketno);\r
+  fillchar(states[socketno].recvpacket,sizeof(states[socketno].recvpacket),0);\r
+  states[socketno].recvpacketlen := twsocket(sender).Receive(@(states[socketno].recvpacket), SizeOf(states[socketno].recvpacket));\r
+  states[socketno].parsepacket := true;\r
+  if states[socketno].resultaction <> action_done then begin\r
+    //we ignore packets that come after we are done\r
+    if dnsserverids[socketno] >= 0 then begin\r
+      reportlag(dnsserverids[socketno],trunc((unixtimefloat-startts)*1000));\r
+      dnsserverids[socketno] := -1;\r
+    end;\r
+  {  writeln('received reply');}\r
+\r
+    asyncprocess(socketno);\r
+    //writeln('processed it');\r
+  end else begin\r
+    //writeln('ignored it because request is done');\r

   end;\r
   end;\r

-{  writeln('received reply');}\r
-  fillchar(state.recvpacket,sizeof(state.recvpacket),0);\r
-  state.recvpacketlen := twsocket(sender).Receive(@state.recvpacket, SizeOf(state.recvpacket));\r
-  state.parsepacket := true;\r
-  asyncprocess;\r

 end;\r
 \r
 end;\r
 \r

-function tdnsasync.sendquery;\r
+function tdnsasync.sendquery(socketno:integer;const packet:tdnspacket;len:integer):boolean;\r
+var\r
+  destination : string;\r
+  inaddr : tinetsockaddrv;\r

 begin\r
 {  writeln('sendquery ',decodename(state.packet,state.packetlen,12,0,a),' ',state.requesttype);}\r
 begin\r
 {  writeln('sendquery ',decodename(state.packet,state.packetlen,12,0,a),' ',state.requesttype);}\r

+  //writeln('trying to send query on socket number ',socketno);\r

   result := false;\r
   if len = 0 then exit; {no packet}\r
   result := false;\r
   if len = 0 then exit; {no packet}\r

-  if not sockopen then begin\r
-    if addr <> '' then sock.addr := addr else sock.addr := getcurrentsystemnameserver(dnsserverid);//getunixnameservercached;\r
+  if sockets[socketno].state <> wsconnected then begin\r

     startts := unixtimefloat;\r
     if port = '' then port := '53';\r
     startts := unixtimefloat;\r
     if port = '' then port := '53';\r

-    sock.port := port;\r
-    sock.Proto := 'udp';\r
-    sock.ondataavailable := receivehandler;\r
+    sockets[socketno].Proto := 'udp';\r
+    sockets[socketno].ondataavailable := receivehandler;\r

     try\r
     try\r

-      sock.connect;\r
+      sockets[socketno].listen;\r

     except\r
     except\r

-      on e:exception do begin\r
-        //writeln('exception '+e.message);\r
-        exit;\r
-      end;\r
+      result := false;\r
+      exit;\r

     end;\r
     end;\r

-    sockopen := true;\r
+\r
+  end;\r
+  if addr <> '' then begin\r
+    dnsserverids[socketno] := -1;\r
+    destination := addr\r
+  end else begin\r
+    destination := getcurrentsystemnameserver(dnsserverids[socketno]);\r

   end;\r
   end;\r

-  sock.send(@packet,len);\r
+  makeinaddrv(ipstrtobinf(destination),port,inaddr);\r
+  sockets[socketno].sendto(inaddr,sizeof(inaddr), @packet,len);\r

   result := true;\r
   result := true;\r

+\r
+\r

 end;\r
 \r
 end;\r
 \r

-procedure tdnsasync.asyncprocess;\r
+procedure tdnsasync.asyncprocess(socketno:integer);\r

 begin\r
 begin\r

-  state_process(state);\r
-  case state.resultaction of\r
+  state_process(states[socketno]);\r
+  case states[socketno].resultaction of\r

     action_ignore: begin {do nothing} end;\r
     action_done: begin\r
     action_ignore: begin {do nothing} end;\r
     action_done: begin\r

-      onrequestdone(self,0);\r
+      {$ifdef ipv6}\r
+      if (numsockused = 1) or (states[socketno xor 1].resultaction=action_done) then\r
+      //if using two sockets we need to wait until both sockets are in the done\r
+      //state before firing the event\r
+      {$endif}\r
+      begin\r
+        fresultlist := biniplist_new;\r
+        if (numsockused = 1) then begin\r
+          //writeln('processing for one state');\r
+          biniplist_addlist(fresultlist,states[0].resultlist);\r
+        {$ifdef ipv6}\r
+        end else if (requestaf = useaf_preferv6) then begin\r
+          //writeln('processing for two states, ipv6 preference');\r
+          //writeln('merging lists '+biniplist_tostr(states[1].resultlist)+' and '+biniplist_tostr(states[0].resultlist));\r
+          biniplist_addlist(fresultlist,states[1].resultlist);\r
+          biniplist_addlist(fresultlist,states[0].resultlist);\r
+        end else begin\r
+          //writeln('processing for two states, ipv4 preference');\r
+          biniplist_addlist(fresultlist,states[0].resultlist);\r
+          biniplist_addlist(fresultlist,states[1].resultlist);\r
+        {$endif}\r
+        end;\r
+        //writeln(biniplist_tostr(fresultlist));\r
+        onrequestdone(self,0);\r
+      end;\r

     end;\r
     action_sendquery:begin\r
     end;\r
     action_sendquery:begin\r

-      sendquery(state.sendpacket,state.sendpacketlen);\r
+      sendquery(socketno,states[socketno].sendpacket,states[socketno].sendpacketlen);\r

     end;\r
   end;\r
 end;\r
 \r
 procedure tdnsasync.forwardlookup;\r
     end;\r
   end;\r
 end;\r
 \r
 procedure tdnsasync.forwardlookup;\r

+var\r
+  bip : tbinip;\r
+  i : integer;\r

 begin\r
 \r
 begin\r
 \r

-  ipstrtobin(name,state.resultbin);\r
+  ipstrtobin(name,bip);\r
+\r
+  if bip.family <> 0 then begin\r
+    // it was an IP address\r
+    fresultlist := biniplist_new;\r
+    biniplist_add(fresultlist,bip);\r
+    onrequestdone(self,0);\r
+    exit;\r
+  end;\r
+\r
+  if overrideaf = useaf_default then begin\r
+    {$ifdef linux}{$ifdef ipv6}initpreferredmode;{$endif}{$endif}\r
+    requestaf := useaf;\r
+  end else begin\r
+    requestaf := overrideaf;\r
+  end;\r

 \r
   {$ifdef win32}\r
     if usewindns or (addr = '') then begin\r
 \r
   {$ifdef win32}\r
     if usewindns or (addr = '') then begin\r


@@ -165,15 +243,22 @@ begin
     end;\r
   {$endif}\r
 \r
     end;\r
   {$endif}\r
 \r

-\r
-  if state.resultbin.family <> 0 then begin\r
-    onrequestdone(self,0);\r
-    exit;\r
+  numsockused := 0;\r
+  fresultlist := biniplist_new;\r
+  if (requestaf <> useaf_v6) then begin\r
+    setstate_forward(name,states[numsockused],af_inet);\r
+    inc(numsockused);\r

   end;\r
 \r
   end;\r
 \r

-\r
-  setstate_forward(name,state,forwardfamily);\r
-  asyncprocess;\r
+  {$ifdef ipv6}\r
+    if (requestaf <> useaf_v4) then begin\r
+      setstate_forward(name,states[numsockused],af_inet6);\r
+      inc(numsockused);\r
+    end;\r
+  {$endif}\r
+  for i := 0 to numsockused-1 do begin\r
+    asyncprocess(i);\r
+  end;\r

 \r
 end;\r
 \r
 \r
 end;\r
 \r


@@ -189,42 +274,47 @@ begin
     end;\r
   {$endif}\r
 \r
     end;\r
   {$endif}\r
 \r

-  setstate_reverse(binip,state);\r
-  asyncprocess;\r
+  setstate_reverse(binip,states[0]);\r
+  numsockused := 1;\r
+  asyncprocess(0);\r

 end;\r
 \r
 function tdnsasync.dnsresult;\r
 begin\r
 end;\r
 \r
 function tdnsasync.dnsresult;\r
 begin\r

-  if state.resultstr <> '' then result := state.resultstr else begin\r
-    result := ipbintostr(state.resultbin);\r
+  if states[0].resultstr <> '' then result := states[0].resultstr else begin\r
+    result := ipbintostr(biniplist_get(fresultlist,0));\r

   end;\r
 end;\r
 \r
 procedure tdnsasync.dnsresultbin(var binip:tbinip);\r
 begin\r
   end;\r
 end;\r
 \r
 procedure tdnsasync.dnsresultbin(var binip:tbinip);\r
 begin\r

-  move(state.resultbin,binip,sizeof(binip));\r
+  binip := biniplist_get(fresultlist,0);\r

 end;\r
 \r
 procedure tdnsasync.cancel;\r
 end;\r
 \r
 procedure tdnsasync.cancel;\r

+var\r
+  socketno : integer;\r

 begin\r
   {$ifdef win32}\r
     if assigned(dwas) then begin\r
       dwas.release;\r
       dwas := nil;\r
 begin\r
   {$ifdef win32}\r
     if assigned(dwas) then begin\r
       dwas.release;\r
       dwas := nil;\r

-    end else \r
+    end else\r

   {$endif}\r
   begin\r
   {$endif}\r
   begin\r

+    for socketno := 0 to numsock-1 do begin\r
+      reportlag(dnsserverids[socketno],-1);\r
+      dnsserverids[socketno] := -1;\r

 \r
 \r

-    if dnsserverid >= 0 then begin\r
-      reportlag(dnsserverid,-1);\r
-      dnsserverid := -1;\r
-    end;\r
-    if sockopen then begin\r
-      sock.close;\r
-      sockopen := false;\r
+      sockets[socketno].close;\r

     end;\r
     end;\r

+\r

   end;\r
   end;\r

-  setstate_failure(state);\r
+  for socketno := 0 to numsock-1 do begin\r
+    setstate_failure(states[socketno]);\r
+\r
+  end;\r
+  fresultlist := biniplist_new;\r

   onrequestdone(self,0);\r
 end;\r
 \r
   onrequestdone(self,0);\r
 end;\r
 \r


@@ -233,12 +323,28 @@ end;
  \r
   begin\r
     if dwas.reverse then begin \r
  \r
   begin\r
     if dwas.reverse then begin \r

-      state.resultstr := dwas.name;\r
+      states[0].resultstr := dwas.name;\r

     end else begin \r
     end else begin \r

-      state.resultbin := dwas.ip;\r
-      if (forwardfamily = AF_INET6) and (state.resultbin.family = AF_INET) then begin\r
-        fillchar(state.resultbin,sizeof(tbinip),0);\r
+\r
+      {$ifdef ipv6}\r
+      if (requestaf = useaf_preferv4) then begin\r
+        {prefer mode: sort the IP's}\r
+        fresultlist := biniplist_new;\r
+        addipsoffamily(fresultlist,dwas.iplist,af_inet);\r
+        addipsoffamily(fresultlist,dwas.iplist,af_inet6);\r
+\r
+      end else if (requestaf = useaf_preferv6) then begin\r
+        {prefer mode: sort the IP's}\r
+        fresultlist := biniplist_new;\r
+        addipsoffamily(fresultlist,dwas.iplist,af_inet6);\r
+        addipsoffamily(fresultlist,dwas.iplist,af_inet);\r
+        \r
+      end else\r
+      {$endif}\r
+      begin\r
+        fresultlist := dwas.iplist;\r

       end;\r
       end;\r

+\r

     end;\r
     dwas.release;\r
     onrequestdone(self,error);\r
     end;\r
     dwas.release;\r
     onrequestdone(self,error);\r