Annotate

net/dns.lua @ 4174:6334ff60e1f6

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