Software `/` code `/` prosody

Annotate

net/dns.lua @ 7402:ef7ea3bad7a1

MUC: Don't force-save rooms where not needed

author	Kim Alvefur <zash@zash.se>
date	Wed, 20 Apr 2016 12:29:31 +0200
parent	7322:addf60d25356
child	7469:363e4a5e9b0a

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";
7054 94d5e2f33a10 net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] Florian Zeitz <florob@babelmonkeys.de> parents: 6863 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
7322 addf60d25356 net.dns: Import unpack() in forward-compatible way (Fixes compat with Lua5.2+) Kim Alvefur <zash@zash.se> parents: 7098 diff changeset	25 local ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type, unpack=
addf60d25356 net.dns: Import unpack() in forward-compatible way (Fixes compat with Lua5.2+) Kim Alvefur <zash@zash.se> parents: 7098 diff changeset	26 ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type, table.unpack or unpack;
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
6780 647adfd8f738 net.: Remove use of module() function Kim Alvefur <zash@zash.se>* parents: 6753 diff changeset	74 local _ENV = nil;
647adfd8f738 net.: Remove use of module() function Kim Alvefur <zash@zash.se>* parents: 6753 diff changeset	75 local dns = {};
337 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();
6463 460584257cc9 net.dns: Avoid duplicate cache entries Florian Zeitz <florob@babelmonkeys.de> parents: 6310 diff changeset	138 for i,rr in ipairs(rrs) do
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	139 if rr.tod then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	140 -- rr.tod = rr.tod - 50 -- accelerated decripitude
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	141 rr.ttl = math.floor(rr.tod - time);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	142 if rr.ttl <= 0 then
6463 460584257cc9 net.dns: Avoid duplicate cache entries Florian Zeitz <florob@babelmonkeys.de> parents: 6310 diff changeset	143 rrs[rr[rr.type:lower()]] = nil;
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	144 table.remove(rrs, i);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	145 return prune(rrs, time, soft); -- Re-iterate
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	146 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	147 elseif soft == 'soft' then -- What is this? I forget!
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	148 assert(rr.ttl == 0);
6463 460584257cc9 net.dns: Avoid duplicate cache entries Florian Zeitz <florob@babelmonkeys.de> parents: 6310 diff changeset	149 rrs[rr[rr.type:lower()]] = nil;
460584257cc9 net.dns: Avoid duplicate cache entries Florian Zeitz <florob@babelmonkeys.de> parents: 6310 diff changeset	150 table.remove(rrs, i);
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	151 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	152 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	153 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	154
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	155
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	156 -- metatables & co. ------------------------------------------ metatables & co.
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	157
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	158
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	159 local resolver = {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	160 resolver.__index = resolver;
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	161
3327 b447682f2a8d net.dns: Make timeout configurable (default 15s) Matthew Wild <mwild1@gmail.com> parents: 3326 diff changeset	162 resolver.timeout = default_timeout;
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	163
3747 7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	164 local function default_rr_tostring(rr)
7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	165 local rr_val = rr.type and rr[rr.type:lower()];
7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	166 if type(rr_val) ~= "string" then
7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	167 return "<UNKNOWN RDATA TYPE>";
7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	168 end
7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	169 return rr_val;
7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	170 end
7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	171
7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	172 local special_tostrings = {
7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	173 LOC = resolver.LOC_tostring;
4125 5cf13260edec net.dns: Fix tostring() for SRV records Matthew Wild <mwild1@gmail.com> parents: 3955 diff changeset	174 MX = function (rr)
5cf13260edec net.dns: Fix tostring() for SRV records Matthew Wild <mwild1@gmail.com> parents: 3955 diff changeset	175 return string.format('%2i %s', rr.pref, rr.mx);
5cf13260edec net.dns: Fix tostring() for SRV records Matthew Wild <mwild1@gmail.com> parents: 3955 diff changeset	176 end;
5cf13260edec net.dns: Fix tostring() for SRV records Matthew Wild <mwild1@gmail.com> parents: 3955 diff changeset	177 SRV = function (rr)
5cf13260edec net.dns: Fix tostring() for SRV records Matthew Wild <mwild1@gmail.com> parents: 3955 diff changeset	178 local s = rr.srv;
5cf13260edec net.dns: Fix tostring() for SRV records Matthew Wild <mwild1@gmail.com> parents: 3955 diff changeset	179 return string.format('%5d %5d %5d %s', s.priority, s.weight, s.port, s.target);
5cf13260edec net.dns: Fix tostring() for SRV records Matthew Wild <mwild1@gmail.com> parents: 3955 diff changeset	180 end;
3747 7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	181 };
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	182
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	183 local rr_metatable = {}; -- - - - - - - - - - - - - - - - - - - rr_metatable
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	184 function rr_metatable.__tostring(rr)
3747 7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	185 local rr_string = (special_tostrings[rr.type] or default_rr_tostring)(rr);
7d5b135bf268 net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d Matthew Wild <mwild1@gmail.com> parents: 3746 diff changeset	186 return string.format('%2s %-5s %6i %-28s %s', rr.class, rr.type, rr.ttl, rr.name, rr_string);
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	187 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	188
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	189
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	190 local rrs_metatable = {}; -- - - - - - - - - - - - - - - - - - rrs_metatable
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	191 function rrs_metatable.__tostring(rrs)
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	192 local t = {};
6463 460584257cc9 net.dns: Avoid duplicate cache entries Florian Zeitz <florob@babelmonkeys.de> parents: 6310 diff changeset	193 for i,rr in ipairs(rrs) do
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	194 append(t, tostring(rr)..'\n');
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	195 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	196 return table.concat(t);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	197 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	198
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	199
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	200 local cache_metatable = {}; -- - - - - - - - - - - - - - - - cache_metatable
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	201 function cache_metatable.__tostring(cache)
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	202 local time = socket.gettime();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	203 local t = {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	204 for class,types in pairs(cache) do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	205 for type,names in pairs(types) do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	206 for name,rrs in pairs(names) do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	207 prune(rrs, time);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	208 append(t, tostring(rrs));
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	209 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	210 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	211 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	212 return table.concat(t);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	213 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	214
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	215
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	216 -- packet layer -------------------------------------------------- packet layer
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	217
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	218
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	219 function dns.random(...) -- - - - - - - - - - - - - - - - - - - dns.random
6645 4f934cf03bc9 net.dns: Make sure argument to math.randomseed does not overflow a 32 bit signed int (blame Lua). Closes #439 Kim Alvefur <zash@zash.se> parents: 6631 diff changeset	220 math.randomseed(math.floor(10000*socket.gettime()) % 0x80000000);
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	221 dns.random = math.random;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	222 return dns.random(...);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	223 end
337 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 local function encodeHeader(o) -- - - - - - - - - - - - - - - encodeHeader
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	227 o = o or {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	228 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	229
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	230 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	231 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	232 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	233 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	234 -- 1 inverse query
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	235 -- 2 server status request
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	236 -- 3-15 reserved
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	237 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	238
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	239 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	240 -- 1 format error
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	241 -- 2 server failure
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	242 -- 3 name error
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	243 -- 4 not implemented
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	244 -- 5 refused
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	245 -- 6-15 reserved
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	246 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	247 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	248
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	249 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	250 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	251 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	252 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	253
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	254 -- 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	255 local header = string.char(
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	256 highbyte(o.id), o.id %0x100,
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	257 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	258 o.rcode + 16o.z + 128o.ra,
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	259 highbyte(o.qdcount), o.qdcount %0x100,
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	260 highbyte(o.ancount), o.ancount %0x100,
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	261 highbyte(o.nscount), o.nscount %0x100,
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	262 highbyte(o.arcount), o.arcount %0x100
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	263 );
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	264
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	265 return header, o.id;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	266 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	267
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	268
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	269 local function encodeName(name) -- - - - - - - - - - - - - - - - encodeName
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	270 local t = {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	271 for part in string.gmatch(name, '[^.]+') do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	272 append(t, string.char(string.len(part)));
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	273 append(t, part);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	274 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	275 append(t, string.char(0));
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	276 return table.concat(t);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	277 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	278
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	279
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	280 local function encodeQuestion(qname, qtype, qclass) -- - - - encodeQuestion
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	281 qname = encodeName(qname);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	282 qtype = dns.typecode[qtype or 'a'];
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	283 qclass = dns.classcode[qclass or 'in'];
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	284 return qname..qtype..qclass;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	285 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	286
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	287
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	288 function resolver:byte(len) -- - - - - - - - - - - - - - - - - - - - - byte
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	289 len = len or 1;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	290 local offset = self.offset;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	291 local last = offset + len - 1;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	292 if last > #self.packet then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	293 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	294 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	295 self.offset = offset + len;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	296 return string.byte(self.packet, offset, last);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	297 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	298
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	299
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	300 function resolver:word() -- - - - - - - - - - - - - - - - - - - - - - word
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	301 local b1, b2 = self:byte(2);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	302 return 0x100*b1 + b2;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	303 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	304
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	305
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	306 function resolver:dword () -- - - - - - - - - - - - - - - - - - - - - dword
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	307 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	308 --print('dword', b1, b2, b3, b4);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	309 return 0x1000000b1 + 0x10000b2 + 0x100*b3 + b4;
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
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	313 function resolver:sub(len) -- - - - - - - - - - - - - - - - - - - - - - sub
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	314 len = len or 1;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	315 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	316 self.offset = self.offset + len;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	317 return s;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	318 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	319
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	320
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	321 function resolver:header(force) -- - - - - - - - - - - - - - - - - - header
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	322 local id = self:word();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	323 --print(string.format(':header id %x', id));
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	324 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	325
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	326 local h = { id = id };
337 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 local b1, b2 = self:byte(2);
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	329
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	330 h.rd = b1 %2;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	331 h.tc = b1 /2%2;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	332 h.aa = b1 /4%2;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	333 h.opcode = b1 /8%16;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	334 h.qr = b1 /128;
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	335
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	336 h.rcode = b2 %16;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	337 h.z = b2 /16%8;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	338 h.ra = b2 /128;
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	339
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	340 h.qdcount = self:word();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	341 h.ancount = self:word();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	342 h.nscount = self:word();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	343 h.arcount = self:word();
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	344
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	345 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	346
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	347 return h;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	348 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	349
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	350
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	351 function resolver:name() -- - - - - - - - - - - - - - - - - - - - - - name
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	352 local remember, pointers = nil, 0;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	353 local len = self:byte();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	354 local n = {};
4422 c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "." Florian Zeitz <florob@babelmonkeys.de> parents: 4400 diff changeset	355 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	356 while len > 0 do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	357 if len >= 0xc0 then -- name is "compressed"
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	358 pointers = pointers + 1;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	359 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	360 local offset = ((len-0xc0)*0x100) + self:byte();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	361 remember = remember or self.offset;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	362 self.offset = offset + 1; -- +1 for lua
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	363 else -- name is not compressed
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	364 append(n, self:sub(len)..'.');
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	365 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	366 len = self:byte();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	367 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	368 self.offset = remember or self.offset;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	369 return table.concat(n);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	370 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	371
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	372
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	373 function resolver:question() -- - - - - - - - - - - - - - - - - - question
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	374 local q = {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	375 q.name = self:name();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	376 q.type = dns.type[self:word()];
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	377 q.class = dns.class[self:word()];
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	378 return q;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	379 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	380
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	381
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	382 function resolver:A(rr) -- - - - - - - - - - - - - - - - - - - - - - - - A
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	383 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	384 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	385 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	386
4267 29d7eb6ff62c net.dns: Support for resolving AAAA records Matthew Wild <mwild1@gmail.com> parents: 4251 diff changeset	387 function resolver:AAAA(rr)
29d7eb6ff62c net.dns: Support for resolving AAAA records Matthew Wild <mwild1@gmail.com> parents: 4251 diff changeset	388 local addr = {};
29d7eb6ff62c net.dns: Support for resolving AAAA records Matthew Wild <mwild1@gmail.com> parents: 4251 diff changeset	389 for i = 1, rr.rdlength, 2 do
29d7eb6ff62c net.dns: Support for resolving AAAA records Matthew Wild <mwild1@gmail.com> parents: 4251 diff changeset	390 local b1, b2 = self:byte(2);
29d7eb6ff62c net.dns: Support for resolving AAAA records Matthew Wild <mwild1@gmail.com> parents: 4251 diff changeset	391 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	392 end
4373 9a20acf315c9 net.dns: Shorten AAAA records Kim Alvefur <zash@zash.se> parents: 4267 diff changeset	393 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	394 local zeros = {};
9a20acf315c9 net.dns: Shorten AAAA records Kim Alvefur <zash@zash.se> parents: 4267 diff changeset	395 for item in addr:gmatch(":[0:]+:") do
9a20acf315c9 net.dns: Shorten AAAA records Kim Alvefur <zash@zash.se> parents: 4267 diff changeset	396 table.insert(zeros, item)
9a20acf315c9 net.dns: Shorten AAAA records Kim Alvefur <zash@zash.se> parents: 4267 diff changeset	397 end
9a20acf315c9 net.dns: Shorten AAAA records Kim Alvefur <zash@zash.se> parents: 4267 diff changeset	398 if #zeros == 0 then
9a20acf315c9 net.dns: Shorten AAAA records Kim Alvefur <zash@zash.se> parents: 4267 diff changeset	399 rr.aaaa = addr;
9a20acf315c9 net.dns: Shorten AAAA records Kim Alvefur <zash@zash.se> parents: 4267 diff changeset	400 return
9a20acf315c9 net.dns: Shorten AAAA records Kim Alvefur <zash@zash.se> parents: 4267 diff changeset	401 elseif #zeros > 1 then
9a20acf315c9 net.dns: Shorten AAAA records Kim Alvefur <zash@zash.se> parents: 4267 diff changeset	402 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	403 end
9a20acf315c9 net.dns: Shorten AAAA records Kim Alvefur <zash@zash.se> parents: 4267 diff changeset	404 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	405 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	406
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	407 function resolver:CNAME(rr) -- - - - - - - - - - - - - - - - - - - - CNAME
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	408 rr.cname = self:name();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	409 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	410
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	411
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	412 function resolver:MX(rr) -- - - - - - - - - - - - - - - - - - - - - - - MX
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	413 rr.pref = self:word();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	414 rr.mx = self:name();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	415 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	416
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	417
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	418 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	419 local b = self:byte();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	420 --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	421 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	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(rr) -- - - - - - - - - - - - - - - - - - - - - - LOC
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	426 rr.version = self:byte();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	427 if rr.version == 0 then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	428 rr.loc = rr.loc or {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	429 rr.loc.size = self:LOC_nibble_power();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	430 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	431 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	432 rr.loc.latitude = self:dword();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	433 rr.loc.longitude = self:dword();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	434 rr.loc.altitude = self:dword();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	435 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	436 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	437
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	438
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	439 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	440 f = f - 0x80000000;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	441 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	442 local deg, min, msec;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	443 msec = f%60000;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	444 f = (f-msec)/60000;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	445 min = f%60;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	446 deg = (f-min)/60;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	447 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	448 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	449
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	450
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	451 function resolver.LOC_tostring(rr) -- - - - - - - - - - - - - LOC_tostring
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	452 local t = {};
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	453
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	454 --[[
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	455 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	456 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	457 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	458 --]]
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	459
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	460 append(t, string.format(
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	461 '%s %s %.2fm %.2fm %.2fm %.2fm',
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	462 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	463 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	464 (rr.loc.altitude - 10000000) / 100,
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	465 rr.loc.size / 100,
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	466 rr.loc.horiz_pre / 100,
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	467 rr.loc.vert_pre / 100
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	468 ));
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	469
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	470 return table.concat(t);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	471 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	472
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	473
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	474 function resolver:NS(rr) -- - - - - - - - - - - - - - - - - - - - - - - NS
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	475 rr.ns = self:name();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	476 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	477
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	478
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	479 function resolver:SOA(rr) -- - - - - - - - - - - - - - - - - - - - - - SOA
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	480 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	481
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	482
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	483 function resolver:SRV(rr) -- - - - - - - - - - - - - - - - - - - - - - SRV
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	484 rr.srv = {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	485 rr.srv.priority = self:word();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	486 rr.srv.weight = self:word();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	487 rr.srv.port = self:word();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	488 rr.srv.target = self:name();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	489 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	490
3513 4cf5962747fc net.dns: Support for parsing PTR records Matthew Wild <mwild1@gmail.com> parents: 3512 diff changeset	491 function resolver:PTR(rr)
4cf5962747fc net.dns: Support for parsing PTR records Matthew Wild <mwild1@gmail.com> parents: 3512 diff changeset	492 rr.ptr = self:name();
4cf5962747fc net.dns: Support for parsing PTR records Matthew Wild <mwild1@gmail.com> parents: 3512 diff changeset	493 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	494
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	495 function resolver:TXT(rr) -- - - - - - - - - - - - - - - - - - - - - - TXT
4251 96e9d5f9ab3b net.dns: Fix TXT records Kim Alvefur <zash@zash.se> parents: 4125 diff changeset	496 rr.txt = self:sub (self:byte());
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	497 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	498
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	499
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	500 function resolver:rr() -- - - - - - - - - - - - - - - - - - - - - - - - rr
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	501 local rr = {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	502 setmetatable(rr, rr_metatable);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	503 rr.name = self:name(self);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	504 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	505 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	506 rr.ttl = 0x10000*self:word() + self:word();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	507 rr.rdlength = self:word();
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	508
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	509 if rr.ttl <= 0 then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	510 rr.tod = self.time + 30;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	511 else
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	512 rr.tod = self.time + rr.ttl;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	513 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	514
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	515 local remember = self.offset;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	516 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	517 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	518 self.offset = remember;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	519 rr.rdata = self:sub(rr.rdlength);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	520 return rr;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	521 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	522
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	523
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	524 function resolver:rrs (count) -- - - - - - - - - - - - - - - - - - - - - rrs
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	525 local rrs = {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	526 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	527 return rrs;
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
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	531 function resolver:decode(packet, force) -- - - - - - - - - - - - - - decode
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	532 self.packet, self.offset = packet, 1;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	533 local header = self:header(force);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	534 if not header then return nil; end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	535 local response = { header = header };
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	536
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	537 response.question = {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	538 local offset = self.offset;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	539 for i = 1,response.header.qdcount do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	540 append(response.question, self:question());
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	541 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	542 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	543
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	544 if not force then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	545 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	546 self.active[response.header.id] = nil;
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	547 return nil;
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 end
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 response.answer = self:rrs(response.header.ancount);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	552 response.authority = self:rrs(response.header.nscount);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	553 response.additional = self:rrs(response.header.arcount);
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	554
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	555 return response;
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
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	558
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	559 -- socket layer -------------------------------------------------- socket layer
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	560
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	561
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	562 resolver.delays = { 1, 3 };
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	563
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	564
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	565 function resolver:addnameserver(address) -- - - - - - - - - - addnameserver
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	566 self.server = self.server or {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	567 append(self.server, address);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	568 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	569
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	570
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	571 function resolver:setnameserver(address) -- - - - - - - - - - setnameserver
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	572 self.server = {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	573 self:addnameserver(address);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	574 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	575
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	576
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	577 function resolver:adddefaultnameservers() -- - - - - adddefaultnameservers
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	578 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	579 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	580 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	581 self:addnameserver(server);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	582 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	583 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	584 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	585 -- 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	586 self:addnameserver("208.67.222.222");
2742 6c0a081cd766 net.dns: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2741 diff changeset	587 self:addnameserver("208.67.220.220");
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	588 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	589 else -- posix
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	590 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	591 if resolv_conf then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	592 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	593 line = line:gsub("#.*$", "")
7056 7b0651e4534f net.dns: Allow a zone id in resolv.conf (eg like %eth0) Kim Alvefur <zash@zash.se> parents: 7054 diff changeset	594 :match('^%snameserver%s+([%x:%.]%%?%S)%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	595 if line then
7054 94d5e2f33a10 net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] Florian Zeitz <florob@babelmonkeys.de> parents: 6863 diff changeset	596 local ip = new_ip(line);
94d5e2f33a10 net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] Florian Zeitz <florob@babelmonkeys.de> parents: 6863 diff changeset	597 if ip then
94d5e2f33a10 net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] Florian Zeitz <florob@babelmonkeys.de> parents: 6863 diff changeset	598 self:addnameserver(ip.addr);
94d5e2f33a10 net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] Florian Zeitz <florob@babelmonkeys.de> parents: 6863 diff changeset	599 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	600 end
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	601 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	602 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	603 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	604 -- 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	605 self:addnameserver("127.0.0.1");
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	606 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	607 end
399 93b6587d9afb Added temporary fix for srv on windows: using opendns nameservers Waqas Hussain <waqas20@gmail.com> parents: 379 diff changeset	608 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	609
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	610
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	611 function resolver:getsocket(servernum) -- - - - - - - - - - - - - getsocket
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	612 self.socket = self.socket or {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	613 self.socketset = self.socketset or {};
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	614
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	615 local sock = self.socket[servernum];
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	616 if sock then return sock; end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	617
6509 7cb69eba3e95 net.dns: Try next server if peer name can not be set (thanks wirehack7) Kim Alvefur <zash@zash.se> parents: 6508 diff changeset	618 local ok, err;
7054 94d5e2f33a10 net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] Florian Zeitz <florob@babelmonkeys.de> parents: 6863 diff changeset	619 local peer = self.server[servernum];
94d5e2f33a10 net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] Florian Zeitz <florob@babelmonkeys.de> parents: 6863 diff changeset	620 if peer:find(":") then
94d5e2f33a10 net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] Florian Zeitz <florob@babelmonkeys.de> parents: 6863 diff changeset	621 sock, err = socket.udp6();
94d5e2f33a10 net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] Florian Zeitz <florob@babelmonkeys.de> parents: 6863 diff changeset	622 else
6857 86fcc3fa1a97 net.dns: Use new IPv4-specific socket factory if available (fixes dns on libevent with latest development version of luasocket) Kim Alvefur <zash@zash.se> parents: 6780 diff changeset	623 sock, err = (socket.udp4 or socket.udp)();
7054 94d5e2f33a10 net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] Florian Zeitz <florob@babelmonkeys.de> parents: 6863 diff changeset	624 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	625 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	626 if not sock then
6e22b0cf3d72 net.dns: resolver:getsocket(): Return nil, err on failure Matthew Wild <mwild1@gmail.com> parents: 3747 diff changeset	627 return nil, err;
6e22b0cf3d72 net.dns: resolver:getsocket(): Return nil, err on failure Matthew Wild <mwild1@gmail.com> parents: 3747 diff changeset	628 end
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	629 sock:settimeout(0);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	630 -- 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	631 self.socket[servernum] = sock;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	632 self.socketset[sock] = servernum;
6509 7cb69eba3e95 net.dns: Try next server if peer name can not be set (thanks wirehack7) Kim Alvefur <zash@zash.se> parents: 6508 diff changeset	633 -- set{sock,peer}name can fail, eg because of local routing table
7cb69eba3e95 net.dns: Try next server if peer name can not be set (thanks wirehack7) Kim Alvefur <zash@zash.se> parents: 6508 diff changeset	634 -- if so, try the next server
7cb69eba3e95 net.dns: Try next server if peer name can not be set (thanks wirehack7) Kim Alvefur <zash@zash.se> parents: 6508 diff changeset	635 ok, err = sock:setsockname('*', 0);
7cb69eba3e95 net.dns: Try next server if peer name can not be set (thanks wirehack7) Kim Alvefur <zash@zash.se> parents: 6508 diff changeset	636 if not ok then return self:servfail(sock, err); end
7054 94d5e2f33a10 net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] Florian Zeitz <florob@babelmonkeys.de> parents: 6863 diff changeset	637 ok, err = sock:setpeername(peer, 53);
6509 7cb69eba3e95 net.dns: Try next server if peer name can not be set (thanks wirehack7) Kim Alvefur <zash@zash.se> parents: 6508 diff changeset	638 if not ok then return self:servfail(sock, err); end
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	639 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	640 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	641
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	642 function resolver:voidsocket(sock)
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	643 if self.socket[sock] then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	644 self.socketset[self.socket[sock]] = nil;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	645 self.socket[sock] = nil;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	646 elseif self.socketset[sock] then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	647 self.socket[self.socketset[sock]] = nil;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	648 self.socketset[sock] = nil;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	649 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	650 sock:close();
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	651 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	652
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	653 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	654 self.socket_wrapper = func;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	655 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	656
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	657
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	658 function resolver:closeall () -- - - - - - - - - - - - - - - - - - closeall
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	659 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	660 self.socket[i] = nil;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	661 self.socketset[sock] = nil;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	662 sock:close();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	663 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	664 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	665
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	666
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	667 function resolver:remember(rr, type) -- - - - - - - - - - - - - - remember
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	668 --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	669 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	670
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	671 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	672 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	673 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	674 --print('remember all', all);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	675 if all then append(all, rr); end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	676 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	677
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	678 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	679 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	680 set(self.cache, qclass, type, qname, setmetatable({}, rrs_metatable));
6463 460584257cc9 net.dns: Avoid duplicate cache entries Florian Zeitz <florob@babelmonkeys.de> parents: 6310 diff changeset	681 if not rrs[rr[qtype:lower()]] then
460584257cc9 net.dns: Avoid duplicate cache entries Florian Zeitz <florob@babelmonkeys.de> parents: 6310 diff changeset	682 rrs[rr[qtype:lower()]] = true;
460584257cc9 net.dns: Avoid duplicate cache entries Florian Zeitz <florob@babelmonkeys.de> parents: 6310 diff changeset	683 append(rrs, rr);
460584257cc9 net.dns: Avoid duplicate cache entries Florian Zeitz <florob@babelmonkeys.de> parents: 6310 diff changeset	684 end
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
6631 45222bfb206f net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s Kim Alvefur <zash@zash.se> parents: 6509 diff changeset	695 function resolver:peek (qname, qtype, qclass, n) -- - - - - - - - - - - - peek
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	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);
6631 45222bfb206f net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s Kim Alvefur <zash@zash.se> parents: 6509 diff changeset	698 if not rrs then
45222bfb206f net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s Kim Alvefur <zash@zash.se> parents: 6509 diff changeset	699 if n then if n <= 0 then return end else n = 3 end
45222bfb206f net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s Kim Alvefur <zash@zash.se> parents: 6509 diff changeset	700 rrs = get(self.cache, qclass, "CNAME", qname);
45222bfb206f net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s Kim Alvefur <zash@zash.se> parents: 6509 diff changeset	701 if not (rrs and rrs[1]) then return end
45222bfb206f net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s Kim Alvefur <zash@zash.se> parents: 6509 diff changeset	702 return self:peek(rrs[1].cname, qtype, qclass, n - 1);
45222bfb206f net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s Kim Alvefur <zash@zash.se> parents: 6509 diff changeset	703 end
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	704 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	705 set(self.cache, qclass, qtype, qname, nil);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	706 return nil;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	707 end
6631 45222bfb206f net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s Kim Alvefur <zash@zash.se> parents: 6509 diff changeset	708 if self.unsorted[rrs] then table.sort (rrs, comp_mx); self.unsorted[rrs] = nil; end
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	709 return rrs;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	710 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	711
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	712
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	713 function resolver:purge(soft) -- - - - - - - - - - - - - - - - - - - purge
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	714 if soft == 'soft' then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	715 self.time = socket.gettime();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	716 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	717 for type,names in pairs(types) do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	718 for name,rrs in pairs(names) do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	719 prune(rrs, self.time, 'soft')
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	720 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	721 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	722 end
4400 ac651265766c net.dns: Preserve metatable on manual cache purge Matthew Wild <mwild1@gmail.com> parents: 4373 diff changeset	723 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	724 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	725
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 function resolver:query(qname, qtype, qclass) -- - - - - - - - - - -- query
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	728 qname, qtype, qclass = standardize(qname, qtype, qclass)
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	729
6288 d122420542fb net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one Kim Alvefur <zash@zash.se> parents: 5730 diff changeset	730 local co = coroutine.running();
d122420542fb net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one Kim Alvefur <zash@zash.se> parents: 5730 diff changeset	731 local q = get(self.wanted, qclass, qtype, qname);
d122420542fb net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one Kim Alvefur <zash@zash.se> parents: 5730 diff changeset	732 if co and q then
d122420542fb net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one Kim Alvefur <zash@zash.se> parents: 5730 diff changeset	733 -- We are already waiting for a reply to an identical query.
d122420542fb net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one Kim Alvefur <zash@zash.se> parents: 5730 diff changeset	734 set(self.wanted, qclass, qtype, qname, co, true);
d122420542fb net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one Kim Alvefur <zash@zash.se> parents: 5730 diff changeset	735 return true;
d122420542fb net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one Kim Alvefur <zash@zash.se> parents: 5730 diff changeset	736 end
d122420542fb net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one Kim Alvefur <zash@zash.se> parents: 5730 diff changeset	737
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	738 if not self.server then self:adddefaultnameservers(); end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	739
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	740 local question = encodeQuestion(qname, qtype, qclass);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	741 local peek = self:peek (qname, qtype, qclass);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	742 if peek then return peek; end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	743
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	744 local header, id = encodeHeader();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	745 --print ('query id', id, qclass, qtype, qname)
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	746 local o = {
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	747 packet = header..question,
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	748 server = self.best_server,
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	749 delay = 1,
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	750 retry = socket.gettime() + self.delays[1]
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	751 };
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	752
3540 bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3513 diff changeset	753 -- remember the query
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	754 self.active[id] = self.active[id] or {};
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	755 self.active[id][question] = o;
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	756
3955 a096700d23d9 net.dns: resolver:query(): Handle getsocket() failures, and return true on success Matthew Wild <mwild1@gmail.com> parents: 3954 diff changeset	757 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	758 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	759 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	760 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	761 conn:send (o.packet)
7093 388281be2bc7 net.dns: Remember query only after it was sent, in case it was not (fixes #598) Kim Alvefur <zash@zash.se> parents: 7059 diff changeset	762
388281be2bc7 net.dns: Remember query only after it was sent, in case it was not (fixes #598) Kim Alvefur <zash@zash.se> parents: 7059 diff changeset	763 -- remember which coroutine wants the answer
388281be2bc7 net.dns: Remember query only after it was sent, in case it was not (fixes #598) Kim Alvefur <zash@zash.se> parents: 7059 diff changeset	764 if co then
388281be2bc7 net.dns: Remember query only after it was sent, in case it was not (fixes #598) Kim Alvefur <zash@zash.se> parents: 7059 diff changeset	765 set(self.wanted, qclass, qtype, qname, co, true);
388281be2bc7 net.dns: Remember query only after it was sent, in case it was not (fixes #598) Kim Alvefur <zash@zash.se> parents: 7059 diff changeset	766 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	767
3327 b447682f2a8d net.dns: Make timeout configurable (default 15s) Matthew Wild <mwild1@gmail.com> parents: 3326 diff changeset	768 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	769 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	770 local i = 1;
3327 b447682f2a8d net.dns: Make timeout configurable (default 15s) Matthew Wild <mwild1@gmail.com> parents: 3326 diff changeset	771 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	772 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	773 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	774 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	775 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	776 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	777 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	778 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	779 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	780 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	781 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	782 end
3955 a096700d23d9 net.dns: resolver:query(): Handle getsocket() failures, and return true on success Matthew Wild <mwild1@gmail.com> parents: 3954 diff changeset	783 -- Tried everything, failed
6309 b6f76a52eb36 net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb) Matthew Wild <mwild1@gmail.com> parents: 6288 diff changeset	784 self:cancel(qclass, qtype, qname);
3324 070c8ba71b76 net.dns: Handle our own timeouts, including falling onto other servers in resolv.conf if necessary Matthew Wild <mwild1@gmail.com> parents: 3057 diff changeset	785 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	786 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	787 end
3955 a096700d23d9 net.dns: resolver:query(): Handle getsocket() failures, and return true on success Matthew Wild <mwild1@gmail.com> parents: 3954 diff changeset	788 return true;
869 09019c452709 net.dns: Add methods necessary for allowing non-blocking DNS lookups Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	789 end
09019c452709 net.dns: Add methods necessary for allowing non-blocking DNS lookups Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	790
6509 7cb69eba3e95 net.dns: Try next server if peer name can not be set (thanks wirehack7) Kim Alvefur <zash@zash.se> parents: 6508 diff changeset	791 function resolver:servfail(sock, err)
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	792 -- Resend all queries for this server
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	793
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	794 local num = self.socketset[sock]
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	795
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	796 -- Socket is dead now
6508 4a28b8320d7f net.dns: Return new socket from servfail Kim Alvefur <zash@zash.se> parents: 6463 diff changeset	797 sock = self:voidsocket(sock);
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	798
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	799 -- 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	800 self.time = socket.gettime();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	801 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	802 for question,o in pairs(queries) do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	803 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	804 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	805 if o.server > #self.server then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	806 o.server = 1;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	807 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	808
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	809 o.retries = (o.retries or 0) + 1;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	810 if o.retries >= #self.server then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	811 --print('timeout');
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	812 queries[question] = nil;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	813 else
6509 7cb69eba3e95 net.dns: Try next server if peer name can not be set (thanks wirehack7) Kim Alvefur <zash@zash.se> parents: 6508 diff changeset	814 sock, err = self:getsocket(o.server);
6508 4a28b8320d7f net.dns: Return new socket from servfail Kim Alvefur <zash@zash.se> parents: 6463 diff changeset	815 if sock then sock:send(o.packet); end
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	816 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	817 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	818 end
5266 5c3a3ef6b769 net.dns: Clean up query list when a server is marked down Matthew Wild <mwild1@gmail.com> parents: 4422 diff changeset	819 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	820 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	821 end
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	822 end
3540 bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3513 diff changeset	823
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	824 if num == self.best_server then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	825 self.best_server = self.best_server + 1;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	826 if self.best_server > #self.server then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	827 -- Exhausted all servers, try first again
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	828 self.best_server = 1;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	829 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	830 end
6509 7cb69eba3e95 net.dns: Try next server if peer name can not be set (thanks wirehack7) Kim Alvefur <zash@zash.se> parents: 6508 diff changeset	831 return sock, err;
1786 4016d8bc30b8 net.dns: Multiple internal changes and API extensions to allow for more reliable DNS lookups Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	832 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	833
3327 b447682f2a8d net.dns: Make timeout configurable (default 15s) Matthew Wild <mwild1@gmail.com> parents: 3326 diff changeset	834 function resolver:settimeout(seconds)
b447682f2a8d net.dns: Make timeout configurable (default 15s) Matthew Wild <mwild1@gmail.com> parents: 3326 diff changeset	835 self.timeout = seconds;
b447682f2a8d net.dns: Make timeout configurable (default 15s) Matthew Wild <mwild1@gmail.com> parents: 3326 diff changeset	836 end
b447682f2a8d net.dns: Make timeout configurable (default 15s) Matthew Wild <mwild1@gmail.com> parents: 3326 diff changeset	837
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	838 function resolver:receive(rset) -- - - - - - - - - - - - - - - - - receive
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	839 --print('receive'); print(self.socket);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	840 self.time = socket.gettime();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	841 rset = rset or self.socket;
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	842
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	843 local response;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	844 for i,sock in pairs(rset) do
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	845
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	846 if self.socketset[sock] then
2619 04158baefa34 net.dns: Update for new socket API Matthew Wild <mwild1@gmail.com> parents: 2578 diff changeset	847 local packet = sock:receive();
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	848 if packet then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	849 response = self:decode(packet);
2278 8c10f13c0c20 modulemanager, net.dns: Remove trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2082 diff changeset	850 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	851 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	852 --print('received response');
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	853 --self.print(response);
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	854
2082 1381b2071c2e net.dns: Be more strict about the records we cache Matthew Wild <mwild1@gmail.com> parents: 2081 diff changeset	855 for j,rr in pairs(response.answer) do
7059 7ec52755622f Backout 88d54bec26b7 prior to release, as it certainly requires more testing Matthew Wild <mwild1@gmail.com> parents: 7056 diff changeset	856 if rr.name:sub(-#response.question[1].name, -1) == response.question[1].name then
7ec52755622f Backout 88d54bec26b7 prior to release, as it certainly requires more testing Matthew Wild <mwild1@gmail.com> parents: 7056 diff changeset	857 self:remember(rr, response.question[1].type)
7ec52755622f Backout 88d54bec26b7 prior to release, as it certainly requires more testing Matthew Wild <mwild1@gmail.com> parents: 7056 diff changeset	858 end
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	859 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	860
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	861 -- retire the query
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	862 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	863 queries[response.question.raw] = nil;
1381b2071c2e net.dns: Be more strict about the records we cache Matthew Wild <mwild1@gmail.com> parents: 2081 diff changeset	864
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	865 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	866 if not next(self.active) then self:closeall(); end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	867
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	868 -- 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	869 local q = response.question[1];
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	870 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	871 if cos then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	872 for co in pairs(cos) do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	873 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	874 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	875 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	876 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	877 end
5266 5c3a3ef6b769 net.dns: Clean up query list when a server is marked down Matthew Wild <mwild1@gmail.com> parents: 4422 diff changeset	878
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	879 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	880 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	881 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	882
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	883 return response;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	884 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	885
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	886
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	887 function resolver:feed(sock, packet, force)
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	888 --print('receive'); print(self.socket);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	889 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	890
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	891 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	892 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	893 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	894 --print('received response');
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	895 --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	896
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	897 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	898 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	899 end
869 09019c452709 net.dns: Add methods necessary for allowing non-blocking DNS lookups Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	900
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	901 -- retire the query
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	902 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	903 queries[response.question.raw] = nil;
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	904 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	905 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	906
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	907 -- was the query on the wanted list?
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	908 local q = response.question[1];
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	909 if q then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	910 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	911 if cos then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	912 for co in pairs(cos) do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	913 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	914 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	915 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	916 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	917 end
2742 6c0a081cd766 net.dns: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2741 diff changeset	918 end
869 09019c452709 net.dns: Add methods necessary for allowing non-blocking DNS lookups Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	919
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	920 return response;
869 09019c452709 net.dns: Add methods necessary for allowing non-blocking DNS lookups Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	921 end
09019c452709 net.dns: Add methods necessary for allowing non-blocking DNS lookups Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	922
6309 b6f76a52eb36 net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb) Matthew Wild <mwild1@gmail.com> parents: 6288 diff changeset	923 function resolver:cancel(qclass, qtype, qname)
3326 fb95015bc646 net.dns, net.adns: Update resolver:cancel() API so that a table doesn't need to be created for each cancellation internal to net.dns Matthew Wild <mwild1@gmail.com> parents: 3325 diff changeset	924 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	925 if cos then
6309 b6f76a52eb36 net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb) Matthew Wild <mwild1@gmail.com> parents: 6288 diff changeset	926 for co in pairs(cos) do
b6f76a52eb36 net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb) Matthew Wild <mwild1@gmail.com> parents: 6288 diff changeset	927 if coroutine.status(co) == "suspended" then coroutine.resume(co); end
3325 b3117a1da834 net.dns, net.adns: Move coroutine-calling logic into resolver:cancel() Matthew Wild <mwild1@gmail.com> parents: 3324 diff changeset	928 end
6309 b6f76a52eb36 net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb) Matthew Wild <mwild1@gmail.com> parents: 6288 diff changeset	929 set(self.wanted, qclass, qtype, qname, nil);
1202 e69fafc14491 net.dns: Add support for cancelling a coroutine-based request Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	930 end
e69fafc14491 net.dns: Add support for cancelling a coroutine-based request Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	931 end
869 09019c452709 net.dns: Add methods necessary for allowing non-blocking DNS lookups Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	932
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	933 function resolver:pulse() -- - - - - - - - - - - - - - - - - - - - - pulse
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	934 --print(':pulse');
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	935 while self:receive() do end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	936 if not next(self.active) then return nil; end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	937
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	938 self.time = socket.gettime();
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	939 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	940 for question,o in pairs(queries) do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	941 if self.time >= o.retry then
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	942
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	943 o.server = o.server + 1;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	944 if o.server > #self.server then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	945 o.server = 1;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	946 o.delay = o.delay + 1;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	947 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	948
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	949 if o.delay > #self.delays then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	950 --print('timeout');
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	951 queries[question] = nil;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	952 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	953 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	954 else
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	955 --print('retry', o.server, o.delay);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	956 local _a = self.socket[o.server];
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	957 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	958 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	959 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	960 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	961 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	962 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	963
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	964 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	965 return nil;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	966 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	967
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	968
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	969 function resolver:lookup(qname, qtype, qclass) -- - - - - - - - - - lookup
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	970 self:query (qname, qtype, qclass)
3049 e54774bd73a7 net/dns: Fix socket.select timeout. Brian Cully <bjc@junctionnetworks.com> parents: 2742 diff changeset	971 while self:pulse() do
3540 bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3513 diff changeset	972 local recvt = {}
bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3513 diff changeset	973 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	974 recvt[i] = s
bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3513 diff changeset	975 end
bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3513 diff changeset	976 socket.select(recvt, nil, 4)
bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3513 diff changeset	977 end
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	978 --print(self.cache);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	979 return self:peek(qname, qtype, qclass);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	980 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	981
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	982 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	983 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	984 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	985
3746 9719316c854e net.dns: Add resolver:tohostname() and dns.tohostname() Matthew Wild <mwild1@gmail.com> parents: 3719 diff changeset	986 function resolver:tohostname(ip)
9719316c854e net.dns: Add resolver:tohostname() and dns.tohostname() Matthew Wild <mwild1@gmail.com> parents: 3719 diff changeset	987 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	988 end
869 09019c452709 net.dns: Add methods necessary for allowing non-blocking DNS lookups Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	989
09019c452709 net.dns: Add methods necessary for allowing non-blocking DNS lookups Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	990 --print ---------------------------------------------------------------- print
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	991
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	992
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	993 local hints = { -- - - - - - - - - - - - - - - - - - - - - - - - - - - hints
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	994 qr = { [0]='query', 'response' },
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	995 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	996 aa = { [0]='non-authoritative', 'authoritative' },
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	997 tc = { [0]='complete', 'truncated' },
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	998 rd = { [0]='recursion not desired', 'recursion desired' },
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	999 ra = { [0]='recursion not available', 'recursion available' },
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1000 z = { [0]='(reserved)' },
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1001 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	1002
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1003 type = dns.type,
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1004 class = dns.class
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1005 };
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1006
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1007
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1008 local function hint(p, s) -- - - - - - - - - - - - - - - - - - - - - - hint
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1009 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	1010 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1011
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1012
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1013 function resolver.print(response) -- - - - - - - - - - - - - resolver.print
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1014 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	1015 'rcode', 'qdcount', 'ancount', 'nscount', 'arcount' } do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1016 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	1017 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1018
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1019 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	1020 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	1021 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	1022 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	1023 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1024
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1025 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	1026 local tmp;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1027 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	1028 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	1029 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	1030 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	1031 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	1032 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1033 for j,t in pairs(rr) do
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1034 if not common[j] then
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1035 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	1036 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	1037 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1038 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1039 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1040 end
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1041 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1042
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1043
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1044 -- module api ------------------------------------------------------ module api
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1045
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1046
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1047 function dns.resolver () -- - - - - - - - - - - - - - - - - - - - - resolver
6310 d232bb1bbe1e net.dns: Remove unused obsolete code Matthew Wild <mwild1@gmail.com> parents: 6309 diff changeset	1048 local r = { active = {}, cache = {}, unsorted = {}, wanted = {}, best_server = 1 };
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1049 setmetatable (r, resolver);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1050 setmetatable (r.cache, cache_metatable);
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1051 setmetatable (r.unsorted, { __mode = 'kv' });
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1052 return r;
72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1053 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1054
2573 60493186fef6 net.dns: Removed some useless indirection to improve readability. Waqas Hussain <waqas20@gmail.com> parents: 2425 diff changeset	1055 local _resolver = dns.resolver();
60493186fef6 net.dns: Removed some useless indirection to improve readability. Waqas Hussain <waqas20@gmail.com> parents: 2425 diff changeset	1056 dns._resolver = _resolver;
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1057
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1058 function dns.lookup(...) -- - - - - - - - - - - - - - - - - - - - - lookup
2573 60493186fef6 net.dns: Removed some useless indirection to improve readability. Waqas Hussain <waqas20@gmail.com> parents: 2425 diff changeset	1059 return _resolver:lookup(...);
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
3746 9719316c854e net.dns: Add resolver:tohostname() and dns.tohostname() Matthew Wild <mwild1@gmail.com> parents: 3719 diff changeset	1062 function dns.tohostname(...)
9719316c854e net.dns: Add resolver:tohostname() and dns.tohostname() Matthew Wild <mwild1@gmail.com> parents: 3719 diff changeset	1063 return _resolver:tohostname(...);
9719316c854e net.dns: Add resolver:tohostname() and dns.tohostname() Matthew Wild <mwild1@gmail.com> parents: 3719 diff changeset	1064 end
9719316c854e net.dns: Add resolver:tohostname() and dns.tohostname() Matthew Wild <mwild1@gmail.com> parents: 3719 diff changeset	1065
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1066 function dns.purge(...) -- - - - - - - - - - - - - - - - - - - - - - purge
2573 60493186fef6 net.dns: Removed some useless indirection to improve readability. Waqas Hussain <waqas20@gmail.com> parents: 2425 diff changeset	1067 return _resolver:purge(...);
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
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1070 function dns.peek(...) -- - - - - - - - - - - - - - - - - - - - - - - peek
2573 60493186fef6 net.dns: Removed some useless indirection to improve readability. Waqas Hussain <waqas20@gmail.com> parents: 2425 diff changeset	1071 return _resolver:peek(...);
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1072 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1073
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1074 function dns.query(...) -- - - - - - - - - - - - - - - - - - - - - - query
2573 60493186fef6 net.dns: Removed some useless indirection to improve readability. Waqas Hussain <waqas20@gmail.com> parents: 2425 diff changeset	1075 return _resolver:query(...);
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
2575 8f4d69940132 net.dns: Fixed whitespace/indentation. Waqas Hussain <waqas20@gmail.com> parents: 2574 diff changeset	1078 function dns.feed(...) -- - - - - - - - - - - - - - - - - - - - - - - feed
2573 60493186fef6 net.dns: Removed some useless indirection to improve readability. Waqas Hussain <waqas20@gmail.com> parents: 2425 diff changeset	1079 return _resolver:feed(...);
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1080 end
869 09019c452709 net.dns: Add methods necessary for allowing non-blocking DNS lookups Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	1081
2575 8f4d69940132 net.dns: Fixed whitespace/indentation. Waqas Hussain <waqas20@gmail.com> parents: 2574 diff changeset	1082 function dns.cancel(...) -- - - - - - - - - - - - - - - - - - - - - - cancel
2573 60493186fef6 net.dns: Removed some useless indirection to improve readability. Waqas Hussain <waqas20@gmail.com> parents: 2425 diff changeset	1083 return _resolver:cancel(...);
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1084 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1085
3328 5ac4fbbfb74d net.dns: Add dns.settimeout() to set the timeout for the default resolver Matthew Wild <mwild1@gmail.com> parents: 3327 diff changeset	1086 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	1087 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	1088 end
5ac4fbbfb74d net.dns: Add dns.settimeout() to set the timeout for the default resolver Matthew Wild <mwild1@gmail.com> parents: 3327 diff changeset	1089
5566 74ae3e7e8779 net.dns: Add nicer API to cached records Kim Alvefur <zash@zash.se> parents: 5340 diff changeset	1090 function dns.cache()
74ae3e7e8779 net.dns: Add nicer API to cached records Kim Alvefur <zash@zash.se> parents: 5340 diff changeset	1091 return _resolver.cache;
74ae3e7e8779 net.dns: Add nicer API to cached records Kim Alvefur <zash@zash.se> parents: 5340 diff changeset	1092 end
74ae3e7e8779 net.dns: Add nicer API to cached records Kim Alvefur <zash@zash.se> parents: 5340 diff changeset	1093
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	1094 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	1095 return _resolver:socket_wrapper_set(...);
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1096 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	1097
2069 72357b1c6d88 net.dns: Fixed indentation and coding style. Waqas Hussain <waqas20@gmail.com> parents: 2068 diff changeset	1098 return dns;

prosody

ef7ea3bad7a1

net/dns.lua

Software / code / prosody

Annotate

net/dns.lua @ 7402:ef7ea3bad7a1

Software `/` code `/` prosody