Software `/` code `/` prosody

Annotate

net/dns.lua @ 5566:74ae3e7e8779

net.dns: Add nicer API to cached records

author	Kim Alvefur <zash@zash.se>
date	Tue, 07 May 2013 16:51:25 +0200
parent	5340:51c9959c21c0
child	5705:6eebd5808fbc
child	5730:411e9e7d8035

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

prosody

74ae3e7e8779

net/dns.lua

Software / code / prosody

Annotate

net/dns.lua @ 5566:74ae3e7e8779

Software `/` code `/` prosody