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