sockets,\r
fd_utils,\r
{$endif}\r
- sysutils;\r
+ lcorernd,\r
+ sysutils,\r
+ ltimevalstuff;\r
\r
//convert a name to an IP\r
//will return v4 or v6 depending on what seems favorable, or manual preference setting\r
//on error the binip will have a family of 0 (other fiels are also currently\r
//zeroed out but may be used for further error information in future)\r
//timeout is in miliseconds, it is ignored when using windows dns\r
-function forwardlookup(name:string;timeout:integer):tbinip;\r
+function forwardlookup(name:ansistring;timeout:integer):tbinip;\r
\r
//convert a name to a list of all IP's returned\r
//this returns both v4 and v6 IP's, or possibly only v4 or v6, depending on settings\r
//on error, returns an empty list\r
-function forwardlookuplist(name:string;timeout:integer):tbiniplist;\r
+function forwardlookuplist(name:ansistring;timeout:integer):tbiniplist;\r
\r
\r
//convert an IP to a name, on error a null string will be returned, other\r
//details as above\r
-function reverselookup(ip:tbinip;timeout:integer):string;\r
+function reverselookup(ip:tbinip;timeout:integer):ansistring;\r
\r
\r
\r
defaulttimeout=10000;\r
const mintimeout=16;\r
\r
+ toport='53';\r
+\r
var\r
- dnssyncserver:string;\r
id:integer;\r
\r
sendquerytime:array[0..numsock-1] of integer;\r
{$endif}\r
\r
{$i unixstuff.inc}\r
-{$i ltimevalstuff.inc}\r
\r
+\r
+{$ifdef syncdnscore}\r
var\r
numsockused:integer;\r
fd:array[0..numsock-1] of integer;\r
state:array[0..numsock-1] of tdnsstate;\r
-\r
-{$ifdef syncdnscore}\r
+ toaddr:array[0..numsock-1] of tbinip;\r
\r
{$ifdef win32}\r
const\r
\r
function sendquery(socknum:integer;const packet:tdnspacket;len:integer):boolean;\r
var\r
- a:integer;\r
- addr : string;\r
- port : string;\r
+ ip : tbinip;\r
+ port : ansistring;\r
inaddr : TInetSockAddrV;\r
begin\r
{ writeln('sendquery ',decodename(state.packet,state.packetlen,12,0,a),' ',state.requesttype);}\r
result := false;\r
if len = 0 then exit; {no packet}\r
\r
- if dnssyncserver <> '' then addr := dnssyncserver else addr := getcurrentsystemnameserver(id);\r
- port := '53';\r
+ ip := getcurrentsystemnameserverbin(id);\r
+\r
+ {$ifdef ipv6}{$ifdef win32}\r
+ if toaddr[socknum].family = AF_INET6 then if (useaf = 0) then useaf := useaf_preferv6;\r
+ {$endif}{$endif}\r
\r
- makeinaddrv(ipstrtobinf(addr),port,inaddr);\r
+ port := toport;\r
+ toaddr[socknum] := ip;\r
+ makeinaddrv(toaddr[socknum],port,inaddr);\r
\r
sendto(fd[socknum],packet,len,0,inaddr,inaddrsize(inaddr));\r
sendquerytime[socknum] := getts;\r
inAddrtemp : TInetSockAddrV;\r
a:integer;\r
biniptemp:tbinip;\r
- addr:string;\r
+\r
begin\r
//init both sockets smultaneously, always, so they get succesive fd's\r
- if fd[0] > 0 then exit;\r
\r
- if dnssyncserver <> '' then addr := dnssyncserver else addr := getcurrentsystemnameserver(id);\r
+ {recreate sockets every time, reusing them will fail (hang) if the nameserver is changed\r
+ also changing the nameserver can't possibly work}\r
+ {if fd[0] > 0 then exit;}\r
+ for a := 0 to numsock-1 do if (fd[a] > 0) then closesocket(fd[a]);\r
+\r
+ biniptemp := getcurrentsystemnameserverbin(id);\r
//must get the DNS server here so we know to init v4 or v6\r
\r
- fillchar(inaddrtemp,sizeof(inaddrtemp),0);\r
- ipstrtobin(addr,biniptemp);\r
- if biniptemp.family = 0 then biniptemp.family := AF_INET;\r
+ if biniptemp.family = AF_INET6 then biniptemp := ipstrtobinf('::') else biniptemp := ipstrtobinf('0.0.0.0');\r
\r
- inaddrtemp.inaddr.family := biniptemp.family;\r
\r
for a := 0 to numsockused-1 do begin\r
+ makeinaddrv(biniptemp,inttostr( 1024 + randominteger(65536 - 1024) ),inaddrtemp);\r
+\r
fd[a] := Socket(biniptemp.family,SOCK_DGRAM,0);\r
\r
If {$ifndef win32}Not{$endif} Bind(fd[a],inAddrtemp,inaddrsize(inaddrtemp)) Then begin\r
currenttime : integer;\r
\r
lag : ttimeval;\r
- currenttimeout : ttimeval;\r
selecttimeout : ttimeval;\r
socknum:integer;\r
needprocessing:array[0..numsock-1] of boolean;\r
finished:array[0..numsock-1] of boolean;\r
a,b:integer;\r
\r
+ Src : TInetSockAddrV;\r
+ Srcx : {$ifdef win32}sockaddr_in{$else}TInetSockAddrV{$endif} absolute Src;\r
+ SrcLen : Integer;\r
+ fromip:tbinip;\r
+ fromport:ansistring;\r
+\r
begin\r
if timeout < mintimeout then timeout := defaulttimeout;\r
\r
fillchar(state[socknum].recvpacket,sizeof(state[socknum].recvpacket),0);\r
msectotimeval(lag,(currenttime-sendquerytime[socknum]) and tsmask);\r
\r
- if dnssyncserver = '' then reportlag(id,(lag.tv_sec*1000000)+lag.tv_usec);\r
- state[socknum].recvpacketlen := recv(fd[socknum],state[socknum].recvpacket, SizeOf(state[socknum].recvpacket),0);\r
- state[socknum].parsepacket := true;\r
- needprocessing[socknum] := true;\r
+ reportlag(id,(lag.tv_sec*1000000)+lag.tv_usec);\r
+\r
+ SrcLen := SizeOf(Src);\r
+ state[socknum].recvpacketlen := recvfrom(fd[socknum],state[socknum].recvpacket, SizeOf(state[socknum].recvpacket),0,Srcx,SrcLen);\r
+\r
+ if (state[socknum].recvpacketlen > 0) then begin\r
+ fromip := inaddrvtobinip(Src);\r
+ fromport := inttostr(htons(src.InAddr.port));\r
+ if ((not comparebinip(toaddr[socknum],fromip)) or (fromport <> toport)) then begin\r
+// writeln('dnssync received from wrong IP:port ',ipbintostr(fromip),'#',fromport);\r
+ state[socknum].recvpacketlen := 0;\r
+ end else begin\r
+ state[socknum].parsepacket := true;\r
+ needprocessing[socknum] := true;\r
+ end;\r
+ end;\r
end;\r
end;\r
if selectresult < 0 then exit;\r
\r
currenttime := getts;\r
\r
- if dnssyncserver = '' then reportlag(id,-1);\r
+ reportlag(id,-1);\r
if (currenttime >= endtime) and ((not wrapmode) or (currenttime < starttime)) then begin\r
exit;\r
end else begin\r
\r
\r
\r
-function forwardlookuplist(name:string;timeout:integer):tbiniplist;\r
+function forwardlookuplist(name:ansistring;timeout:integer):tbiniplist;\r
var\r
dummy : integer;\r
- a,b:integer;\r
+ a:integer;\r
biniptemp:tbinip;\r
l:tbiniplist;\r
begin\r
{$endif}\r
begin\r
{$ifdef syncdnscore}\r
- {$ifdef linux}{$ifdef ipv6}initpreferredmode;{$endif}{$endif}\r
+ {$ifdef ipv6}initpreferredmode;{$endif}\r
\r
numsockused := 0;\r
\r
end else begin\r
biniplist_addlist(result,state[0].resultlist);\r
biniplist_addlist(result,state[1].resultlist);\r
- {$endif} \r
+ {$endif}\r
end;\r
{$endif}\r
end;\r
end;\r
\r
-function forwardlookup(name:string;timeout:integer):tbinip;\r
+function forwardlookup(name:ansistring;timeout:integer):tbinip;\r
var\r
listtemp:tbiniplist;\r
begin\r
result := biniplist_get(listtemp,0);\r
end;\r
\r
-function reverselookup(ip:tbinip;timeout:integer):string;\r
+function reverselookup(ip:tbinip;timeout:integer):ansistring;\r
var\r
dummy : integer;\r
begin\r
lcore.org gitweb / lcore.git / blobdiff