Software `/` code `/` prosody

Annotate

net/dns.lua @ 6039:f8df0a996575

Merge 0.10->trunk

author	Kim Alvefur <zash@zash.se>
date	Tue, 25 Mar 2014 19:18:32 +0100
parent	5776:bd0ff8ae98a8
child	6289:a29cc79295e6

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

prosody

f8df0a996575

net/dns.lua

Software / code / prosody

Annotate

net/dns.lua @ 6039:f8df0a996575

Software `/` code `/` prosody