Software /
code /
prosody
Annotate
net/dns.lua @ 6657:f1af4edd5722
mod_pubsub: Add option for default affiliation of non-existent nodes (thanks Flow)
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Tue, 05 May 2015 12:21:32 +0200 |
parent | 6646:9795b8cf14f1 |
child | 6753:33426c56f5d5 |
rev | line source |
---|---|
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1202
diff
changeset
|
1 -- Prosody IM |
615 | 2 -- This file is included with Prosody IM. It has modifications, |
3 -- which are hereby placed in the public domain. | |
337 | 4 |
5 | |
6 -- todo: quick (default) header generation | |
7 -- todo: nxdomain, error handling | |
8 -- todo: cache results of encodeName | |
9 | |
10 | |
11 -- reference: http://tools.ietf.org/html/rfc1035 | |
12 -- reference: http://tools.ietf.org/html/rfc1876 (LOC) | |
13 | |
14 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
15 local socket = require "socket"; |
3324
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
16 local timer = require "util.timer"; |
5705
6eebd5808fbc
net.dns: Support IPv6 addresses in resolv.conf
Florian Zeitz <florob@babelmonkeys.de>
parents:
5566
diff
changeset
|
17 local new_ip = require "util.ip".new_ip; |
3324
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
18 |
2067
0ed6369605bf
net.dns: Updated to use util.windows.get_nameservers for enumerating nameservers on Windows.
Waqas Hussain <waqas20@gmail.com>
parents:
2027
diff
changeset
|
19 local _, windows = pcall(require, "util.windows"); |
0ed6369605bf
net.dns: Updated to use util.windows.get_nameservers for enumerating nameservers on Windows.
Waqas Hussain <waqas20@gmail.com>
parents:
2027
diff
changeset
|
20 local is_windows = (_ and windows) or os.getenv("WINDIR"); |
337 | 21 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
22 local coroutine, io, math, string, table = |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
23 coroutine, io, math, string, table; |
337 | 24 |
3747
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
25 local ipairs, next, pairs, print, setmetatable, tostring, assert, error, unpack, select, type= |
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
26 ipairs, next, pairs, print, setmetatable, tostring, assert, error, unpack, select, type; |
3719
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
27 |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
28 local ztact = { -- public domain 20080404 lua@ztact.com |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
29 get = function(parent, ...) |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
30 local len = select('#', ...); |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
31 for i=1,len do |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
32 parent = parent[select(i, ...)]; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
33 if parent == nil then break; end |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
34 end |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
35 return parent; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
36 end; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
37 set = function(parent, ...) |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
38 local len = select('#', ...); |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
39 local key, value = select(len-1, ...); |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
40 local cutpoint, cutkey; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
41 |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
42 for i=1,len-2 do |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
43 local key = select (i, ...) |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
44 local child = parent[key] |
337 | 45 |
3719
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
46 if value == nil then |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
47 if child == nil then |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
48 return; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
49 elseif next(child, next(child)) then |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
50 cutpoint = nil; cutkey = nil; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
51 elseif cutpoint == nil then |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
52 cutpoint = parent; cutkey = key; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
53 end |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
54 elseif child == nil then |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
55 child = {}; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
56 parent[key] = child; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
57 end |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
58 parent = child |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
59 end |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
60 |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
61 if value == nil and cutpoint then |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
62 cutpoint[cutkey] = nil; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
63 else |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
64 parent[key] = value; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
65 return value; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
66 end |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
67 end; |
0f87632b87e9
net.dns: Removed dependency on util.ztact by moving ztact.get/set in.
Waqas Hussain <waqas20@gmail.com>
parents:
3544
diff
changeset
|
68 }; |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
69 local get, set = ztact.get, ztact.set; |
337 | 70 |
3327
b447682f2a8d
net.dns: Make timeout configurable (default 15s)
Matthew Wild <mwild1@gmail.com>
parents:
3326
diff
changeset
|
71 local default_timeout = 15; |
337 | 72 |
73 -------------------------------------------------- module dns | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
74 module('dns') |
337 | 75 local dns = _M; |
76 | |
77 | |
78 -- dns type & class codes ------------------------------ dns type & class codes | |
79 | |
80 | |
81 local append = table.insert | |
82 | |
83 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
84 local function highbyte(i) -- - - - - - - - - - - - - - - - - - - highbyte |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
85 return (i-(i%0x100))/0x100; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
86 end |
337 | 87 |
88 | |
89 local function augment (t) -- - - - - - - - - - - - - - - - - - - - augment | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
90 local a = {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
91 for i,s in pairs(t) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
92 a[i] = s; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
93 a[s] = s; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
94 a[string.lower(s)] = s; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
95 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
96 return a; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
97 end |
337 | 98 |
99 | |
100 local function encode (t) -- - - - - - - - - - - - - - - - - - - - - encode | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
101 local code = {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
102 for i,s in pairs(t) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
103 local word = string.char(highbyte(i), i%0x100); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
104 code[i] = word; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
105 code[s] = word; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
106 code[string.lower(s)] = word; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
107 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
108 return code; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
109 end |
337 | 110 |
111 | |
112 dns.types = { | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
113 'A', 'NS', 'MD', 'MF', 'CNAME', 'SOA', 'MB', 'MG', 'MR', 'NULL', 'WKS', |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
114 'PTR', 'HINFO', 'MINFO', 'MX', 'TXT', |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
115 [ 28] = 'AAAA', [ 29] = 'LOC', [ 33] = 'SRV', |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
116 [252] = 'AXFR', [253] = 'MAILB', [254] = 'MAILA', [255] = '*' }; |
337 | 117 |
118 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
119 dns.classes = { 'IN', 'CS', 'CH', 'HS', [255] = '*' }; |
337 | 120 |
121 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
122 dns.type = augment (dns.types); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
123 dns.class = augment (dns.classes); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
124 dns.typecode = encode (dns.types); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
125 dns.classcode = encode (dns.classes); |
337 | 126 |
127 | |
128 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
129 local function standardize(qname, qtype, qclass) -- - - - - - - standardize |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
130 if string.byte(qname, -1) ~= 0x2E then qname = qname..'.'; end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
131 qname = string.lower(qname); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
132 return qname, dns.type[qtype or 'A'], dns.class[qclass or 'IN']; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
133 end |
337 | 134 |
135 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
136 local function prune(rrs, time, soft) -- - - - - - - - - - - - - - - prune |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
137 time = time or socket.gettime(); |
6463
460584257cc9
net.dns: Avoid duplicate cache entries
Florian Zeitz <florob@babelmonkeys.de>
parents:
6310
diff
changeset
|
138 for i,rr in ipairs(rrs) do |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
139 if rr.tod then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
140 -- rr.tod = rr.tod - 50 -- accelerated decripitude |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
141 rr.ttl = math.floor(rr.tod - time); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
142 if rr.ttl <= 0 then |
6463
460584257cc9
net.dns: Avoid duplicate cache entries
Florian Zeitz <florob@babelmonkeys.de>
parents:
6310
diff
changeset
|
143 rrs[rr[rr.type:lower()]] = nil; |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
144 table.remove(rrs, i); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
145 return prune(rrs, time, soft); -- Re-iterate |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
146 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
147 elseif soft == 'soft' then -- What is this? I forget! |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
148 assert(rr.ttl == 0); |
6463
460584257cc9
net.dns: Avoid duplicate cache entries
Florian Zeitz <florob@babelmonkeys.de>
parents:
6310
diff
changeset
|
149 rrs[rr[rr.type:lower()]] = nil; |
460584257cc9
net.dns: Avoid duplicate cache entries
Florian Zeitz <florob@babelmonkeys.de>
parents:
6310
diff
changeset
|
150 table.remove(rrs, i); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
151 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
152 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
153 end |
337 | 154 |
155 | |
156 -- metatables & co. ------------------------------------------ metatables & co. | |
157 | |
158 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
159 local resolver = {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
160 resolver.__index = resolver; |
337 | 161 |
3327
b447682f2a8d
net.dns: Make timeout configurable (default 15s)
Matthew Wild <mwild1@gmail.com>
parents:
3326
diff
changeset
|
162 resolver.timeout = default_timeout; |
337 | 163 |
3747
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
164 local function default_rr_tostring(rr) |
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
165 local rr_val = rr.type and rr[rr.type:lower()]; |
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
166 if type(rr_val) ~= "string" then |
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
167 return "<UNKNOWN RDATA TYPE>"; |
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
168 end |
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
169 return rr_val; |
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
170 end |
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
171 |
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
172 local special_tostrings = { |
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
173 LOC = resolver.LOC_tostring; |
4125
5cf13260edec
net.dns: Fix tostring() for SRV records
Matthew Wild <mwild1@gmail.com>
parents:
3955
diff
changeset
|
174 MX = function (rr) |
5cf13260edec
net.dns: Fix tostring() for SRV records
Matthew Wild <mwild1@gmail.com>
parents:
3955
diff
changeset
|
175 return string.format('%2i %s', rr.pref, rr.mx); |
5cf13260edec
net.dns: Fix tostring() for SRV records
Matthew Wild <mwild1@gmail.com>
parents:
3955
diff
changeset
|
176 end; |
5cf13260edec
net.dns: Fix tostring() for SRV records
Matthew Wild <mwild1@gmail.com>
parents:
3955
diff
changeset
|
177 SRV = function (rr) |
5cf13260edec
net.dns: Fix tostring() for SRV records
Matthew Wild <mwild1@gmail.com>
parents:
3955
diff
changeset
|
178 local s = rr.srv; |
5cf13260edec
net.dns: Fix tostring() for SRV records
Matthew Wild <mwild1@gmail.com>
parents:
3955
diff
changeset
|
179 return string.format('%5d %5d %5d %s', s.priority, s.weight, s.port, s.target); |
5cf13260edec
net.dns: Fix tostring() for SRV records
Matthew Wild <mwild1@gmail.com>
parents:
3955
diff
changeset
|
180 end; |
3747
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
181 }; |
337 | 182 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
183 local rr_metatable = {}; -- - - - - - - - - - - - - - - - - - - rr_metatable |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
184 function rr_metatable.__tostring(rr) |
3747
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
185 local rr_string = (special_tostrings[rr.type] or default_rr_tostring)(rr); |
7d5b135bf268
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d
Matthew Wild <mwild1@gmail.com>
parents:
3746
diff
changeset
|
186 return string.format('%2s %-5s %6i %-28s %s', rr.class, rr.type, rr.ttl, rr.name, rr_string); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
187 end |
337 | 188 |
189 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
190 local rrs_metatable = {}; -- - - - - - - - - - - - - - - - - - rrs_metatable |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
191 function rrs_metatable.__tostring(rrs) |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
192 local t = {}; |
6463
460584257cc9
net.dns: Avoid duplicate cache entries
Florian Zeitz <florob@babelmonkeys.de>
parents:
6310
diff
changeset
|
193 for i,rr in ipairs(rrs) do |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
194 append(t, tostring(rr)..'\n'); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
195 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
196 return table.concat(t); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
197 end |
337 | 198 |
199 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
200 local cache_metatable = {}; -- - - - - - - - - - - - - - - - cache_metatable |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
201 function cache_metatable.__tostring(cache) |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
202 local time = socket.gettime(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
203 local t = {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
204 for class,types in pairs(cache) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
205 for type,names in pairs(types) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
206 for name,rrs in pairs(names) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
207 prune(rrs, time); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
208 append(t, tostring(rrs)); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
209 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
210 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
211 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
212 return table.concat(t); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
213 end |
337 | 214 |
215 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
216 function resolver:new() -- - - - - - - - - - - - - - - - - - - - - resolver |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
217 local r = { active = {}, cache = {}, unsorted = {} }; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
218 setmetatable(r, resolver); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
219 setmetatable(r.cache, cache_metatable); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
220 setmetatable(r.unsorted, { __mode = 'kv' }); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
221 return r; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
222 end |
337 | 223 |
224 | |
225 -- packet layer -------------------------------------------------- packet layer | |
226 | |
227 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
228 function dns.random(...) -- - - - - - - - - - - - - - - - - - - dns.random |
6645
4f934cf03bc9
net.dns: Make sure argument to math.randomseed does not overflow a 32 bit *signed* int (blame Lua). Closes #439
Kim Alvefur <zash@zash.se>
parents:
6631
diff
changeset
|
229 math.randomseed(math.floor(10000*socket.gettime()) % 0x80000000); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
230 dns.random = math.random; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
231 return dns.random(...); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
232 end |
337 | 233 |
234 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
235 local function encodeHeader(o) -- - - - - - - - - - - - - - - encodeHeader |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
236 o = o or {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
237 o.id = o.id or dns.random(0, 0xffff); -- 16b (random) id |
337 | 238 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
239 o.rd = o.rd or 1; -- 1b 1 recursion desired |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
240 o.tc = o.tc or 0; -- 1b 1 truncated response |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
241 o.aa = o.aa or 0; -- 1b 1 authoritative response |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
242 o.opcode = o.opcode or 0; -- 4b 0 query |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
243 -- 1 inverse query |
337 | 244 -- 2 server status request |
245 -- 3-15 reserved | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
246 o.qr = o.qr or 0; -- 1b 0 query, 1 response |
337 | 247 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
248 o.rcode = o.rcode or 0; -- 4b 0 no error |
337 | 249 -- 1 format error |
250 -- 2 server failure | |
251 -- 3 name error | |
252 -- 4 not implemented | |
253 -- 5 refused | |
254 -- 6-15 reserved | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
255 o.z = o.z or 0; -- 3b 0 resvered |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
256 o.ra = o.ra or 0; -- 1b 1 recursion available |
337 | 257 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
258 o.qdcount = o.qdcount or 1; -- 16b number of question RRs |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
259 o.ancount = o.ancount or 0; -- 16b number of answers RRs |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
260 o.nscount = o.nscount or 0; -- 16b number of nameservers RRs |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
261 o.arcount = o.arcount or 0; -- 16b number of additional RRs |
337 | 262 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
263 -- string.char() rounds, so prevent roundup with -0.4999 |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
264 local header = string.char( |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
265 highbyte(o.id), o.id %0x100, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
266 o.rd + 2*o.tc + 4*o.aa + 8*o.opcode + 128*o.qr, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
267 o.rcode + 16*o.z + 128*o.ra, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
268 highbyte(o.qdcount), o.qdcount %0x100, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
269 highbyte(o.ancount), o.ancount %0x100, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
270 highbyte(o.nscount), o.nscount %0x100, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
271 highbyte(o.arcount), o.arcount %0x100 |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
272 ); |
337 | 273 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
274 return header, o.id; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
275 end |
337 | 276 |
277 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
278 local function encodeName(name) -- - - - - - - - - - - - - - - - encodeName |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
279 local t = {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
280 for part in string.gmatch(name, '[^.]+') do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
281 append(t, string.char(string.len(part))); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
282 append(t, part); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
283 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
284 append(t, string.char(0)); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
285 return table.concat(t); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
286 end |
337 | 287 |
288 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
289 local function encodeQuestion(qname, qtype, qclass) -- - - - encodeQuestion |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
290 qname = encodeName(qname); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
291 qtype = dns.typecode[qtype or 'a']; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
292 qclass = dns.classcode[qclass or 'in']; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
293 return qname..qtype..qclass; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
294 end |
337 | 295 |
296 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
297 function resolver:byte(len) -- - - - - - - - - - - - - - - - - - - - - byte |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
298 len = len or 1; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
299 local offset = self.offset; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
300 local last = offset + len - 1; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
301 if last > #self.packet then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
302 error(string.format('out of bounds: %i>%i', last, #self.packet)); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
303 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
304 self.offset = offset + len; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
305 return string.byte(self.packet, offset, last); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
306 end |
337 | 307 |
308 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
309 function resolver:word() -- - - - - - - - - - - - - - - - - - - - - - word |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
310 local b1, b2 = self:byte(2); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
311 return 0x100*b1 + b2; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
312 end |
337 | 313 |
314 | |
315 function resolver:dword () -- - - - - - - - - - - - - - - - - - - - - dword | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
316 local b1, b2, b3, b4 = self:byte(4); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
317 --print('dword', b1, b2, b3, b4); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
318 return 0x1000000*b1 + 0x10000*b2 + 0x100*b3 + b4; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
319 end |
337 | 320 |
321 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
322 function resolver:sub(len) -- - - - - - - - - - - - - - - - - - - - - - sub |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
323 len = len or 1; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
324 local s = string.sub(self.packet, self.offset, self.offset + len - 1); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
325 self.offset = self.offset + len; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
326 return s; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
327 end |
337 | 328 |
329 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
330 function resolver:header(force) -- - - - - - - - - - - - - - - - - - header |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
331 local id = self:word(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
332 --print(string.format(':header id %x', id)); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
333 if not self.active[id] and not force then return nil; end |
337 | 334 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
335 local h = { id = id }; |
337 | 336 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
337 local b1, b2 = self:byte(2); |
337 | 338 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
339 h.rd = b1 %2; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
340 h.tc = b1 /2%2; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
341 h.aa = b1 /4%2; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
342 h.opcode = b1 /8%16; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
343 h.qr = b1 /128; |
337 | 344 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
345 h.rcode = b2 %16; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
346 h.z = b2 /16%8; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
347 h.ra = b2 /128; |
337 | 348 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
349 h.qdcount = self:word(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
350 h.ancount = self:word(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
351 h.nscount = self:word(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
352 h.arcount = self:word(); |
337 | 353 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
354 for k,v in pairs(h) do h[k] = v-v%1; end |
337 | 355 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
356 return h; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
357 end |
337 | 358 |
359 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
360 function resolver:name() -- - - - - - - - - - - - - - - - - - - - - - name |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
361 local remember, pointers = nil, 0; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
362 local len = self:byte(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
363 local n = {}; |
4422
c25dee24623f
s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents:
4400
diff
changeset
|
364 if len == 0 then return "." end -- Root label |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
365 while len > 0 do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
366 if len >= 0xc0 then -- name is "compressed" |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
367 pointers = pointers + 1; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
368 if pointers >= 20 then error('dns error: 20 pointers'); end; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
369 local offset = ((len-0xc0)*0x100) + self:byte(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
370 remember = remember or self.offset; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
371 self.offset = offset + 1; -- +1 for lua |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
372 else -- name is not compressed |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
373 append(n, self:sub(len)..'.'); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
374 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
375 len = self:byte(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
376 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
377 self.offset = remember or self.offset; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
378 return table.concat(n); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
379 end |
337 | 380 |
381 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
382 function resolver:question() -- - - - - - - - - - - - - - - - - - question |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
383 local q = {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
384 q.name = self:name(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
385 q.type = dns.type[self:word()]; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
386 q.class = dns.class[self:word()]; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
387 return q; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
388 end |
337 | 389 |
390 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
391 function resolver:A(rr) -- - - - - - - - - - - - - - - - - - - - - - - - A |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
392 local b1, b2, b3, b4 = self:byte(4); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
393 rr.a = string.format('%i.%i.%i.%i', b1, b2, b3, b4); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
394 end |
337 | 395 |
4267
29d7eb6ff62c
net.dns: Support for resolving AAAA records
Matthew Wild <mwild1@gmail.com>
parents:
4251
diff
changeset
|
396 function resolver:AAAA(rr) |
29d7eb6ff62c
net.dns: Support for resolving AAAA records
Matthew Wild <mwild1@gmail.com>
parents:
4251
diff
changeset
|
397 local addr = {}; |
29d7eb6ff62c
net.dns: Support for resolving AAAA records
Matthew Wild <mwild1@gmail.com>
parents:
4251
diff
changeset
|
398 for i = 1, rr.rdlength, 2 do |
29d7eb6ff62c
net.dns: Support for resolving AAAA records
Matthew Wild <mwild1@gmail.com>
parents:
4251
diff
changeset
|
399 local b1, b2 = self:byte(2); |
29d7eb6ff62c
net.dns: Support for resolving AAAA records
Matthew Wild <mwild1@gmail.com>
parents:
4251
diff
changeset
|
400 table.insert(addr, ("%02x%02x"):format(b1, b2)); |
29d7eb6ff62c
net.dns: Support for resolving AAAA records
Matthew Wild <mwild1@gmail.com>
parents:
4251
diff
changeset
|
401 end |
4373 | 402 addr = table.concat(addr, ":"):gsub("%f[%x]0+(%x)","%1"); |
403 local zeros = {}; | |
404 for item in addr:gmatch(":[0:]+:") do | |
405 table.insert(zeros, item) | |
406 end | |
407 if #zeros == 0 then | |
408 rr.aaaa = addr; | |
409 return | |
410 elseif #zeros > 1 then | |
411 table.sort(zeros, function(a, b) return #a > #b end); | |
412 end | |
413 rr.aaaa = addr:gsub(zeros[1], "::", 1):gsub("^0::", "::"):gsub("::0$", "::"); | |
4267
29d7eb6ff62c
net.dns: Support for resolving AAAA records
Matthew Wild <mwild1@gmail.com>
parents:
4251
diff
changeset
|
414 end |
337 | 415 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
416 function resolver:CNAME(rr) -- - - - - - - - - - - - - - - - - - - - CNAME |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
417 rr.cname = self:name(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
418 end |
337 | 419 |
420 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
421 function resolver:MX(rr) -- - - - - - - - - - - - - - - - - - - - - - - MX |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
422 rr.pref = self:word(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
423 rr.mx = self:name(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
424 end |
337 | 425 |
426 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
427 function resolver:LOC_nibble_power() -- - - - - - - - - - LOC_nibble_power |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
428 local b = self:byte(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
429 --print('nibbles', ((b-(b%0x10))/0x10), (b%0x10)); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
430 return ((b-(b%0x10))/0x10) * (10^(b%0x10)); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
431 end |
337 | 432 |
433 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
434 function resolver:LOC(rr) -- - - - - - - - - - - - - - - - - - - - - - LOC |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
435 rr.version = self:byte(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
436 if rr.version == 0 then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
437 rr.loc = rr.loc or {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
438 rr.loc.size = self:LOC_nibble_power(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
439 rr.loc.horiz_pre = self:LOC_nibble_power(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
440 rr.loc.vert_pre = self:LOC_nibble_power(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
441 rr.loc.latitude = self:dword(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
442 rr.loc.longitude = self:dword(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
443 rr.loc.altitude = self:dword(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
444 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
445 end |
337 | 446 |
447 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
448 local function LOC_tostring_degrees(f, pos, neg) -- - - - - - - - - - - - - |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
449 f = f - 0x80000000; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
450 if f < 0 then pos = neg; f = -f; end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
451 local deg, min, msec; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
452 msec = f%60000; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
453 f = (f-msec)/60000; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
454 min = f%60; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
455 deg = (f-min)/60; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
456 return string.format('%3d %2d %2.3f %s', deg, min, msec/1000, pos); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
457 end |
337 | 458 |
459 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
460 function resolver.LOC_tostring(rr) -- - - - - - - - - - - - - LOC_tostring |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
461 local t = {}; |
337 | 462 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
463 --[[ |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
464 for k,name in pairs { 'size', 'horiz_pre', 'vert_pre', 'latitude', 'longitude', 'altitude' } do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
465 append(t, string.format('%4s%-10s: %12.0f\n', '', name, rr.loc[name])); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
466 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
467 --]] |
337 | 468 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
469 append(t, string.format( |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
470 '%s %s %.2fm %.2fm %.2fm %.2fm', |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
471 LOC_tostring_degrees (rr.loc.latitude, 'N', 'S'), |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
472 LOC_tostring_degrees (rr.loc.longitude, 'E', 'W'), |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
473 (rr.loc.altitude - 10000000) / 100, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
474 rr.loc.size / 100, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
475 rr.loc.horiz_pre / 100, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
476 rr.loc.vert_pre / 100 |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
477 )); |
337 | 478 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
479 return table.concat(t); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
480 end |
337 | 481 |
482 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
483 function resolver:NS(rr) -- - - - - - - - - - - - - - - - - - - - - - - NS |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
484 rr.ns = self:name(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
485 end |
337 | 486 |
487 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
488 function resolver:SOA(rr) -- - - - - - - - - - - - - - - - - - - - - - SOA |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
489 end |
337 | 490 |
491 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
492 function resolver:SRV(rr) -- - - - - - - - - - - - - - - - - - - - - - SRV |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
493 rr.srv = {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
494 rr.srv.priority = self:word(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
495 rr.srv.weight = self:word(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
496 rr.srv.port = self:word(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
497 rr.srv.target = self:name(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
498 end |
337 | 499 |
3513
4cf5962747fc
net.dns: Support for parsing PTR records
Matthew Wild <mwild1@gmail.com>
parents:
3512
diff
changeset
|
500 function resolver:PTR(rr) |
4cf5962747fc
net.dns: Support for parsing PTR records
Matthew Wild <mwild1@gmail.com>
parents:
3512
diff
changeset
|
501 rr.ptr = self:name(); |
4cf5962747fc
net.dns: Support for parsing PTR records
Matthew Wild <mwild1@gmail.com>
parents:
3512
diff
changeset
|
502 end |
337 | 503 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
504 function resolver:TXT(rr) -- - - - - - - - - - - - - - - - - - - - - - TXT |
4251 | 505 rr.txt = self:sub (self:byte()); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
506 end |
337 | 507 |
508 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
509 function resolver:rr() -- - - - - - - - - - - - - - - - - - - - - - - - rr |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
510 local rr = {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
511 setmetatable(rr, rr_metatable); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
512 rr.name = self:name(self); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
513 rr.type = dns.type[self:word()] or rr.type; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
514 rr.class = dns.class[self:word()] or rr.class; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
515 rr.ttl = 0x10000*self:word() + self:word(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
516 rr.rdlength = self:word(); |
337 | 517 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
518 if rr.ttl <= 0 then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
519 rr.tod = self.time + 30; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
520 else |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
521 rr.tod = self.time + rr.ttl; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
522 end |
337 | 523 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
524 local remember = self.offset; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
525 local rr_parser = self[dns.type[rr.type]]; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
526 if rr_parser then rr_parser(self, rr); end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
527 self.offset = remember; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
528 rr.rdata = self:sub(rr.rdlength); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
529 return rr; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
530 end |
337 | 531 |
532 | |
533 function resolver:rrs (count) -- - - - - - - - - - - - - - - - - - - - - rrs | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
534 local rrs = {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
535 for i = 1,count do append(rrs, self:rr()); end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
536 return rrs; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
537 end |
337 | 538 |
539 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
540 function resolver:decode(packet, force) -- - - - - - - - - - - - - - decode |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
541 self.packet, self.offset = packet, 1; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
542 local header = self:header(force); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
543 if not header then return nil; end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
544 local response = { header = header }; |
337 | 545 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
546 response.question = {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
547 local offset = self.offset; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
548 for i = 1,response.header.qdcount do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
549 append(response.question, self:question()); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
550 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
551 response.question.raw = string.sub(self.packet, offset, self.offset - 1); |
337 | 552 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
553 if not force then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
554 if not self.active[response.header.id] or not self.active[response.header.id][response.question.raw] then |
5266
5c3a3ef6b769
net.dns: Clean up query list when a server is marked down
Matthew Wild <mwild1@gmail.com>
parents:
4422
diff
changeset
|
555 self.active[response.header.id] = nil; |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
556 return nil; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
557 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
558 end |
337 | 559 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
560 response.answer = self:rrs(response.header.ancount); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
561 response.authority = self:rrs(response.header.nscount); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
562 response.additional = self:rrs(response.header.arcount); |
337 | 563 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
564 return response; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
565 end |
337 | 566 |
567 | |
568 -- socket layer -------------------------------------------------- socket layer | |
569 | |
570 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
571 resolver.delays = { 1, 3 }; |
337 | 572 |
573 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
574 function resolver:addnameserver(address) -- - - - - - - - - - addnameserver |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
575 self.server = self.server or {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
576 append(self.server, address); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
577 end |
337 | 578 |
579 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
580 function resolver:setnameserver(address) -- - - - - - - - - - setnameserver |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
581 self.server = {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
582 self:addnameserver(address); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
583 end |
337 | 584 |
585 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
586 function resolver:adddefaultnameservers() -- - - - - adddefaultnameservers |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
587 if is_windows then |
3544
f2aca3e0fe3b
net.dns: Fixed a traceback when util/windows.dll is unavailable on windows.
Waqas Hussain <waqas20@gmail.com>
parents:
3540
diff
changeset
|
588 if windows and windows.get_nameservers then |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
589 for _, server in ipairs(windows.get_nameservers()) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
590 self:addnameserver(server); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
591 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
592 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
593 if not self.server or #self.server == 0 then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
594 -- TODO log warning about no nameservers, adding opendns servers as fallback |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
595 self:addnameserver("208.67.222.222"); |
2742
6c0a081cd766
net.dns: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2741
diff
changeset
|
596 self:addnameserver("208.67.220.220"); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
597 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
598 else -- posix |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
599 local resolv_conf = io.open("/etc/resolv.conf"); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
600 if resolv_conf then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
601 for line in resolv_conf:lines() do |
2741
fcd30b72c50c
net.dns: More reliable parsing of resolv.conf - allow multiple nameserver IPs on one line (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents:
2620
diff
changeset
|
602 line = line:gsub("#.*$", "") |
5705
6eebd5808fbc
net.dns: Support IPv6 addresses in resolv.conf
Florian Zeitz <florob@babelmonkeys.de>
parents:
5566
diff
changeset
|
603 :match('^%s*nameserver%s+([%x:%.]*)%s*$'); |
2741
fcd30b72c50c
net.dns: More reliable parsing of resolv.conf - allow multiple nameserver IPs on one line (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents:
2620
diff
changeset
|
604 if line then |
5705
6eebd5808fbc
net.dns: Support IPv6 addresses in resolv.conf
Florian Zeitz <florob@babelmonkeys.de>
parents:
5566
diff
changeset
|
605 local ip = new_ip(line); |
6eebd5808fbc
net.dns: Support IPv6 addresses in resolv.conf
Florian Zeitz <florob@babelmonkeys.de>
parents:
5566
diff
changeset
|
606 if ip then |
6eebd5808fbc
net.dns: Support IPv6 addresses in resolv.conf
Florian Zeitz <florob@babelmonkeys.de>
parents:
5566
diff
changeset
|
607 self:addnameserver(ip.addr); |
6eebd5808fbc
net.dns: Support IPv6 addresses in resolv.conf
Florian Zeitz <florob@babelmonkeys.de>
parents:
5566
diff
changeset
|
608 end |
2741
fcd30b72c50c
net.dns: More reliable parsing of resolv.conf - allow multiple nameserver IPs on one line (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents:
2620
diff
changeset
|
609 end |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
610 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
611 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
612 if not self.server or #self.server == 0 then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
613 -- TODO log warning about no nameservers, adding localhost as the default nameserver |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
614 self:addnameserver("127.0.0.1"); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
615 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
616 end |
399
93b6587d9afb
Added temporary fix for srv on windows: using opendns nameservers
Waqas Hussain <waqas20@gmail.com>
parents:
379
diff
changeset
|
617 end |
337 | 618 |
619 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
620 function resolver:getsocket(servernum) -- - - - - - - - - - - - - getsocket |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
621 self.socket = self.socket or {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
622 self.socketset = self.socketset or {}; |
337 | 623 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
624 local sock = self.socket[servernum]; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
625 if sock then return sock; end |
337 | 626 |
6509
7cb69eba3e95
net.dns: Try next server if peer name can not be set (thanks wirehack7)
Kim Alvefur <zash@zash.se>
parents:
6508
diff
changeset
|
627 local ok, err; |
5705
6eebd5808fbc
net.dns: Support IPv6 addresses in resolv.conf
Florian Zeitz <florob@babelmonkeys.de>
parents:
5566
diff
changeset
|
628 local peer = self.server[servernum]; |
6eebd5808fbc
net.dns: Support IPv6 addresses in resolv.conf
Florian Zeitz <florob@babelmonkeys.de>
parents:
5566
diff
changeset
|
629 if peer:find(":") then |
6eebd5808fbc
net.dns: Support IPv6 addresses in resolv.conf
Florian Zeitz <florob@babelmonkeys.de>
parents:
5566
diff
changeset
|
630 sock, err = socket.udp6(); |
6eebd5808fbc
net.dns: Support IPv6 addresses in resolv.conf
Florian Zeitz <florob@babelmonkeys.de>
parents:
5566
diff
changeset
|
631 else |
6eebd5808fbc
net.dns: Support IPv6 addresses in resolv.conf
Florian Zeitz <florob@babelmonkeys.de>
parents:
5566
diff
changeset
|
632 sock, err = socket.udp(); |
6eebd5808fbc
net.dns: Support IPv6 addresses in resolv.conf
Florian Zeitz <florob@babelmonkeys.de>
parents:
5566
diff
changeset
|
633 end |
5730
411e9e7d8035
net.dns, net.adns: Make sure errors from net.server are propagated (thanks asterix)
Kim Alvefur <zash@zash.se>
parents:
5566
diff
changeset
|
634 if sock and self.socket_wrapper then sock, err = self.socket_wrapper(sock, self); end |
3954
6e22b0cf3d72
net.dns: resolver:getsocket(): Return nil, err on failure
Matthew Wild <mwild1@gmail.com>
parents:
3747
diff
changeset
|
635 if not sock then |
6e22b0cf3d72
net.dns: resolver:getsocket(): Return nil, err on failure
Matthew Wild <mwild1@gmail.com>
parents:
3747
diff
changeset
|
636 return nil, err; |
6e22b0cf3d72
net.dns: resolver:getsocket(): Return nil, err on failure
Matthew Wild <mwild1@gmail.com>
parents:
3747
diff
changeset
|
637 end |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
638 sock:settimeout(0); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
639 -- todo: attempt to use a random port, fallback to 0 |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
640 self.socket[servernum] = sock; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
641 self.socketset[sock] = servernum; |
6509
7cb69eba3e95
net.dns: Try next server if peer name can not be set (thanks wirehack7)
Kim Alvefur <zash@zash.se>
parents:
6508
diff
changeset
|
642 -- set{sock,peer}name can fail, eg because of local routing table |
7cb69eba3e95
net.dns: Try next server if peer name can not be set (thanks wirehack7)
Kim Alvefur <zash@zash.se>
parents:
6508
diff
changeset
|
643 -- if so, try the next server |
7cb69eba3e95
net.dns: Try next server if peer name can not be set (thanks wirehack7)
Kim Alvefur <zash@zash.se>
parents:
6508
diff
changeset
|
644 ok, err = sock:setsockname('*', 0); |
7cb69eba3e95
net.dns: Try next server if peer name can not be set (thanks wirehack7)
Kim Alvefur <zash@zash.se>
parents:
6508
diff
changeset
|
645 if not ok then return self:servfail(sock, err); end |
6510 | 646 ok, err = sock:setpeername(peer, 53); |
6509
7cb69eba3e95
net.dns: Try next server if peer name can not be set (thanks wirehack7)
Kim Alvefur <zash@zash.se>
parents:
6508
diff
changeset
|
647 if not ok then return self:servfail(sock, err); end |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
648 return sock; |
1786
4016d8bc30b8
net.dns: Multiple internal changes and API extensions to allow for more reliable DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
649 end |
337 | 650 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
651 function resolver:voidsocket(sock) |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
652 if self.socket[sock] then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
653 self.socketset[self.socket[sock]] = nil; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
654 self.socket[sock] = nil; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
655 elseif self.socketset[sock] then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
656 self.socket[self.socketset[sock]] = nil; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
657 self.socketset[sock] = nil; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
658 end |
5267
a2080e5c4eda
net.dns: Close voided sockets, so they don't stay in net.server
Kim Alvefur <zash@zash.se>
parents:
5266
diff
changeset
|
659 sock:close(); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
660 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
661 |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
662 function resolver:socket_wrapper_set(func) -- - - - - - - socket_wrapper_set |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
663 self.socket_wrapper = func; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
664 end |
337 | 665 |
666 | |
667 function resolver:closeall () -- - - - - - - - - - - - - - - - - - closeall | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
668 for i,sock in ipairs(self.socket) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
669 self.socket[i] = nil; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
670 self.socketset[sock] = nil; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
671 sock:close(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
672 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
673 end |
337 | 674 |
675 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
676 function resolver:remember(rr, type) -- - - - - - - - - - - - - - remember |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
677 --print ('remember', type, rr.class, rr.type, rr.name) |
2620
481c6724818f
net.dns: Normalize records before placing them in the cache, fixes issues with CNAME targets in CAPS (fixes #161)
Matthew Wild <mwild1@gmail.com>
parents:
2619
diff
changeset
|
678 local qname, qtype, qclass = standardize(rr.name, rr.type, rr.class); |
337 | 679 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
680 if type ~= '*' then |
2620
481c6724818f
net.dns: Normalize records before placing them in the cache, fixes issues with CNAME targets in CAPS (fixes #161)
Matthew Wild <mwild1@gmail.com>
parents:
2619
diff
changeset
|
681 type = qtype; |
481c6724818f
net.dns: Normalize records before placing them in the cache, fixes issues with CNAME targets in CAPS (fixes #161)
Matthew Wild <mwild1@gmail.com>
parents:
2619
diff
changeset
|
682 local all = get(self.cache, qclass, '*', qname); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
683 --print('remember all', all); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
684 if all then append(all, rr); end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
685 end |
337 | 686 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
687 self.cache = self.cache or setmetatable({}, cache_metatable); |
2620
481c6724818f
net.dns: Normalize records before placing them in the cache, fixes issues with CNAME targets in CAPS (fixes #161)
Matthew Wild <mwild1@gmail.com>
parents:
2619
diff
changeset
|
688 local rrs = get(self.cache, qclass, type, qname) or |
481c6724818f
net.dns: Normalize records before placing them in the cache, fixes issues with CNAME targets in CAPS (fixes #161)
Matthew Wild <mwild1@gmail.com>
parents:
2619
diff
changeset
|
689 set(self.cache, qclass, type, qname, setmetatable({}, rrs_metatable)); |
6463
460584257cc9
net.dns: Avoid duplicate cache entries
Florian Zeitz <florob@babelmonkeys.de>
parents:
6310
diff
changeset
|
690 if not rrs[rr[qtype:lower()]] then |
460584257cc9
net.dns: Avoid duplicate cache entries
Florian Zeitz <florob@babelmonkeys.de>
parents:
6310
diff
changeset
|
691 rrs[rr[qtype:lower()]] = true; |
460584257cc9
net.dns: Avoid duplicate cache entries
Florian Zeitz <florob@babelmonkeys.de>
parents:
6310
diff
changeset
|
692 append(rrs, rr); |
460584257cc9
net.dns: Avoid duplicate cache entries
Florian Zeitz <florob@babelmonkeys.de>
parents:
6310
diff
changeset
|
693 end |
337 | 694 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
695 if type == 'MX' then self.unsorted[rrs] = true; end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
696 end |
337 | 697 |
698 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
699 local function comp_mx(a, b) -- - - - - - - - - - - - - - - - - - - comp_mx |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
700 return (a.pref == b.pref) and (a.mx < b.mx) or (a.pref < b.pref); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
701 end |
337 | 702 |
703 | |
6631
45222bfb206f
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
Kim Alvefur <zash@zash.se>
parents:
6509
diff
changeset
|
704 function resolver:peek (qname, qtype, qclass, n) -- - - - - - - - - - - - peek |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
705 qname, qtype, qclass = standardize(qname, qtype, qclass); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
706 local rrs = get(self.cache, qclass, qtype, qname); |
6631
45222bfb206f
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
Kim Alvefur <zash@zash.se>
parents:
6509
diff
changeset
|
707 if not rrs then |
45222bfb206f
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
Kim Alvefur <zash@zash.se>
parents:
6509
diff
changeset
|
708 if n then if n <= 0 then return end else n = 3 end |
45222bfb206f
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
Kim Alvefur <zash@zash.se>
parents:
6509
diff
changeset
|
709 rrs = get(self.cache, qclass, "CNAME", qname); |
45222bfb206f
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
Kim Alvefur <zash@zash.se>
parents:
6509
diff
changeset
|
710 if not (rrs and rrs[1]) then return end |
45222bfb206f
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
Kim Alvefur <zash@zash.se>
parents:
6509
diff
changeset
|
711 return self:peek(rrs[1].cname, qtype, qclass, n - 1); |
45222bfb206f
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
Kim Alvefur <zash@zash.se>
parents:
6509
diff
changeset
|
712 end |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
713 if prune(rrs, socket.gettime()) and qtype == '*' or not next(rrs) then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
714 set(self.cache, qclass, qtype, qname, nil); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
715 return nil; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
716 end |
6631
45222bfb206f
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
Kim Alvefur <zash@zash.se>
parents:
6509
diff
changeset
|
717 if self.unsorted[rrs] then table.sort (rrs, comp_mx); self.unsorted[rrs] = nil; end |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
718 return rrs; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
719 end |
337 | 720 |
721 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
722 function resolver:purge(soft) -- - - - - - - - - - - - - - - - - - - purge |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
723 if soft == 'soft' then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
724 self.time = socket.gettime(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
725 for class,types in pairs(self.cache or {}) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
726 for type,names in pairs(types) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
727 for name,rrs in pairs(names) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
728 prune(rrs, self.time, 'soft') |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
729 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
730 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
731 end |
4400
ac651265766c
net.dns: Preserve metatable on manual cache purge
Matthew Wild <mwild1@gmail.com>
parents:
4373
diff
changeset
|
732 else self.cache = setmetatable({}, cache_metatable); end |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
733 end |
337 | 734 |
735 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
736 function resolver:query(qname, qtype, qclass) -- - - - - - - - - - -- query |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
737 qname, qtype, qclass = standardize(qname, qtype, qclass) |
337 | 738 |
6288
d122420542fb
net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one
Kim Alvefur <zash@zash.se>
parents:
5730
diff
changeset
|
739 local co = coroutine.running(); |
d122420542fb
net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one
Kim Alvefur <zash@zash.se>
parents:
5730
diff
changeset
|
740 local q = get(self.wanted, qclass, qtype, qname); |
d122420542fb
net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one
Kim Alvefur <zash@zash.se>
parents:
5730
diff
changeset
|
741 if co and q then |
d122420542fb
net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one
Kim Alvefur <zash@zash.se>
parents:
5730
diff
changeset
|
742 -- We are already waiting for a reply to an identical query. |
d122420542fb
net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one
Kim Alvefur <zash@zash.se>
parents:
5730
diff
changeset
|
743 set(self.wanted, qclass, qtype, qname, co, true); |
d122420542fb
net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one
Kim Alvefur <zash@zash.se>
parents:
5730
diff
changeset
|
744 return true; |
d122420542fb
net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one
Kim Alvefur <zash@zash.se>
parents:
5730
diff
changeset
|
745 end |
d122420542fb
net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one
Kim Alvefur <zash@zash.se>
parents:
5730
diff
changeset
|
746 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
747 if not self.server then self:adddefaultnameservers(); end |
337 | 748 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
749 local question = encodeQuestion(qname, qtype, qclass); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
750 local peek = self:peek (qname, qtype, qclass); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
751 if peek then return peek; end |
337 | 752 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
753 local header, id = encodeHeader(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
754 --print ('query id', id, qclass, qtype, qname) |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
755 local o = { |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
756 packet = header..question, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
757 server = self.best_server, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
758 delay = 1, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
759 retry = socket.gettime() + self.delays[1] |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
760 }; |
337 | 761 |
3540
bc139431830b
Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents:
3513
diff
changeset
|
762 -- remember the query |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
763 self.active[id] = self.active[id] or {}; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
764 self.active[id][question] = o; |
337 | 765 |
3540
bc139431830b
Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents:
3513
diff
changeset
|
766 -- remember which coroutine wants the answer |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
767 if co then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
768 set(self.wanted, qclass, qtype, qname, co, true); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
769 end |
1786
4016d8bc30b8
net.dns: Multiple internal changes and API extensions to allow for more reliable DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
770 |
3955
a096700d23d9
net.dns: resolver:query(): Handle getsocket() failures, and return true on success
Matthew Wild <mwild1@gmail.com>
parents:
3954
diff
changeset
|
771 local conn, err = self:getsocket(o.server) |
a096700d23d9
net.dns: resolver:query(): Handle getsocket() failures, and return true on success
Matthew Wild <mwild1@gmail.com>
parents:
3954
diff
changeset
|
772 if not conn then |
a096700d23d9
net.dns: resolver:query(): Handle getsocket() failures, and return true on success
Matthew Wild <mwild1@gmail.com>
parents:
3954
diff
changeset
|
773 return nil, err; |
a096700d23d9
net.dns: resolver:query(): Handle getsocket() failures, and return true on success
Matthew Wild <mwild1@gmail.com>
parents:
3954
diff
changeset
|
774 end |
3324
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
775 conn:send (o.packet) |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5731
diff
changeset
|
776 |
3327
b447682f2a8d
net.dns: Make timeout configurable (default 15s)
Matthew Wild <mwild1@gmail.com>
parents:
3326
diff
changeset
|
777 if timer and self.timeout then |
3324
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
778 local num_servers = #self.server; |
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
779 local i = 1; |
3327
b447682f2a8d
net.dns: Make timeout configurable (default 15s)
Matthew Wild <mwild1@gmail.com>
parents:
3326
diff
changeset
|
780 timer.add_task(self.timeout, function () |
3324
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
781 if get(self.wanted, qclass, qtype, qname, co) then |
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
782 if i < num_servers then |
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
783 i = i + 1; |
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
784 self:servfail(conn); |
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
785 o.server = self.best_server; |
3955
a096700d23d9
net.dns: resolver:query(): Handle getsocket() failures, and return true on success
Matthew Wild <mwild1@gmail.com>
parents:
3954
diff
changeset
|
786 conn, err = self:getsocket(o.server); |
a096700d23d9
net.dns: resolver:query(): Handle getsocket() failures, and return true on success
Matthew Wild <mwild1@gmail.com>
parents:
3954
diff
changeset
|
787 if conn then |
a096700d23d9
net.dns: resolver:query(): Handle getsocket() failures, and return true on success
Matthew Wild <mwild1@gmail.com>
parents:
3954
diff
changeset
|
788 conn:send(o.packet); |
a096700d23d9
net.dns: resolver:query(): Handle getsocket() failures, and return true on success
Matthew Wild <mwild1@gmail.com>
parents:
3954
diff
changeset
|
789 return self.timeout; |
a096700d23d9
net.dns: resolver:query(): Handle getsocket() failures, and return true on success
Matthew Wild <mwild1@gmail.com>
parents:
3954
diff
changeset
|
790 end |
3324
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
791 end |
3955
a096700d23d9
net.dns: resolver:query(): Handle getsocket() failures, and return true on success
Matthew Wild <mwild1@gmail.com>
parents:
3954
diff
changeset
|
792 -- Tried everything, failed |
6309
b6f76a52eb36
net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb)
Matthew Wild <mwild1@gmail.com>
parents:
6288
diff
changeset
|
793 self:cancel(qclass, qtype, qname); |
3324
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
794 end |
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
795 end) |
070c8ba71b76
net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary
Matthew Wild <mwild1@gmail.com>
parents:
3057
diff
changeset
|
796 end |
3955
a096700d23d9
net.dns: resolver:query(): Handle getsocket() failures, and return true on success
Matthew Wild <mwild1@gmail.com>
parents:
3954
diff
changeset
|
797 return true; |
869
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
798 end |
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
799 |
6509
7cb69eba3e95
net.dns: Try next server if peer name can not be set (thanks wirehack7)
Kim Alvefur <zash@zash.se>
parents:
6508
diff
changeset
|
800 function resolver:servfail(sock, err) |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
801 -- Resend all queries for this server |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
802 |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
803 local num = self.socketset[sock] |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
804 |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
805 -- Socket is dead now |
6508
4a28b8320d7f
net.dns: Return new socket from servfail
Kim Alvefur <zash@zash.se>
parents:
6463
diff
changeset
|
806 sock = self:voidsocket(sock); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
807 |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
808 -- Find all requests to the down server, and retry on the next server |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
809 self.time = socket.gettime(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
810 for id,queries in pairs(self.active) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
811 for question,o in pairs(queries) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
812 if o.server == num then -- This request was to the broken server |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
813 o.server = o.server + 1 -- Use next server |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
814 if o.server > #self.server then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
815 o.server = 1; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
816 end |
337 | 817 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
818 o.retries = (o.retries or 0) + 1; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
819 if o.retries >= #self.server then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
820 --print('timeout'); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
821 queries[question] = nil; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
822 else |
6509
7cb69eba3e95
net.dns: Try next server if peer name can not be set (thanks wirehack7)
Kim Alvefur <zash@zash.se>
parents:
6508
diff
changeset
|
823 sock, err = self:getsocket(o.server); |
6508
4a28b8320d7f
net.dns: Return new socket from servfail
Kim Alvefur <zash@zash.se>
parents:
6463
diff
changeset
|
824 if sock then sock:send(o.packet); end |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
825 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
826 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
827 end |
5266
5c3a3ef6b769
net.dns: Clean up query list when a server is marked down
Matthew Wild <mwild1@gmail.com>
parents:
4422
diff
changeset
|
828 if next(queries) == nil then |
5c3a3ef6b769
net.dns: Clean up query list when a server is marked down
Matthew Wild <mwild1@gmail.com>
parents:
4422
diff
changeset
|
829 self.active[id] = nil; |
5c3a3ef6b769
net.dns: Clean up query list when a server is marked down
Matthew Wild <mwild1@gmail.com>
parents:
4422
diff
changeset
|
830 end |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
831 end |
3540
bc139431830b
Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents:
3513
diff
changeset
|
832 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
833 if num == self.best_server then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
834 self.best_server = self.best_server + 1; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
835 if self.best_server > #self.server then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
836 -- Exhausted all servers, try first again |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
837 self.best_server = 1; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
838 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
839 end |
6509
7cb69eba3e95
net.dns: Try next server if peer name can not be set (thanks wirehack7)
Kim Alvefur <zash@zash.se>
parents:
6508
diff
changeset
|
840 return sock, err; |
1786
4016d8bc30b8
net.dns: Multiple internal changes and API extensions to allow for more reliable DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
841 end |
337 | 842 |
3327
b447682f2a8d
net.dns: Make timeout configurable (default 15s)
Matthew Wild <mwild1@gmail.com>
parents:
3326
diff
changeset
|
843 function resolver:settimeout(seconds) |
b447682f2a8d
net.dns: Make timeout configurable (default 15s)
Matthew Wild <mwild1@gmail.com>
parents:
3326
diff
changeset
|
844 self.timeout = seconds; |
b447682f2a8d
net.dns: Make timeout configurable (default 15s)
Matthew Wild <mwild1@gmail.com>
parents:
3326
diff
changeset
|
845 end |
b447682f2a8d
net.dns: Make timeout configurable (default 15s)
Matthew Wild <mwild1@gmail.com>
parents:
3326
diff
changeset
|
846 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
847 function resolver:receive(rset) -- - - - - - - - - - - - - - - - - receive |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
848 --print('receive'); print(self.socket); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
849 self.time = socket.gettime(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
850 rset = rset or self.socket; |
337 | 851 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
852 local response; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
853 for i,sock in pairs(rset) do |
337 | 854 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
855 if self.socketset[sock] then |
2619
04158baefa34
net.dns: Update for new socket API
Matthew Wild <mwild1@gmail.com>
parents:
2578
diff
changeset
|
856 local packet = sock:receive(); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
857 if packet then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
858 response = self:decode(packet); |
2278
8c10f13c0c20
modulemanager, net.dns: Remove trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2082
diff
changeset
|
859 if response and self.active[response.header.id] |
2081
b9bbb709d62e
net.dns: Be more strict about checking the DNS replies we receive
Matthew Wild <mwild1@gmail.com>
parents:
2069
diff
changeset
|
860 and self.active[response.header.id][response.question.raw] then |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
861 --print('received response'); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
862 --self.print(response); |
337 | 863 |
2082
1381b2071c2e
net.dns: Be more strict about the records we cache
Matthew Wild <mwild1@gmail.com>
parents:
2081
diff
changeset
|
864 for j,rr in pairs(response.answer) do |
1381b2071c2e
net.dns: Be more strict about the records we cache
Matthew Wild <mwild1@gmail.com>
parents:
2081
diff
changeset
|
865 if rr.name:sub(-#response.question[1].name, -1) == response.question[1].name then |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
866 self:remember(rr, response.question[1].type) |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
867 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
868 end |
337 | 869 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
870 -- retire the query |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
871 local queries = self.active[response.header.id]; |
2082
1381b2071c2e
net.dns: Be more strict about the records we cache
Matthew Wild <mwild1@gmail.com>
parents:
2081
diff
changeset
|
872 queries[response.question.raw] = nil; |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5731
diff
changeset
|
873 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
874 if not next(queries) then self.active[response.header.id] = nil; end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
875 if not next(self.active) then self:closeall(); end |
337 | 876 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
877 -- was the query on the wanted list? |
2301
8a01b0898679
net.dns: Fix for blocking dns lookups to find waiting coroutines correctly (not that we use this in Prosody...)
Matthew Wild <mwild1@gmail.com>
parents:
2300
diff
changeset
|
878 local q = response.question[1]; |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
879 local cos = get(self.wanted, q.class, q.type, q.name); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
880 if cos then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
881 for co in pairs(cos) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
882 if coroutine.status(co) == "suspended" then coroutine.resume(co); end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
883 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
884 set(self.wanted, q.class, q.type, q.name, nil); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
885 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
886 end |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5731
diff
changeset
|
887 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
888 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
889 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
890 end |
337 | 891 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
892 return response; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
893 end |
337 | 894 |
895 | |
3512
e344b00f2cc9
net.dns: Add 'force' parameter to resolver:feed() to force decoding a packet even if it doesn't match an outstanding request
Matthew Wild <mwild1@gmail.com>
parents:
3360
diff
changeset
|
896 function resolver:feed(sock, packet, force) |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
897 --print('receive'); print(self.socket); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
898 self.time = socket.gettime(); |
869
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
899 |
3512
e344b00f2cc9
net.dns: Add 'force' parameter to resolver:feed() to force decoding a packet even if it doesn't match an outstanding request
Matthew Wild <mwild1@gmail.com>
parents:
3360
diff
changeset
|
900 local response = self:decode(packet, force); |
2300
e182b5029ef2
net.dns: Port some DNS fixes to the resolver:feed() function for net.adns to use
Matthew Wild <mwild1@gmail.com>
parents:
2278
diff
changeset
|
901 if response and self.active[response.header.id] |
e182b5029ef2
net.dns: Port some DNS fixes to the resolver:feed() function for net.adns to use
Matthew Wild <mwild1@gmail.com>
parents:
2278
diff
changeset
|
902 and self.active[response.header.id][response.question.raw] then |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
903 --print('received response'); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
904 --self.print(response); |
869
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
905 |
2300
e182b5029ef2
net.dns: Port some DNS fixes to the resolver:feed() function for net.adns to use
Matthew Wild <mwild1@gmail.com>
parents:
2278
diff
changeset
|
906 for j,rr in pairs(response.answer) do |
e182b5029ef2
net.dns: Port some DNS fixes to the resolver:feed() function for net.adns to use
Matthew Wild <mwild1@gmail.com>
parents:
2278
diff
changeset
|
907 self:remember(rr, response.question[1].type); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
908 end |
869
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
909 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
910 -- retire the query |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
911 local queries = self.active[response.header.id]; |
2300
e182b5029ef2
net.dns: Port some DNS fixes to the resolver:feed() function for net.adns to use
Matthew Wild <mwild1@gmail.com>
parents:
2278
diff
changeset
|
912 queries[response.question.raw] = nil; |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
913 if not next(queries) then self.active[response.header.id] = nil; end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
914 if not next(self.active) then self:closeall(); end |
869
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
915 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
916 -- was the query on the wanted list? |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
917 local q = response.question[1]; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
918 if q then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
919 local cos = get(self.wanted, q.class, q.type, q.name); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
920 if cos then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
921 for co in pairs(cos) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
922 if coroutine.status(co) == "suspended" then coroutine.resume(co); end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
923 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
924 set(self.wanted, q.class, q.type, q.name, nil); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
925 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
926 end |
2742
6c0a081cd766
net.dns: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2741
diff
changeset
|
927 end |
869
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
928 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
929 return response; |
869
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
930 end |
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
931 |
6309
b6f76a52eb36
net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb)
Matthew Wild <mwild1@gmail.com>
parents:
6288
diff
changeset
|
932 function resolver:cancel(qclass, qtype, qname) |
3326
fb95015bc646
net.dns, net.adns: Update resolver:cancel() API so that a table doesn't need to be created for each cancellation internal to net.dns
Matthew Wild <mwild1@gmail.com>
parents:
3325
diff
changeset
|
933 local cos = get(self.wanted, qclass, qtype, qname); |
1202
e69fafc14491
net.dns: Add support for cancelling a coroutine-based request
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
934 if cos then |
6309
b6f76a52eb36
net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb)
Matthew Wild <mwild1@gmail.com>
parents:
6288
diff
changeset
|
935 for co in pairs(cos) do |
b6f76a52eb36
net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb)
Matthew Wild <mwild1@gmail.com>
parents:
6288
diff
changeset
|
936 if coroutine.status(co) == "suspended" then coroutine.resume(co); end |
3325
b3117a1da834
net.dns, net.adns: Move coroutine-calling logic into resolver:cancel()
Matthew Wild <mwild1@gmail.com>
parents:
3324
diff
changeset
|
937 end |
6309
b6f76a52eb36
net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb)
Matthew Wild <mwild1@gmail.com>
parents:
6288
diff
changeset
|
938 set(self.wanted, qclass, qtype, qname, nil); |
1202
e69fafc14491
net.dns: Add support for cancelling a coroutine-based request
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
939 end |
e69fafc14491
net.dns: Add support for cancelling a coroutine-based request
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
940 end |
869
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
941 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
942 function resolver:pulse() -- - - - - - - - - - - - - - - - - - - - - pulse |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
943 --print(':pulse'); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
944 while self:receive() do end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
945 if not next(self.active) then return nil; end |
337 | 946 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
947 self.time = socket.gettime(); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
948 for id,queries in pairs(self.active) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
949 for question,o in pairs(queries) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
950 if self.time >= o.retry then |
337 | 951 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
952 o.server = o.server + 1; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
953 if o.server > #self.server then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
954 o.server = 1; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
955 o.delay = o.delay + 1; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
956 end |
337 | 957 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
958 if o.delay > #self.delays then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
959 --print('timeout'); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
960 queries[question] = nil; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
961 if not next(queries) then self.active[id] = nil; end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
962 if not next(self.active) then return nil; end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
963 else |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
964 --print('retry', o.server, o.delay); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
965 local _a = self.socket[o.server]; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
966 if _a then _a:send(o.packet); end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
967 o.retry = self.time + self.delays[o.delay]; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
968 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
969 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
970 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
971 end |
337 | 972 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
973 if next(self.active) then return true; end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
974 return nil; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
975 end |
337 | 976 |
977 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
978 function resolver:lookup(qname, qtype, qclass) -- - - - - - - - - - lookup |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
979 self:query (qname, qtype, qclass) |
3049
e54774bd73a7
net/dns: Fix socket.select timeout.
Brian Cully <bjc@junctionnetworks.com>
parents:
2742
diff
changeset
|
980 while self:pulse() do |
3540
bc139431830b
Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents:
3513
diff
changeset
|
981 local recvt = {} |
bc139431830b
Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents:
3513
diff
changeset
|
982 for i, s in ipairs(self.socket) do |
bc139431830b
Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents:
3513
diff
changeset
|
983 recvt[i] = s |
bc139431830b
Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents:
3513
diff
changeset
|
984 end |
bc139431830b
Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents:
3513
diff
changeset
|
985 socket.select(recvt, nil, 4) |
bc139431830b
Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents:
3513
diff
changeset
|
986 end |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
987 --print(self.cache); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
988 return self:peek(qname, qtype, qclass); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
989 end |
337 | 990 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
991 function resolver:lookupex(handler, qname, qtype, qclass) -- - - - - - - - - - lookup |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
992 return self:peek(qname, qtype, qclass) or self:query(qname, qtype, qclass); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
993 end |
337 | 994 |
3746
9719316c854e
net.dns: Add resolver:tohostname() and dns.tohostname()
Matthew Wild <mwild1@gmail.com>
parents:
3719
diff
changeset
|
995 function resolver:tohostname(ip) |
9719316c854e
net.dns: Add resolver:tohostname() and dns.tohostname()
Matthew Wild <mwild1@gmail.com>
parents:
3719
diff
changeset
|
996 return dns.lookup(ip:gsub("(%d+)%.(%d+)%.(%d+)%.(%d+)", "%4.%3.%2.%1.in-addr.arpa."), "PTR"); |
9719316c854e
net.dns: Add resolver:tohostname() and dns.tohostname()
Matthew Wild <mwild1@gmail.com>
parents:
3719
diff
changeset
|
997 end |
869
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
998 |
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
999 --print ---------------------------------------------------------------- print |
337 | 1000 |
1001 | |
1002 local hints = { -- - - - - - - - - - - - - - - - - - - - - - - - - - - hints | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1003 qr = { [0]='query', 'response' }, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1004 opcode = { [0]='query', 'inverse query', 'server status request' }, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1005 aa = { [0]='non-authoritative', 'authoritative' }, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1006 tc = { [0]='complete', 'truncated' }, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1007 rd = { [0]='recursion not desired', 'recursion desired' }, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1008 ra = { [0]='recursion not available', 'recursion available' }, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1009 z = { [0]='(reserved)' }, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1010 rcode = { [0]='no error', 'format error', 'server failure', 'name error', 'not implemented' }, |
337 | 1011 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1012 type = dns.type, |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1013 class = dns.class |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1014 }; |
337 | 1015 |
1016 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1017 local function hint(p, s) -- - - - - - - - - - - - - - - - - - - - - - hint |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1018 return (hints[s] and hints[s][p[s]]) or ''; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1019 end |
337 | 1020 |
1021 | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1022 function resolver.print(response) -- - - - - - - - - - - - - resolver.print |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1023 for s,s in pairs { 'id', 'qr', 'opcode', 'aa', 'tc', 'rd', 'ra', 'z', |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1024 'rcode', 'qdcount', 'ancount', 'nscount', 'arcount' } do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1025 print( string.format('%-30s', 'header.'..s), response.header[s], hint(response.header, s) ); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1026 end |
337 | 1027 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1028 for i,question in ipairs(response.question) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1029 print(string.format ('question[%i].name ', i), question.name); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1030 print(string.format ('question[%i].type ', i), question.type); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1031 print(string.format ('question[%i].class ', i), question.class); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1032 end |
337 | 1033 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1034 local common = { name=1, type=1, class=1, ttl=1, rdlength=1, rdata=1 }; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1035 local tmp; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1036 for s,s in pairs({'answer', 'authority', 'additional'}) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1037 for i,rr in pairs(response[s]) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1038 for j,t in pairs({ 'name', 'type', 'class', 'ttl', 'rdlength' }) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1039 tmp = string.format('%s[%i].%s', s, i, t); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1040 print(string.format('%-30s', tmp), rr[t], hint(rr, t)); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1041 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1042 for j,t in pairs(rr) do |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1043 if not common[j] then |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1044 tmp = string.format('%s[%i].%s', s, i, j); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1045 print(string.format('%-30s %s', tostring(tmp), tostring(t))); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1046 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1047 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1048 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1049 end |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1050 end |
337 | 1051 |
1052 | |
1053 -- module api ------------------------------------------------------ module api | |
1054 | |
1055 | |
1056 function dns.resolver () -- - - - - - - - - - - - - - - - - - - - - resolver | |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1057 -- this function seems to be redundant with resolver.new () |
337 | 1058 |
6310
d232bb1bbe1e
net.dns: Remove unused obsolete code
Matthew Wild <mwild1@gmail.com>
parents:
6309
diff
changeset
|
1059 local r = { active = {}, cache = {}, unsorted = {}, wanted = {}, best_server = 1 }; |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1060 setmetatable (r, resolver); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1061 setmetatable (r.cache, cache_metatable); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1062 setmetatable (r.unsorted, { __mode = 'kv' }); |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1063 return r; |
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1064 end |
337 | 1065 |
2573
60493186fef6
net.dns: Removed some useless indirection to improve readability.
Waqas Hussain <waqas20@gmail.com>
parents:
2425
diff
changeset
|
1066 local _resolver = dns.resolver(); |
60493186fef6
net.dns: Removed some useless indirection to improve readability.
Waqas Hussain <waqas20@gmail.com>
parents:
2425
diff
changeset
|
1067 dns._resolver = _resolver; |
337 | 1068 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1069 function dns.lookup(...) -- - - - - - - - - - - - - - - - - - - - - lookup |
2573
60493186fef6
net.dns: Removed some useless indirection to improve readability.
Waqas Hussain <waqas20@gmail.com>
parents:
2425
diff
changeset
|
1070 return _resolver:lookup(...); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1071 end |
337 | 1072 |
3746
9719316c854e
net.dns: Add resolver:tohostname() and dns.tohostname()
Matthew Wild <mwild1@gmail.com>
parents:
3719
diff
changeset
|
1073 function dns.tohostname(...) |
9719316c854e
net.dns: Add resolver:tohostname() and dns.tohostname()
Matthew Wild <mwild1@gmail.com>
parents:
3719
diff
changeset
|
1074 return _resolver:tohostname(...); |
9719316c854e
net.dns: Add resolver:tohostname() and dns.tohostname()
Matthew Wild <mwild1@gmail.com>
parents:
3719
diff
changeset
|
1075 end |
9719316c854e
net.dns: Add resolver:tohostname() and dns.tohostname()
Matthew Wild <mwild1@gmail.com>
parents:
3719
diff
changeset
|
1076 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1077 function dns.purge(...) -- - - - - - - - - - - - - - - - - - - - - - purge |
2573
60493186fef6
net.dns: Removed some useless indirection to improve readability.
Waqas Hussain <waqas20@gmail.com>
parents:
2425
diff
changeset
|
1078 return _resolver:purge(...); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1079 end |
337 | 1080 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1081 function dns.peek(...) -- - - - - - - - - - - - - - - - - - - - - - - peek |
2573
60493186fef6
net.dns: Removed some useless indirection to improve readability.
Waqas Hussain <waqas20@gmail.com>
parents:
2425
diff
changeset
|
1082 return _resolver:peek(...); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1083 end |
337 | 1084 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1085 function dns.query(...) -- - - - - - - - - - - - - - - - - - - - - - query |
2573
60493186fef6
net.dns: Removed some useless indirection to improve readability.
Waqas Hussain <waqas20@gmail.com>
parents:
2425
diff
changeset
|
1086 return _resolver:query(...); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1087 end |
337 | 1088 |
2575
8f4d69940132
net.dns: Fixed whitespace/indentation.
Waqas Hussain <waqas20@gmail.com>
parents:
2574
diff
changeset
|
1089 function dns.feed(...) -- - - - - - - - - - - - - - - - - - - - - - - feed |
2573
60493186fef6
net.dns: Removed some useless indirection to improve readability.
Waqas Hussain <waqas20@gmail.com>
parents:
2425
diff
changeset
|
1090 return _resolver:feed(...); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1091 end |
869
09019c452709
net.dns: Add methods necessary for allowing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
1092 |
2575
8f4d69940132
net.dns: Fixed whitespace/indentation.
Waqas Hussain <waqas20@gmail.com>
parents:
2574
diff
changeset
|
1093 function dns.cancel(...) -- - - - - - - - - - - - - - - - - - - - - - cancel |
2573
60493186fef6
net.dns: Removed some useless indirection to improve readability.
Waqas Hussain <waqas20@gmail.com>
parents:
2425
diff
changeset
|
1094 return _resolver:cancel(...); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1095 end |
337 | 1096 |
3328
5ac4fbbfb74d
net.dns: Add dns.settimeout() to set the timeout for the default resolver
Matthew Wild <mwild1@gmail.com>
parents:
3327
diff
changeset
|
1097 function dns.settimeout(...) |
5ac4fbbfb74d
net.dns: Add dns.settimeout() to set the timeout for the default resolver
Matthew Wild <mwild1@gmail.com>
parents:
3327
diff
changeset
|
1098 return _resolver:settimeout(...); |
5ac4fbbfb74d
net.dns: Add dns.settimeout() to set the timeout for the default resolver
Matthew Wild <mwild1@gmail.com>
parents:
3327
diff
changeset
|
1099 end |
5ac4fbbfb74d
net.dns: Add dns.settimeout() to set the timeout for the default resolver
Matthew Wild <mwild1@gmail.com>
parents:
3327
diff
changeset
|
1100 |
5566
74ae3e7e8779
net.dns: Add nicer API to cached records
Kim Alvefur <zash@zash.se>
parents:
5340
diff
changeset
|
1101 function dns.cache() |
74ae3e7e8779
net.dns: Add nicer API to cached records
Kim Alvefur <zash@zash.se>
parents:
5340
diff
changeset
|
1102 return _resolver.cache; |
74ae3e7e8779
net.dns: Add nicer API to cached records
Kim Alvefur <zash@zash.se>
parents:
5340
diff
changeset
|
1103 end |
74ae3e7e8779
net.dns: Add nicer API to cached records
Kim Alvefur <zash@zash.se>
parents:
5340
diff
changeset
|
1104 |
2578
61e5eff54415
net.dns, net.adns: Changed dns:socket_wrapper_set to dns.socket_wrapper_set for consistency.
Waqas Hussain <waqas20@gmail.com>
parents:
2575
diff
changeset
|
1105 function dns.socket_wrapper_set(...) -- - - - - - - - - socket_wrapper_set |
2573
60493186fef6
net.dns: Removed some useless indirection to improve readability.
Waqas Hussain <waqas20@gmail.com>
parents:
2425
diff
changeset
|
1106 return _resolver:socket_wrapper_set(...); |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1107 end |
337 | 1108 |
2069
72357b1c6d88
net.dns: Fixed indentation and coding style.
Waqas Hussain <waqas20@gmail.com>
parents:
2068
diff
changeset
|
1109 return dns; |