Software `/` code `/` prosody

Annotate

net/server_epoll.lua @ 11267:97077089f3c2

Merge 0.11->trunk

author	Kim Alvefur <zash@zash.se>
date	Tue, 12 Jan 2021 19:19:15 +0100
parent	11264:2cdcf55c6dd5
parent	11265:957d417eb56e
child	11413:9fb23779c863

rev	line source
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	1 -- Prosody IM
9474 619ba78709a5 net.server_epoll: Update copyright year Kim Alvefur <zash@zash.se> parents: 9473 diff changeset	2 -- Copyright (C) 2016-2018 Kim Alvefur
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	3 --
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	4 -- This project is MIT/X11 licensed. Please see the
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	5 -- COPYING file in the source package for more information.
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	6 --
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	7
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	8
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	9 local t_insert = table.insert;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	10 local t_concat = table.concat;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	11 local setmetatable = setmetatable;
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	12 local pcall = pcall;
8781 53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	13 local type = type;
7797 d0c32d86724f server_epoll: Flush and close all connections before quitting mainloop so no data is lost in buffers Kim Alvefur <zash@zash.se> parents: 7796 diff changeset	14 local next = next;
7794 424bbbeb9257 server_epoll: Add closeall() method for closing all clients and servers Kim Alvefur <zash@zash.se> parents: 7737 diff changeset	15 local pairs = pairs;
10586 f86ed818a7f8 net.server_epoll: Collect full traceback from errors in listeners Kim Alvefur <zash@zash.se> parents: 10571 diff changeset	16 local traceback = debug.traceback;
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	17 local logger = require "util.logger";
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	18 local log = logger.init("server_epoll");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	19 local socket = require "socket";
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	20 local luasec = require "ssl";
10492 8e1d9bba9244 net.server_epoll: Use monotonic time for scheduling Kim Alvefur <zash@zash.se> parents: 10491 diff changeset	21 local realtime = require "util.time".now;
8e1d9bba9244 net.server_epoll: Use monotonic time for scheduling Kim Alvefur <zash@zash.se> parents: 10491 diff changeset	22 local monotonic = require "util.time".monotonic;
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	23 local indexedbheap = require "util.indexedbheap";
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	24 local createtable = require "util.table".create;
9473 5fdda751333a net.server: Require IP address as argument to addclient (no DNS names) Kim Alvefur <zash@zash.se> parents: 9445 diff changeset	25 local inet = require "util.net";
5fdda751333a net.server: Require IP address as argument to addclient (no DNS names) Kim Alvefur <zash@zash.se> parents: 9445 diff changeset	26 local inet_pton = inet.pton;
7737 f93b3083b46b net.server_epoll: Use _SOCKETINVALID from LuaSocket Kim Alvefur <zash@zash.se> parents: 7707 diff changeset	27 local _SOCKETINVALID = socket._SOCKETINVALID or -1;
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	28 local new_id = require "util.id".medium;
10586 f86ed818a7f8 net.server_epoll: Collect full traceback from errors in listeners Kim Alvefur <zash@zash.se> parents: 10571 diff changeset	29 local xpcall = require "util.xpcall".xpcall;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	30
9506 ae6636052be9 net.server_epoll: Graceful handling of registering already added socket Kim Alvefur <zash@zash.se> parents: 9499 diff changeset	31 local poller = require "util.poll"
ae6636052be9 net.server_epoll: Graceful handling of registering already added socket Kim Alvefur <zash@zash.se> parents: 9499 diff changeset	32 local EEXIST = poller.EEXIST;
9507 33d21f020b66 net.server_epoll: Ignore ENOENT when deregitering socket Kim Alvefur <zash@zash.se> parents: 9506 diff changeset	33 local ENOENT = poller.ENOENT;
9506 ae6636052be9 net.server_epoll: Graceful handling of registering already added socket Kim Alvefur <zash@zash.se> parents: 9499 diff changeset	34
ae6636052be9 net.server_epoll: Graceful handling of registering already added socket Kim Alvefur <zash@zash.se> parents: 9499 diff changeset	35 local poll = assert(poller.new());
7601 ce20546d7714 net.server_epoll: Make sure a recent LuaSocket is avaliable Kim Alvefur <zash@zash.se> parents: 7600 diff changeset	36
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	37 local _ENV = nil;
8555 4f0f5b49bb03 vairious: Add annotation when an empty environment is set [luacheck] Kim Alvefur <zash@zash.se> parents: 8552 diff changeset	38 -- luacheck: std none
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	39
7657 252823632401 net.server_epoll: Support for setting configuration parameters Kim Alvefur <zash@zash.se> parents: 7637 diff changeset	40 local default_config = { __index = {
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	41 -- If a connection is silent for this long, close it unless onreadtimeout says not to
8983 23f66f04e216 net.server: Set default read timeout to 14 minutes (fixes #971) Kim Alvefur <zash@zash.se> parents: 8781 diff changeset	42 read_timeout = 14 * 60;
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	43
4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	44 -- How long to wait for a socket to become writable after queuing data to send
9825 5ccce16c6449 net.server_epoll: Increase send_timeout to 3 minutes (to match server_event) Kim Alvefur <zash@zash.se> parents: 9824 diff changeset	45 send_timeout = 180;
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	46
9824 729de68f0068 net.server_epoll: Separate timeout for initial connection attempts Kim Alvefur <zash@zash.se> parents: 9823 diff changeset	47 -- How long to wait for a socket to become writable after creation
729de68f0068 net.server_epoll: Separate timeout for initial connection attempts Kim Alvefur <zash@zash.se> parents: 9823 diff changeset	48 connect_timeout = 20;
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	49
4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	50 -- Some number possibly influencing how many pending connections can be accepted
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	51 tcp_backlog = 128;
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	52
4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	53 -- If accepting a new incoming connection fails, wait this long before trying again
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	54 accept_retry_interval = 10;
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	55
4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	56 -- If there is still more data to read from LuaSocktes buffer, wait this long and read again
7560 785fa1138293 net.server_epoll: Continue reading after a slight delay if there is buffered data after a read Kim Alvefur <zash@zash.se> parents: 7559 diff changeset	57 read_retry_delay = 1e-06;
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	58
4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	59 -- Size of chunks to read from sockets
9311 9b0604fe01f1 net.server_epoll: Make read_size a server-wide option Kim Alvefur <zash@zash.se> parents: 9310 diff changeset	60 read_size = 8192;
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	61
4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	62 -- Timeout used during between steps in TLS handshakes
9822 13c2707d2417 net.server_epoll: Rename handshake_timeout to ssl_handshake_timeout (fixes #1319) Kim Alvefur <zash@zash.se> parents: 9821 diff changeset	63 ssl_handshake_timeout = 60;
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	64
4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	65 -- Maximum and minimum amount of time to sleep waiting for events (adjusted for pending timers)
7623 a1c040a5754f net.server_epoll: Make maximum wait time configurable Kim Alvefur <zash@zash.se> parents: 7606 diff changeset	66 max_wait = 86400;
7658 e14a124c4d73 net.server_epoll: Make minimum poll wait time configurable Kim Alvefur <zash@zash.se> parents: 7657 diff changeset	67 min_wait = 1e-06;
10081 72adf1f39404 net.server_epoll: Add experimental option to close connections in case of listener error Kim Alvefur <zash@zash.se> parents: 10080 diff changeset	68
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	69 -- Enable extra noisy debug logging
863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	70 -- TODO disable once considered stable
863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	71 verbose = true;
863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	72
10081 72adf1f39404 net.server_epoll: Add experimental option to close connections in case of listener error Kim Alvefur <zash@zash.se> parents: 10080 diff changeset	73 -- EXPERIMENTAL
72adf1f39404 net.server_epoll: Add experimental option to close connections in case of listener error Kim Alvefur <zash@zash.se> parents: 10080 diff changeset	74 -- Whether to kill connections in case of callback errors.
72adf1f39404 net.server_epoll: Add experimental option to close connections in case of listener error Kim Alvefur <zash@zash.se> parents: 10080 diff changeset	75 fatal_errors = false;
10228 e77bf4222fae net.server_epoll: Add support for opportunistic writes Kim Alvefur <zash@zash.se> parents: 10098 diff changeset	76
10992 df3ee12acd8c net.server_epoll: Add setting for turning off callback protections Kim Alvefur <zash@zash.se> parents: 10991 diff changeset	77 -- Or disable protection (like server_select) for potential performance gains
df3ee12acd8c net.server_epoll: Add setting for turning off callback protections Kim Alvefur <zash@zash.se> parents: 10991 diff changeset	78 protect_listeners = true;
df3ee12acd8c net.server_epoll: Add setting for turning off callback protections Kim Alvefur <zash@zash.se> parents: 10991 diff changeset	79
10228 e77bf4222fae net.server_epoll: Add support for opportunistic writes Kim Alvefur <zash@zash.se> parents: 10098 diff changeset	80 -- Attempt writes instantly
e77bf4222fae net.server_epoll: Add support for opportunistic writes Kim Alvefur <zash@zash.se> parents: 10098 diff changeset	81 opportunistic_writes = false;
7657 252823632401 net.server_epoll: Support for setting configuration parameters Kim Alvefur <zash@zash.se> parents: 7637 diff changeset	82 }};
252823632401 net.server_epoll: Support for setting configuration parameters Kim Alvefur <zash@zash.se> parents: 7637 diff changeset	83 local cfg = default_config.__index;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	84
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	85 local fds = createtable(10, 0); -- FD -> conn
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	86
cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	87 -- Timer and scheduling --
cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	88
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	89 local timers = indexedbheap.create();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	90
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	91 local function noop() end
10985 758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	92 local function closetimer(id)
758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	93 timers:remove(id);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	94 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	95
10985 758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	96 local function reschedule(id, time)
10492 8e1d9bba9244 net.server_epoll: Use monotonic time for scheduling Kim Alvefur <zash@zash.se> parents: 10491 diff changeset	97 time = monotonic() + time;
10985 758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	98 timers:reprioritize(id, time);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	99 end
7573 0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	100
0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	101 -- Add relative timer
10982 276f16101d59 net.server_epoll: Make API-compatible with util.timer Kim Alvefur <zash@zash.se> parents: 10861 diff changeset	102 local function addtimer(timeout, f, param)
10492 8e1d9bba9244 net.server_epoll: Use monotonic time for scheduling Kim Alvefur <zash@zash.se> parents: 10491 diff changeset	103 local time = monotonic() + timeout;
10985 758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	104 if param ~= nil then
758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	105 local timer_callback = f
758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	106 function f(current_time, timer_id)
758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	107 local t = timer_callback(current_time, timer_id, param)
758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	108 return t;
758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	109 end
758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	110 end
758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	111 local id = timers:insert(f, time);
758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	112 return id;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	113 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	114
7573 0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	115 -- Run callbacks of expired timers
0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	116 -- Return time until next timeout
7658 e14a124c4d73 net.server_epoll: Make minimum poll wait time configurable Kim Alvefur <zash@zash.se> parents: 7657 diff changeset	117 local function runtimers(next_delay, min_wait)
7629 0fcde9869cc1 net.server_epoll: Return early in the event of zero timers Kim Alvefur <zash@zash.se> parents: 7628 diff changeset	118 -- Any timers at all?
10492 8e1d9bba9244 net.server_epoll: Use monotonic time for scheduling Kim Alvefur <zash@zash.se> parents: 10491 diff changeset	119 local elapsed = monotonic();
8e1d9bba9244 net.server_epoll: Use monotonic time for scheduling Kim Alvefur <zash@zash.se> parents: 10491 diff changeset	120 local now = realtime();
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	121 local peek = timers:peek();
11262 2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	122 local readd;
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	123 while peek do
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	124
10492 8e1d9bba9244 net.server_epoll: Use monotonic time for scheduling Kim Alvefur <zash@zash.se> parents: 10491 diff changeset	125 if peek > elapsed then
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	126 break;
10681 e531273341d3 net.server_epoll: Fix indentation Kim Alvefur <zash@zash.se> parents: 10059 diff changeset	127 end
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	128
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	129 local _, timer, id = timers:pop();
10990 03e76ad725b2 net.server_epoll: ... and include a traceback Kim Alvefur <zash@zash.se> parents: 10989 diff changeset	130 local ok, ret = xpcall(timer, traceback, now, id);
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	131 if ok and type(ret) == "number" then
10492 8e1d9bba9244 net.server_epoll: Use monotonic time for scheduling Kim Alvefur <zash@zash.se> parents: 10491 diff changeset	132 local next_time = elapsed+ret;
11262 2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	133 -- Delay insertion of timers to be re-added
2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	134 -- so they don't get called again this tick
2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	135 if readd then
11264 2cdcf55c6dd5 Merge 0.11->trunk Kim Alvefur <zash@zash.se> parents: 11239 11262 diff changeset	136 readd[id] = { timer, next_time };
11262 2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	137 else
11264 2cdcf55c6dd5 Merge 0.11->trunk Kim Alvefur <zash@zash.se> parents: 11239 11262 diff changeset	138 readd = { [id] = { timer, next_time } };
11262 2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	139 end
10989 b824fe9d0c8b net.server_epoll: Report errors in timers Kim Alvefur <zash@zash.se> parents: 10987 diff changeset	140 elseif not ok then
b824fe9d0c8b net.server_epoll: Report errors in timers Kim Alvefur <zash@zash.se> parents: 10987 diff changeset	141 log("error", "Error in timer: %s", ret);
10681 e531273341d3 net.server_epoll: Fix indentation Kim Alvefur <zash@zash.se> parents: 10059 diff changeset	142 end
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	143
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	144 peek = timers:peek();
10681 e531273341d3 net.server_epoll: Fix indentation Kim Alvefur <zash@zash.se> parents: 10059 diff changeset	145 end
11262 2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	146
2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	147 if readd then
2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	148 for _, timer in pairs(readd) do
11264 2cdcf55c6dd5 Merge 0.11->trunk Kim Alvefur <zash@zash.se> parents: 11239 11262 diff changeset	149 timers:insert(timer[1], timer[2]);
11262 2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	150 end
2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	151 peek = timers:peek();
2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	152 end
2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	153
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	154 if peek == nil then
7629 0fcde9869cc1 net.server_epoll: Return early in the event of zero timers Kim Alvefur <zash@zash.se> parents: 7628 diff changeset	155 return next_delay;
11262 2c559953ad41 net.server_epoll: Ensure timers can't run more than once per tick Kim Alvefur <zash@zash.se> parents: 11063 diff changeset	156 else
11264 2cdcf55c6dd5 Merge 0.11->trunk Kim Alvefur <zash@zash.se> parents: 11239 11262 diff changeset	157 next_delay = peek - elapsed;
7629 0fcde9869cc1 net.server_epoll: Return early in the event of zero timers Kim Alvefur <zash@zash.se> parents: 7628 diff changeset	158 end
0fcde9869cc1 net.server_epoll: Return early in the event of zero timers Kim Alvefur <zash@zash.se> parents: 7628 diff changeset	159
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	160 if next_delay < min_wait then
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	161 return min_wait;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	162 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	163 return next_delay;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	164 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	165
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	166 -- Socket handler interface
cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	167
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	168 local interface = {};
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	169 local interface_mt = { __index = interface };
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	170
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	171 function interface_mt:__tostring()
7585 b64218c816de net.server_epoll: Improve string representation of connections Kim Alvefur <zash@zash.se> parents: 7584 diff changeset	172 if self.sockname and self.peername then
b64218c816de net.server_epoll: Improve string representation of connections Kim Alvefur <zash@zash.se> parents: 7584 diff changeset	173 return ("FD %d (%s, %d, %s, %d)"):format(self:getfd(), self.peername, self.peerport, self.sockname, self.sockport);
b64218c816de net.server_epoll: Improve string representation of connections Kim Alvefur <zash@zash.se> parents: 7584 diff changeset	174 elseif self.sockname or self.peername then
b64218c816de net.server_epoll: Improve string representation of connections Kim Alvefur <zash@zash.se> parents: 7584 diff changeset	175 return ("FD %d (%s, %d)"):format(self:getfd(), self.sockname or self.peername, self.sockport or self.peerport);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	176 end
9321 146dc1e4c7ff net.server_epoll: Simplify minimal string representation Kim Alvefur <zash@zash.se> parents: 9320 diff changeset	177 return ("FD %d"):format(self:getfd());
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	178 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	179
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	180 interface.log = log;
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	181 function interface:debug(msg, ...) --luacheck: ignore 212/self
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	182 self.log("debug", msg, ...);
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	183 end
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	184
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	185 interface.noise = interface.debug;
863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	186 function interface:noise(msg, ...) --luacheck: ignore 212/self
863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	187 if cfg.verbose then
863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	188 return self:debug(msg, ...);
863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	189 end
863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	190 end
863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	191
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	192 function interface:error(msg, ...) --luacheck: ignore 212/self
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	193 self.log("error", msg, ...);
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	194 end
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	195
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	196 -- Replace the listener and tell the old one
9387 33e52f727f0f net.connect: Fix passing request table to new listener Kim Alvefur <zash@zash.se> parents: 9385 diff changeset	197 function interface:setlistener(listeners, data)
7604 36408ef6c8c9 net.server_epoll: Call ondetach when listeners are replaced Kim Alvefur <zash@zash.se> parents: 7603 diff changeset	198 self:on("detach");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	199 self.listeners = listeners;
9387 33e52f727f0f net.connect: Fix passing request table to new listener Kim Alvefur <zash@zash.se> parents: 9385 diff changeset	200 self:on("attach", data);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	201 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	202
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	203 -- Call a listener callback
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	204 function interface:on(what, ...)
8006 be374a5778f3 net.server_epoll: Log if there's a connection without listeners Kim Alvefur <zash@zash.se> parents: 7910 diff changeset	205 if not self.listeners then
10589 3540118699cf net.server_epoll: Log error about missing all callbacks at 'error' level Kim Alvefur <zash@zash.se> parents: 10588 diff changeset	206 self:error("Interface is missing listener callbacks");
8006 be374a5778f3 net.server_epoll: Log if there's a connection without listeners Kim Alvefur <zash@zash.se> parents: 7910 diff changeset	207 return;
be374a5778f3 net.server_epoll: Log if there's a connection without listeners Kim Alvefur <zash@zash.se> parents: 7910 diff changeset	208 end
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	209 local listener = self.listeners["on"..what];
0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	210 if not listener then
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	211 self:noise("Missing listener 'on%s'", what); -- uncomment for development and debugging
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	212 return;
0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	213 end
10992 df3ee12acd8c net.server_epoll: Add setting for turning off callback protections Kim Alvefur <zash@zash.se> parents: 10991 diff changeset	214 if not cfg.protect_listeners then
df3ee12acd8c net.server_epoll: Add setting for turning off callback protections Kim Alvefur <zash@zash.se> parents: 10991 diff changeset	215 return listener(self, ...);
df3ee12acd8c net.server_epoll: Add setting for turning off callback protections Kim Alvefur <zash@zash.se> parents: 10991 diff changeset	216 end
10991 aa85cb5b859f net.server_epoll: Allow setting a custom error handler for listener Kim Alvefur <zash@zash.se> parents: 10990 diff changeset	217 local onerror = self.listeners.onerror or traceback;
aa85cb5b859f net.server_epoll: Allow setting a custom error handler for listener Kim Alvefur <zash@zash.se> parents: 10990 diff changeset	218 local ok, err = xpcall(listener, onerror, self, ...);
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	219 if not ok then
10081 72adf1f39404 net.server_epoll: Add experimental option to close connections in case of listener error Kim Alvefur <zash@zash.se> parents: 10080 diff changeset	220 if cfg.fatal_errors then
10588 ceadf3d3fecf net.server_epoll: Log errors caught in listeners on 'error' level Kim Alvefur <zash@zash.se> parents: 10587 diff changeset	221 self:error("Closing due to error calling on%s: %s", what, err);
10081 72adf1f39404 net.server_epoll: Add experimental option to close connections in case of listener error Kim Alvefur <zash@zash.se> parents: 10080 diff changeset	222 self:destroy();
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	223 else
11239 06a5919e2496 net.server_epoll: Increase log level for error in callback Kim Alvefur <zash@zash.se> parents: 11068 diff changeset	224 self:error("Error calling on%s: %s", what, err);
10081 72adf1f39404 net.server_epoll: Add experimental option to close connections in case of listener error Kim Alvefur <zash@zash.se> parents: 10080 diff changeset	225 end
10080 39ca4202ae1e net.server_epoll: Return listener error message Kim Alvefur <zash@zash.se> parents: 10061 diff changeset	226 return nil, err;
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	227 end
0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	228 return err;
0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	229 end
0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	230
10278 94c584d67533 net.server_epoll: Make it easy to override handler for incoming data Kim Alvefur <zash@zash.se> parents: 10234 diff changeset	231 -- Allow this one to be overridden
94c584d67533 net.server_epoll: Make it easy to override handler for incoming data Kim Alvefur <zash@zash.se> parents: 10234 diff changeset	232 function interface:onincoming(...)
94c584d67533 net.server_epoll: Make it easy to override handler for incoming data Kim Alvefur <zash@zash.se> parents: 10234 diff changeset	233 return self:on("incoming", ...);
94c584d67533 net.server_epoll: Make it easy to override handler for incoming data Kim Alvefur <zash@zash.se> parents: 10234 diff changeset	234 end
94c584d67533 net.server_epoll: Make it easy to override handler for incoming data Kim Alvefur <zash@zash.se> parents: 10234 diff changeset	235
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	236 -- Return the file descriptor number
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	237 function interface:getfd()
7586 846fdbbc62ba net.server_epoll: Return something as FD when no connection exists Kim Alvefur <zash@zash.se> parents: 7585 diff changeset	238 if self.conn then
846fdbbc62ba net.server_epoll: Return something as FD when no connection exists Kim Alvefur <zash@zash.se> parents: 7585 diff changeset	239 return self.conn:getfd();
846fdbbc62ba net.server_epoll: Return something as FD when no connection exists Kim Alvefur <zash@zash.se> parents: 7585 diff changeset	240 end
7737 f93b3083b46b net.server_epoll: Use _SOCKETINVALID from LuaSocket Kim Alvefur <zash@zash.se> parents: 7707 diff changeset	241 return _SOCKETINVALID;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	242 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	243
8271 c09deab9989e net.server_epoll: Add interface:server() method to match server_event (fixes c2s:show traceback in telnet console) Kim Alvefur <zash@zash.se> parents: 8091 diff changeset	244 function interface:server()
c09deab9989e net.server_epoll: Add interface:server() method to match server_event (fixes c2s:show traceback in telnet console) Kim Alvefur <zash@zash.se> parents: 8091 diff changeset	245 return self._server or self;
c09deab9989e net.server_epoll: Add interface:server() method to match server_event (fixes c2s:show traceback in telnet console) Kim Alvefur <zash@zash.se> parents: 8091 diff changeset	246 end
c09deab9989e net.server_epoll: Add interface:server() method to match server_event (fixes c2s:show traceback in telnet console) Kim Alvefur <zash@zash.se> parents: 8091 diff changeset	247
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	248 -- Get IP address
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	249 function interface:ip()
7584 98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	250 return self.peername or self.sockname;
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	251 end
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	252
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	253 -- Get a port number, doesn't matter which
7584 98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	254 function interface:port()
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	255 return self.sockport or self.peerport;
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	256 end
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	257
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	258 -- Get local port number
7584 98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	259 function interface:clientport()
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	260 return self.sockport;
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	261 end
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	262
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	263 -- Get remote port
7584 98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	264 function interface:serverport()
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	265 if self.sockport then
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	266 return self.sockport;
8271 c09deab9989e net.server_epoll: Add interface:server() method to match server_event (fixes c2s:show traceback in telnet console) Kim Alvefur <zash@zash.se> parents: 8091 diff changeset	267 elseif self._server then
c09deab9989e net.server_epoll: Add interface:server() method to match server_event (fixes c2s:show traceback in telnet console) Kim Alvefur <zash@zash.se> parents: 8091 diff changeset	268 self._server:port();
7584 98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	269 end
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	270 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	271
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	272 -- Return underlying socket
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	273 function interface:socket()
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	274 return self.conn;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	275 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	276
7910 91db637be237 net.server_epoll: Add method for changing read pattern Kim Alvefur <zash@zash.se> parents: 7817 diff changeset	277 function interface:set_mode(new_mode)
9310 2d2d4c293efa net.server_epoll: Rename pattern to read_size Kim Alvefur <zash@zash.se> parents: 9309 diff changeset	278 self.read_size = new_mode;
7910 91db637be237 net.server_epoll: Add method for changing read pattern Kim Alvefur <zash@zash.se> parents: 7817 diff changeset	279 end
91db637be237 net.server_epoll: Add method for changing read pattern Kim Alvefur <zash@zash.se> parents: 7817 diff changeset	280
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	281 function interface:setoption(k, v)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	282 -- LuaSec doesn't expose setoption :(
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	283 if self.conn.setoption then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	284 self.conn:setoption(k, v);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	285 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	286 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	287
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	288 -- Timeout for detecting dead or idle sockets
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	289 function interface:setreadtimeout(t)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	290 if t == false then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	291 if self._readtimeout then
10985 758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	292 closetimer(self._readtimeout);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	293 self._readtimeout = nil;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	294 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	295 return
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	296 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	297 t = t or cfg.read_timeout;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	298 if self._readtimeout then
10985 758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	299 reschedule(self._readtimeout, t);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	300 else
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	301 self._readtimeout = addtimer(t, function ()
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	302 if self:on("readtimeout") then
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	303 self:noise("Read timeout handled");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	304 return cfg.read_timeout;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	305 else
10417 d8a0b0d21c81 net.server_epoll: Improve read timeout debug messages Kim Alvefur <zash@zash.se> parents: 10416 diff changeset	306 self:debug("Read timeout not handled, disconnecting");
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	307 self:on("disconnect", "read timeout");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	308 self:destroy();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	309 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	310 end);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	311 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	312 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	313
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	314 -- Timeout for detecting dead sockets
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	315 function interface:setwritetimeout(t)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	316 if t == false then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	317 if self._writetimeout then
10985 758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	318 closetimer(self._writetimeout);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	319 self._writetimeout = nil;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	320 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	321 return
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	322 end
9821 7712488c8e49 net.server_epoll: Use send_timeout for write timout like other implementations (fixes #1316) Kim Alvefur <zash@zash.se> parents: 9665 diff changeset	323 t = t or cfg.send_timeout;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	324 if self._writetimeout then
10985 758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	325 reschedule(self._writetimeout, t);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	326 else
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	327 self._writetimeout = addtimer(t, function ()
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	328 self:noise("Write timeout");
10638 92918212ee83 net.server_epoll: Different error to distinguish connection timeout Kim Alvefur <zash@zash.se> parents: 10589 diff changeset	329 self:on("disconnect", self._connected and "write timeout" or "connection timeout");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	330 self:destroy();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	331 end);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	332 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	333 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	334
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	335 function interface:add(r, w)
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	336 local fd = self:getfd();
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	337 if fd < 0 then
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	338 return nil, "invalid fd";
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	339 end
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	340 if r == nil then r = self._wantread; end
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	341 if w == nil then w = self._wantwrite; end
9384 5c8006ce8cb8 net.server_epoll: Include errno in log messages Kim Alvefur <zash@zash.se> parents: 9383 diff changeset	342 local ok, err, errno = poll:add(fd, r, w);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	343 if not ok then
9506 ae6636052be9 net.server_epoll: Graceful handling of registering already added socket Kim Alvefur <zash@zash.se> parents: 9499 diff changeset	344 if errno == EEXIST then
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	345 self:debug("FD already registered in poller! (EEXIST)");
9506 ae6636052be9 net.server_epoll: Graceful handling of registering already added socket Kim Alvefur <zash@zash.se> parents: 9499 diff changeset	346 return self:set(r, w); -- So try to change its flags
ae6636052be9 net.server_epoll: Graceful handling of registering already added socket Kim Alvefur <zash@zash.se> parents: 9499 diff changeset	347 end
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	348 self:debug("Could not register in poller: %s(%d)", err, errno);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	349 return ok, err;
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	350 end
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	351 self._wantread, self._wantwrite = r, w;
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	352 fds[fd] = self;
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	353 self:noise("Registered in poller");
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	354 return true;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	355 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	356
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	357 function interface:set(r, w)
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	358 local fd = self:getfd();
7602 a4d5eec36a17 net.server_epoll: Prevent invalid FDs from being added to epoll Kim Alvefur <zash@zash.se> parents: 7601 diff changeset	359 if fd < 0 then
a4d5eec36a17 net.server_epoll: Prevent invalid FDs from being added to epoll Kim Alvefur <zash@zash.se> parents: 7601 diff changeset	360 return nil, "invalid fd";
a4d5eec36a17 net.server_epoll: Prevent invalid FDs from being added to epoll Kim Alvefur <zash@zash.se> parents: 7601 diff changeset	361 end
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	362 if r == nil then r = self._wantread; end
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	363 if w == nil then w = self._wantwrite; end
9384 5c8006ce8cb8 net.server_epoll: Include errno in log messages Kim Alvefur <zash@zash.se> parents: 9383 diff changeset	364 local ok, err, errno = poll:set(fd, r, w);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	365 if not ok then
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	366 self:debug("Could not update poller state: %s(%d)", err, errno);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	367 return ok, err;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	368 end
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	369 self._wantread, self._wantwrite = r, w;
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	370 return true;
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	371 end
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	372
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	373 function interface:del()
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	374 local fd = self:getfd();
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	375 if fd < 0 then
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	376 return nil, "invalid fd";
7625 6afafd6d4ef0 net.server_epoll: Move management of fd registry to :setflags Kim Alvefur <zash@zash.se> parents: 7624 diff changeset	377 end
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	378 if fds[fd] ~= self then
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	379 return nil, "unregistered fd";
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	380 end
9384 5c8006ce8cb8 net.server_epoll: Include errno in log messages Kim Alvefur <zash@zash.se> parents: 9383 diff changeset	381 local ok, err, errno = poll:del(fd);
9507 33d21f020b66 net.server_epoll: Ignore ENOENT when deregitering socket Kim Alvefur <zash@zash.se> parents: 9506 diff changeset	382 if not ok and errno ~= ENOENT then
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	383 self:debug("Could not unregister: %s(%d)", err, errno);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	384 return ok, err;
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	385 end
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	386 self._wantread, self._wantwrite = nil, nil;
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	387 fds[fd] = nil;
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	388 self:noise("Unregistered from poller");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	389 return true;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	390 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	391
9320 8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	392 function interface:setflags(r, w)
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	393 if not(self._wantread or self._wantwrite) then
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	394 if not(r or w) then
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	395 return true; -- no change
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	396 end
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	397 return self:add(r, w);
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	398 end
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	399 if not(r or w) then
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	400 return self:del();
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	401 end
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	402 return self:set(r, w);
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	403 end
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	404
7573 0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	405 -- Called when socket is readable
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	406 function interface:onreadable()
9311 9b0604fe01f1 net.server_epoll: Make read_size a server-wide option Kim Alvefur <zash@zash.se> parents: 9310 diff changeset	407 local data, err, partial = self.conn:receive(self.read_size or cfg.read_size);
7687 ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	408 if data then
8540 ba9fd886b34d net.server_epoll: Call onconnect listener on first successful read or write Kim Alvefur <zash@zash.se> parents: 8507 diff changeset	409 self:onconnect();
10278 94c584d67533 net.server_epoll: Make it easy to override handler for incoming data Kim Alvefur <zash@zash.se> parents: 10234 diff changeset	410 self:onincoming(data);
7687 ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	411 else
9931 485231f8b75d net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) Kim Alvefur <zash@zash.se> parents: 9822 diff changeset	412 if err == "wantread" then
485231f8b75d net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) Kim Alvefur <zash@zash.se> parents: 9822 diff changeset	413 self:set(true, nil);
485231f8b75d net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) Kim Alvefur <zash@zash.se> parents: 9822 diff changeset	414 err = "timeout";
485231f8b75d net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) Kim Alvefur <zash@zash.se> parents: 9822 diff changeset	415 elseif err == "wantwrite" then
485231f8b75d net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) Kim Alvefur <zash@zash.se> parents: 9822 diff changeset	416 self:set(nil, true);
485231f8b75d net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) Kim Alvefur <zash@zash.se> parents: 9822 diff changeset	417 err = "timeout";
485231f8b75d net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) Kim Alvefur <zash@zash.se> parents: 9822 diff changeset	418 end
8540 ba9fd886b34d net.server_epoll: Call onconnect listener on first successful read or write Kim Alvefur <zash@zash.se> parents: 8507 diff changeset	419 if partial and partial ~= "" then
ba9fd886b34d net.server_epoll: Call onconnect listener on first successful read or write Kim Alvefur <zash@zash.se> parents: 8507 diff changeset	420 self:onconnect();
10278 94c584d67533 net.server_epoll: Make it easy to override handler for incoming data Kim Alvefur <zash@zash.se> parents: 10234 diff changeset	421 self:onincoming(partial, err);
7687 ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	422 end
9931 485231f8b75d net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) Kim Alvefur <zash@zash.se> parents: 9822 diff changeset	423 if err ~= "timeout" then
11014 05fefde93036 net.server_epoll: Log debug message when a connection errors on read Kim Alvefur <zash@zash.se> parents: 10992 diff changeset	424 if err == "closed" then
05fefde93036 net.server_epoll: Log debug message when a connection errors on read Kim Alvefur <zash@zash.se> parents: 10992 diff changeset	425 self:debug("Connection closed by remote");
05fefde93036 net.server_epoll: Log debug message when a connection errors on read Kim Alvefur <zash@zash.se> parents: 10992 diff changeset	426 else
05fefde93036 net.server_epoll: Log debug message when a connection errors on read Kim Alvefur <zash@zash.se> parents: 10992 diff changeset	427 self:debug("Read error, closing (%s)", err);
05fefde93036 net.server_epoll: Log debug message when a connection errors on read Kim Alvefur <zash@zash.se> parents: 10992 diff changeset	428 end
7687 ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	429 self:on("disconnect", err);
ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	430 self:destroy()
ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	431 return;
ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	432 end
ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	433 end
7691 a5ad858f3a93 net.server_epoll: Check that connection still exists after callback, fixes traceback when closed Kim Alvefur <zash@zash.se> parents: 7687 diff changeset	434 if not self.conn then return; end
10098 dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	435 if self._limit and (data or partial) then
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	436 local cost = self._limit * #(data or partial);
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	437 if cost > cfg.min_wait then
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	438 self:setreadtimeout(false);
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	439 self:pausefor(cost);
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	440 return;
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	441 end
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	442 end
9932 df73ca804719 net.server_epoll: Skip delayed continuation read on paused connections Kim Alvefur <zash@zash.se> parents: 9931 diff changeset	443 if self._wantread and self.conn:dirty() then
7606 f40f1d9b7872 net.server_epoll: Set timers before calling onincoming, fixes traceback if connection is closed before onincoming returns Kim Alvefur <zash@zash.se> parents: 7604 diff changeset	444 self:setreadtimeout(false);
f40f1d9b7872 net.server_epoll: Set timers before calling onincoming, fixes traceback if connection is closed before onincoming returns Kim Alvefur <zash@zash.se> parents: 7604 diff changeset	445 self:pausefor(cfg.read_retry_delay);
f40f1d9b7872 net.server_epoll: Set timers before calling onincoming, fixes traceback if connection is closed before onincoming returns Kim Alvefur <zash@zash.se> parents: 7604 diff changeset	446 else
f40f1d9b7872 net.server_epoll: Set timers before calling onincoming, fixes traceback if connection is closed before onincoming returns Kim Alvefur <zash@zash.se> parents: 7604 diff changeset	447 self:setreadtimeout();
f40f1d9b7872 net.server_epoll: Set timers before calling onincoming, fixes traceback if connection is closed before onincoming returns Kim Alvefur <zash@zash.se> parents: 7604 diff changeset	448 end
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	449 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	450
7573 0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	451 -- Called when socket is writable
8542 8c39ec8e6018 net.server_epoll: Spelling writeable -> writable Kim Alvefur <zash@zash.se> parents: 8541 diff changeset	452 function interface:onwritable()
8552 1fcefc16a55d server_epoll: Onconnect should happen before first attempt to write to socket Kim Alvefur <zash@zash.se> parents: 8542 diff changeset	453 self:onconnect();
8776 e7d4344e0fea net.server_epoll: Handle connection being closed and destroyed in onconnect callback Kim Alvefur <zash@zash.se> parents: 8555 diff changeset	454 if not self.conn then return; end -- could have been closed in onconnect
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	455 local buffer = self.writebuffer;
10571 cfeb0077c9e9 net.server_epoll: Avoid concatenating buffer with single item Kim Alvefur <zash@zash.se> parents: 10546 diff changeset	456 local data = #buffer == 1 and buffer[1] or t_concat(buffer);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	457 local ok, err, partial = self.conn:send(data);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	458 if ok then
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	459 self:set(nil, false);
8541 8186114329d6 net.server_epoll: Remove special casing for having sent an empty write buffer because the wantwrite flag must be unset regardless Kim Alvefur <zash@zash.se> parents: 8540 diff changeset	460 for i = #buffer, 1, -1 do
8186114329d6 net.server_epoll: Remove special casing for having sent an empty write buffer because the wantwrite flag must be unset regardless Kim Alvefur <zash@zash.se> parents: 8540 diff changeset	461 buffer[i] = nil;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	462 end
8541 8186114329d6 net.server_epoll: Remove special casing for having sent an empty write buffer because the wantwrite flag must be unset regardless Kim Alvefur <zash@zash.se> parents: 8540 diff changeset	463 self:setwritetimeout(false);
8186114329d6 net.server_epoll: Remove special casing for having sent an empty write buffer because the wantwrite flag must be unset regardless Kim Alvefur <zash@zash.se> parents: 8540 diff changeset	464 self:ondrain(); -- Be aware of writes in ondrain
7589 125e4f2e0b65 net.server_epoll: Return early on successful write Kim Alvefur <zash@zash.se> parents: 7588 diff changeset	465 return;
8540 ba9fd886b34d net.server_epoll: Call onconnect listener on first successful read or write Kim Alvefur <zash@zash.se> parents: 8507 diff changeset	466 elseif partial then
10305 2fadbf209678 net.server_epoll: Log size of partial writes (debug) Kim Alvefur <zash@zash.se> parents: 10300 diff changeset	467 self:debug("Sent %d out of %d buffered bytes", partial, #data);
7591 138f16eb39fb net.server_epoll: Improve syntax Kim Alvefur <zash@zash.se> parents: 7590 diff changeset	468 buffer[1] = data:sub(partial+1);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	469 for i = #buffer, 2, -1 do
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	470 buffer[i] = nil;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	471 end
10228 e77bf4222fae net.server_epoll: Add support for opportunistic writes Kim Alvefur <zash@zash.se> parents: 10098 diff changeset	472 self:set(nil, true);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	473 self:setwritetimeout();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	474 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	475 if err == "wantwrite" or err == "timeout" then
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	476 self:set(nil, true);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	477 elseif err == "wantread" then
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	478 self:set(true, nil);
7687 ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	479 elseif err ~= "timeout" then
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	480 self:on("disconnect", err);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	481 self:destroy();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	482 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	483 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	484
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	485 -- The write buffer has been successfully emptied
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	486 function interface:ondrain()
8008 62ed3795be13 net.server_epoll: Attempt to simplify state control Kim Alvefur <zash@zash.se> parents: 8007 diff changeset	487 return self:on("drain");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	488 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	489
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	490 -- Add data to write buffer and set flag for wanting to write
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	491 function interface:write(data)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	492 local buffer = self.writebuffer;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	493 if buffer then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	494 t_insert(buffer, data);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	495 else
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	496 self.writebuffer = { data };
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	497 end
9581 1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	498 if not self._write_lock then
10228 e77bf4222fae net.server_epoll: Add support for opportunistic writes Kim Alvefur <zash@zash.se> parents: 10098 diff changeset	499 if cfg.opportunistic_writes then
e77bf4222fae net.server_epoll: Add support for opportunistic writes Kim Alvefur <zash@zash.se> parents: 10098 diff changeset	500 self:onwritable();
e77bf4222fae net.server_epoll: Add support for opportunistic writes Kim Alvefur <zash@zash.se> parents: 10098 diff changeset	501 return #data;
e77bf4222fae net.server_epoll: Add support for opportunistic writes Kim Alvefur <zash@zash.se> parents: 10098 diff changeset	502 end
9581 1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	503 self:setwritetimeout();
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	504 self:set(nil, true);
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	505 end
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	506 return #data;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	507 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	508 interface.send = interface.write;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	509
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	510 -- Close, possibly after writing is done
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	511 function interface:close()
8007 67f8954875a4 net.server_epoll: Check write buffer for remaining data to write when closing Kim Alvefur <zash@zash.se> parents: 8006 diff changeset	512 if self.writebuffer and self.writebuffer[1] then
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	513 self:set(false, true); -- Flush final buffer contents
7593 0266434d7df1 net.server_epoll: Prevent further writing after closing a socket Kim Alvefur <zash@zash.se> parents: 7592 diff changeset	514 self.write, self.send = noop, noop; -- No more writing
10416 6af8c812a885 net.server_epoll: Clarify a debug message Kim Alvefur <zash@zash.se> parents: 10332 diff changeset	515 self:debug("Close after writing remaining buffered data");
8008 62ed3795be13 net.server_epoll: Attempt to simplify state control Kim Alvefur <zash@zash.se> parents: 8007 diff changeset	516 self.ondrain = interface.close;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	517 else
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	518 self:debug("Closing now");
7593 0266434d7df1 net.server_epoll: Prevent further writing after closing a socket Kim Alvefur <zash@zash.se> parents: 7592 diff changeset	519 self.write, self.send = noop, noop;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	520 self.close = noop;
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	521 self:on("disconnect");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	522 self:destroy();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	523 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	524 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	525
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	526 function interface:destroy()
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	527 self:del();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	528 self:setwritetimeout(false);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	529 self:setreadtimeout(false);
7594 5e884501a9ac net.server_epoll: Prevent anything from happening to destroyed sockets Kim Alvefur <zash@zash.se> parents: 7593 diff changeset	530 self.onreadable = noop;
8542 8c39ec8e6018 net.server_epoll: Spelling writeable -> writable Kim Alvefur <zash@zash.se> parents: 8541 diff changeset	531 self.onwritable = noop;
7594 5e884501a9ac net.server_epoll: Prevent anything from happening to destroyed sockets Kim Alvefur <zash@zash.se> parents: 7593 diff changeset	532 self.destroy = noop;
5e884501a9ac net.server_epoll: Prevent anything from happening to destroyed sockets Kim Alvefur <zash@zash.se> parents: 7593 diff changeset	533 self.close = noop;
5e884501a9ac net.server_epoll: Prevent anything from happening to destroyed sockets Kim Alvefur <zash@zash.se> parents: 7593 diff changeset	534 self.on = noop;
5e884501a9ac net.server_epoll: Prevent anything from happening to destroyed sockets Kim Alvefur <zash@zash.se> parents: 7593 diff changeset	535 self.conn:close();
5e884501a9ac net.server_epoll: Prevent anything from happening to destroyed sockets Kim Alvefur <zash@zash.se> parents: 7593 diff changeset	536 self.conn = nil;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	537 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	538
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	539 function interface:ssl()
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	540 return self._tls;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	541 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	542
9300 1df8832bd29e net.server_epoll: Rename all variables holding TLS contexts for consistency Kim Alvefur <zash@zash.se> parents: 8983 diff changeset	543 function interface:starttls(tls_ctx)
1df8832bd29e net.server_epoll: Rename all variables holding TLS contexts for consistency Kim Alvefur <zash@zash.se> parents: 8983 diff changeset	544 if tls_ctx then self.tls_ctx = tls_ctx; end
9430 412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	545 self.starttls = false;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	546 if self.writebuffer and self.writebuffer[1] then
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	547 self:debug("Start TLS after write");
8008 62ed3795be13 net.server_epoll: Attempt to simplify state control Kim Alvefur <zash@zash.se> parents: 8007 diff changeset	548 self.ondrain = interface.starttls;
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	549 self:set(nil, true); -- make sure wantwrite is set
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	550 else
9430 412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	551 if self.ondrain == interface.starttls then
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	552 self.ondrain = nil;
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	553 end
10847 42c8dce6e765 net.server_epoll: Fix typo in internal method name Kim Alvefur <zash@zash.se> parents: 10846 diff changeset	554 self.onwritable = interface.tlshandshake;
42c8dce6e765 net.server_epoll: Fix typo in internal method name Kim Alvefur <zash@zash.se> parents: 10846 diff changeset	555 self.onreadable = interface.tlshandshake;
9430 412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	556 self:set(true, true);
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	557 self:debug("Prepared to start TLS");
9430 412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	558 end
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	559 end
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	560
10847 42c8dce6e765 net.server_epoll: Fix typo in internal method name Kim Alvefur <zash@zash.se> parents: 10846 diff changeset	561 function interface:tlshandshake()
9430 412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	562 self:setwritetimeout(false);
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	563 self:setreadtimeout(false);
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	564 if not self._tls then
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	565 self._tls = true;
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	566 self:debug("Starting TLS now");
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	567 self:del();
10329 c0a72c97e6cf net.server_epoll: Fix to get remote IP on direct TLS connections Kim Alvefur <zash@zash.se> parents: 10328 diff changeset	568 self:updatenames(); -- Can't getpeer/sockname after wrap()
9431 c3c0523a37c6 net.server_epoll: Catch errors from luasec.wrap Kim Alvefur <zash@zash.se> parents: 9430 diff changeset	569 local ok, conn, err = pcall(luasec.wrap, self.conn, self.tls_ctx);
c3c0523a37c6 net.server_epoll: Catch errors from luasec.wrap Kim Alvefur <zash@zash.se> parents: 9430 diff changeset	570 if not ok then
c3c0523a37c6 net.server_epoll: Catch errors from luasec.wrap Kim Alvefur <zash@zash.se> parents: 9430 diff changeset	571 conn, err = ok, conn;
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	572 self:debug("Failed to initialize TLS: %s", err);
9431 c3c0523a37c6 net.server_epoll: Catch errors from luasec.wrap Kim Alvefur <zash@zash.se> parents: 9430 diff changeset	573 end
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	574 if not conn then
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	575 self:on("disconnect", err);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	576 self:destroy();
7595 166b2e0766a4 net.server_epoll: Return status from starttls method Kim Alvefur <zash@zash.se> parents: 7594 diff changeset	577 return conn, err;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	578 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	579 conn:settimeout(0);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	580 self.conn = conn;
9847 adc0672b700e net.server_epoll: Add support for SNI (#409) Kim Alvefur <zash@zash.se> parents: 9835 diff changeset	581 if conn.sni then
adc0672b700e net.server_epoll: Add support for SNI (#409) Kim Alvefur <zash@zash.se> parents: 9835 diff changeset	582 if self.servername then
adc0672b700e net.server_epoll: Add support for SNI (#409) Kim Alvefur <zash@zash.se> parents: 9835 diff changeset	583 conn:sni(self.servername);
9853 9aea8dbb105d net.server: Only add alternate SNI contexts if at least one is provided Kim Alvefur <zash@zash.se> parents: 9847 diff changeset	584 elseif self._server and type(self._server.hosts) == "table" and next(self._server.hosts) ~= nil then
9847 adc0672b700e net.server_epoll: Add support for SNI (#409) Kim Alvefur <zash@zash.se> parents: 9835 diff changeset	585 conn:sni(self._server.hosts, true);
adc0672b700e net.server_epoll: Add support for SNI (#409) Kim Alvefur <zash@zash.se> parents: 9835 diff changeset	586 end
11063 30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	587 end
9430 412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	588 self:on("starttls");
8008 62ed3795be13 net.server_epoll: Attempt to simplify state control Kim Alvefur <zash@zash.se> parents: 8007 diff changeset	589 self.ondrain = nil;
10847 42c8dce6e765 net.server_epoll: Fix typo in internal method name Kim Alvefur <zash@zash.se> parents: 10846 diff changeset	590 self.onwritable = interface.tlshandshake;
42c8dce6e765 net.server_epoll: Fix typo in internal method name Kim Alvefur <zash@zash.se> parents: 10846 diff changeset	591 self.onreadable = interface.tlshandshake;
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	592 return self:init();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	593 end
10846 d0b098d0f6c3 net.server_epoll: Log some noise before TLS handshake step Kim Alvefur <zash@zash.se> parents: 10683 diff changeset	594 self:noise("Continuing TLS handshake");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	595 local ok, err = self.conn:dohandshake();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	596 if ok then
10309 2a31571efce0 net.server_epoll: Guard against nil return from TLS info method Kim Alvefur <zash@zash.se> parents: 10307 diff changeset	597 local info = self.conn.info and self.conn:info();
2a31571efce0 net.server_epoll: Guard against nil return from TLS info method Kim Alvefur <zash@zash.se> parents: 10307 diff changeset	598 if type(info) == "table" then
10307 6a997f0ceba8 net.server_epoll: Log TLS version and cipher for all completed handshakes Kim Alvefur <zash@zash.se> parents: 10305 diff changeset	599 self:debug("TLS handshake complete (%s with %s)", info.protocol, info.cipher);
6a997f0ceba8 net.server_epoll: Log TLS version and cipher for all completed handshakes Kim Alvefur <zash@zash.se> parents: 10305 diff changeset	600 else
6a997f0ceba8 net.server_epoll: Log TLS version and cipher for all completed handshakes Kim Alvefur <zash@zash.se> parents: 10305 diff changeset	601 self:debug("TLS handshake complete");
6a997f0ceba8 net.server_epoll: Log TLS version and cipher for all completed handshakes Kim Alvefur <zash@zash.se> parents: 10305 diff changeset	602 end
8542 8c39ec8e6018 net.server_epoll: Spelling writeable -> writable Kim Alvefur <zash@zash.se> parents: 8541 diff changeset	603 self.onwritable = nil;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	604 self.onreadable = nil;
8008 62ed3795be13 net.server_epoll: Attempt to simplify state control Kim Alvefur <zash@zash.se> parents: 8007 diff changeset	605 self:on("status", "ssl-handshake-complete");
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	606 self:setwritetimeout();
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	607 self:set(true, true);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	608 elseif err == "wantread" then
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	609 self:noise("TLS handshake to wait until readable");
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	610 self:set(true, false);
9822 13c2707d2417 net.server_epoll: Rename handshake_timeout to ssl_handshake_timeout (fixes #1319) Kim Alvefur <zash@zash.se> parents: 9821 diff changeset	611 self:setreadtimeout(cfg.ssl_handshake_timeout);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	612 elseif err == "wantwrite" then
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	613 self:noise("TLS handshake to wait until writable");
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	614 self:set(false, true);
9822 13c2707d2417 net.server_epoll: Rename handshake_timeout to ssl_handshake_timeout (fixes #1319) Kim Alvefur <zash@zash.se> parents: 9821 diff changeset	615 self:setwritetimeout(cfg.ssl_handshake_timeout);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	616 else
10649 228277be4a28 net.server_epoll: Reduce log level of TLS handshake errors to debug Kim Alvefur <zash@zash.se> parents: 10638 diff changeset	617 self:debug("TLS handshake error: %s", err);
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	618 self:on("disconnect", err);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	619 self:destroy();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	620 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	621 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	622
11063 30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	623 local function wrapsocket(client, server, read_size, listeners, tls_ctx, extra) -- luasocket object -> interface object
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	624 client:settimeout(0);
10279 0e1701197722 net.server_epoll: Make log tag accessible as a field Kim Alvefur <zash@zash.se> parents: 10278 diff changeset	625 local conn_id = ("conn%s"):format(new_id());
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	626 local conn = setmetatable({
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	627 conn = client;
8271 c09deab9989e net.server_epoll: Add interface:server() method to match server_event (fixes c2s:show traceback in telnet console) Kim Alvefur <zash@zash.se> parents: 8091 diff changeset	628 _server = server;
10492 8e1d9bba9244 net.server_epoll: Use monotonic time for scheduling Kim Alvefur <zash@zash.se> parents: 10491 diff changeset	629 created = realtime();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	630 listeners = listeners;
9310 2d2d4c293efa net.server_epoll: Rename pattern to read_size Kim Alvefur <zash@zash.se> parents: 9309 diff changeset	631 read_size = read_size or (server and server.read_size);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	632 writebuffer = {};
9432 2e3f66475cc8 net.server_epoll: Inherit Direct TLS flag from servers to their clients Kim Alvefur <zash@zash.se> parents: 9431 diff changeset	633 tls_ctx = tls_ctx or (server and server.tls_ctx);
2e3f66475cc8 net.server_epoll: Inherit Direct TLS flag from servers to their clients Kim Alvefur <zash@zash.se> parents: 9431 diff changeset	634 tls_direct = server and server.tls_direct;
10279 0e1701197722 net.server_epoll: Make log tag accessible as a field Kim Alvefur <zash@zash.se> parents: 10278 diff changeset	635 id = conn_id;
0e1701197722 net.server_epoll: Make log tag accessible as a field Kim Alvefur <zash@zash.se> parents: 10278 diff changeset	636 log = logger.init(conn_id);
11063 30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	637 extra = extra;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	638 }, interface_mt);
7591 138f16eb39fb net.server_epoll: Improve syntax Kim Alvefur <zash@zash.se> parents: 7590 diff changeset	639
11063 30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	640 if extra then
30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	641 if extra.servername then
30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	642 conn.servername = extra.servername;
30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	643 end
30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	644 end
30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	645
9383 3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	646 conn:updatenames();
3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	647 return conn;
3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	648 end
3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	649
3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	650 function interface:updatenames()
3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	651 local conn = self.conn;
3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	652 local ok, peername, peerport = pcall(conn.getpeername, conn);
10330 d86b1304451a net.server_epoll: Handle getpeer/sockname returning a normal error Kim Alvefur <zash@zash.se> parents: 10329 diff changeset	653 if ok and peername then
10854 472fe13a05f9 net.server_epoll: Handle missing ports from getsock/peername (as in the case of unix sockets) Matthew Wild <mwild1@gmail.com> parents: 10847 diff changeset	654 self.peername, self.peerport = peername, peerport or 0;
7584 98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	655 end
9383 3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	656 local ok, sockname, sockport = pcall(conn.getsockname, conn);
10330 d86b1304451a net.server_epoll: Handle getpeer/sockname returning a normal error Kim Alvefur <zash@zash.se> parents: 10329 diff changeset	657 if ok and sockname then
10854 472fe13a05f9 net.server_epoll: Handle missing ports from getsock/peername (as in the case of unix sockets) Matthew Wild <mwild1@gmail.com> parents: 10847 diff changeset	658 self.sockname, self.sockport = sockname, sockport or 0;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	659 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	660 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	661
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	662 -- A server interface has new incoming connections waiting
cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	663 -- This replaces the onreadable callback
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	664 function interface:onacceptable()
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	665 local conn, err = self.conn:accept();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	666 if not conn then
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	667 self:debug("Error accepting new client: %s, server will be paused for %ds", err, cfg.accept_retry_interval);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	668 self:pausefor(cfg.accept_retry_interval);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	669 return;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	670 end
9309 33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	671 local client = wrapsocket(conn, self, nil, self.listeners);
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	672 client:debug("New connection %s on server %s", client, self);
9430 412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	673 client:init();
9309 33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	674 if self.tls_direct then
33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	675 client:starttls(self.tls_ctx);
9695 5ec4eaf76de8 net.server_epoll: Call onconnect right after accept()ing a new client Kim Alvefur <zash@zash.se> parents: 9666 diff changeset	676 else
5ec4eaf76de8 net.server_epoll: Call onconnect right after accept()ing a new client Kim Alvefur <zash@zash.se> parents: 9666 diff changeset	677 client:onconnect();
9309 33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	678 end
7597 cd34aa6b1632 net.server_epoll: Refactor to use common initialization Kim Alvefur <zash@zash.se> parents: 7596 diff changeset	679 end
cd34aa6b1632 net.server_epoll: Refactor to use common initialization Kim Alvefur <zash@zash.se> parents: 7596 diff changeset	680
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	681 -- Initialization
7597 cd34aa6b1632 net.server_epoll: Refactor to use common initialization Kim Alvefur <zash@zash.se> parents: 7596 diff changeset	682 function interface:init()
9824 729de68f0068 net.server_epoll: Separate timeout for initial connection attempts Kim Alvefur <zash@zash.se> parents: 9823 diff changeset	683 self:setwritetimeout(cfg.connect_timeout);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	684 return self:add(true, true);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	685 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	686
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	687 function interface:pause()
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	688 self:noise("Pause reading");
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	689 return self:set(false);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	690 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	691
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	692 function interface:resume()
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	693 self:noise("Resume reading");
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	694 return self:set(true);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	695 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	696
7624 23fb3a084956 net.server_epoll: Comments Kim Alvefur <zash@zash.se> parents: 7623 diff changeset	697 -- Pause connection for some time
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	698 function interface:pausefor(t)
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	699 self:noise("Pause for %fs", t);
7559 b1b27dedf4cf net.server_epoll: Replace any previous pausefor timer Kim Alvefur <zash@zash.se> parents: 7558 diff changeset	700 if self._pausefor then
10985 758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	701 closetimer(self._pausefor);
758ce12586de net.server_epoll: Optimize away table allocation for timer objects Kim Alvefur <zash@zash.se> parents: 10984 diff changeset	702 self._pausefor = nil;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	703 end
7559 b1b27dedf4cf net.server_epoll: Replace any previous pausefor timer Kim Alvefur <zash@zash.se> parents: 7558 diff changeset	704 if t == false then return; end
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	705 self:set(false);
7559 b1b27dedf4cf net.server_epoll: Replace any previous pausefor timer Kim Alvefur <zash@zash.se> parents: 7558 diff changeset	706 self._pausefor = addtimer(t, function ()
b1b27dedf4cf net.server_epoll: Replace any previous pausefor timer Kim Alvefur <zash@zash.se> parents: 7558 diff changeset	707 self._pausefor = nil;
9994 524b8cd76780 net.server_epoll: Restore wantread flag after pause (fixes #1354) Kim Alvefur <zash@zash.se> parents: 9932 diff changeset	708 self:set(true);
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	709 self:noise("Resuming after pause, connection is %s", not self.conn and "missing" or self.conn:dirty() and "dirty" or "clean");
7707 7bb1cc7278b6 net.server_epoll: Make sure socket exists before checking if there is buffered data in it Kim Alvefur <zash@zash.se> parents: 7691 diff changeset	710 if self.conn and self.conn:dirty() then
7560 785fa1138293 net.server_epoll: Continue reading after a slight delay if there is buffered data after a read Kim Alvefur <zash@zash.se> parents: 7559 diff changeset	711 self:onreadable();
785fa1138293 net.server_epoll: Continue reading after a slight delay if there is buffered data after a read Kim Alvefur <zash@zash.se> parents: 7559 diff changeset	712 end
7559 b1b27dedf4cf net.server_epoll: Replace any previous pausefor timer Kim Alvefur <zash@zash.se> parents: 7558 diff changeset	713 end);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	714 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	715
10098 dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	716 function interface:setlimit(Bps)
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	717 if Bps > 0 then
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	718 self._limit = 1/Bps;
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	719 else
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	720 self._limit = nil;
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	721 end
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	722 end
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	723
9581 1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	724 function interface:pause_writes()
10300 78f2a3a9c537 net.server_epoll: Return early when attepting to set write lock state to current state Kim Alvefur <zash@zash.se> parents: 10289 diff changeset	725 if self._write_lock then
78f2a3a9c537 net.server_epoll: Return early when attepting to set write lock state to current state Kim Alvefur <zash@zash.se> parents: 10289 diff changeset	726 return
78f2a3a9c537 net.server_epoll: Return early when attepting to set write lock state to current state Kim Alvefur <zash@zash.se> parents: 10289 diff changeset	727 end
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	728 self:noise("Pause writes");
9581 1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	729 self._write_lock = true;
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	730 self:setwritetimeout(false);
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	731 self:set(nil, false);
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	732 end
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	733
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	734 function interface:resume_writes()
10300 78f2a3a9c537 net.server_epoll: Return early when attepting to set write lock state to current state Kim Alvefur <zash@zash.se> parents: 10289 diff changeset	735 if not self._write_lock then
78f2a3a9c537 net.server_epoll: Return early when attepting to set write lock state to current state Kim Alvefur <zash@zash.se> parents: 10289 diff changeset	736 return
78f2a3a9c537 net.server_epoll: Return early when attepting to set write lock state to current state Kim Alvefur <zash@zash.se> parents: 10289 diff changeset	737 end
10587 863aa36a9dd8 net.server_epoll: Add option for reducing debug logging Kim Alvefur <zash@zash.se> parents: 10586 diff changeset	738 self:noise("Resume writes");
9581 1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	739 self._write_lock = nil;
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	740 if self.writebuffer[1] then
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	741 self:setwritetimeout();
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	742 self:set(nil, true);
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	743 end
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	744 end
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	745
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	746 -- Connected!
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	747 function interface:onconnect()
10638 92918212ee83 net.server_epoll: Different error to distinguish connection timeout Kim Alvefur <zash@zash.se> parents: 10589 diff changeset	748 self._connected = true;
9594 dcf466e04f81 net.server_epoll: Use method to update peername on connect Kim Alvefur <zash@zash.se> parents: 9587 diff changeset	749 self:updatenames();
10331 76bd77ad6a2a server_epoll: Log full string represestation when connected Kim Alvefur <zash@zash.se> parents: 10330 diff changeset	750 self:debug("Connected (%s)", self);
8540 ba9fd886b34d net.server_epoll: Call onconnect listener on first successful read or write Kim Alvefur <zash@zash.se> parents: 8507 diff changeset	751 self.onconnect = noop;
ba9fd886b34d net.server_epoll: Call onconnect listener on first successful read or write Kim Alvefur <zash@zash.se> parents: 8507 diff changeset	752 self:on("connect");
8506 174fd716c9fa server_epoll: Rework how socket readyness is detected Kim Alvefur <zash@zash.se> parents: 8271 diff changeset	753 end
174fd716c9fa server_epoll: Rework how socket readyness is detected Kim Alvefur <zash@zash.se> parents: 8271 diff changeset	754
10861 e12690a37795 net.server_epoll: Add way to start accepting clients on an arbitrary server socket Kim Alvefur <zash@zash.se> parents: 10854 diff changeset	755 local function wrapserver(conn, addr, port, listeners, config)
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	756 local server = setmetatable({
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	757 conn = conn;
10492 8e1d9bba9244 net.server_epoll: Use monotonic time for scheduling Kim Alvefur <zash@zash.se> parents: 10491 diff changeset	758 created = realtime();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	759 listeners = listeners;
9835 20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	760 read_size = config and config.read_size;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	761 onreadable = interface.onacceptable;
9835 20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	762 tls_ctx = config and config.tls_ctx;
20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	763 tls_direct = config and config.tls_direct;
9847 adc0672b700e net.server_epoll: Add support for SNI (#409) Kim Alvefur <zash@zash.se> parents: 9835 diff changeset	764 hosts = config and config.sni_hosts;
7584 98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	765 sockname = addr;
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	766 sockport = port;
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	767 log = logger.init(("serv%s"):format(new_id()));
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	768 }, interface_mt);
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	769 server:debug("Server %s created", server);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	770 server:add(true, false);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	771 return server;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	772 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	773
10861 e12690a37795 net.server_epoll: Add way to start accepting clients on an arbitrary server socket Kim Alvefur <zash@zash.se> parents: 10854 diff changeset	774 local function listen(addr, port, listeners, config)
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	775 local conn, err = socket.bind(addr, port, cfg.tcp_backlog);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	776 if not conn then return conn, err; end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	777 conn:settimeout(0);
10861 e12690a37795 net.server_epoll: Add way to start accepting clients on an arbitrary server socket Kim Alvefur <zash@zash.se> parents: 10854 diff changeset	778 return wrapserver(conn, addr, port, listeners, config);
e12690a37795 net.server_epoll: Add way to start accepting clients on an arbitrary server socket Kim Alvefur <zash@zash.se> parents: 10854 diff changeset	779 end
e12690a37795 net.server_epoll: Add way to start accepting clients on an arbitrary server socket Kim Alvefur <zash@zash.se> parents: 10854 diff changeset	780
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	781 -- COMPAT
9835 20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	782 local function addserver(addr, port, listeners, read_size, tls_ctx)
20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	783 return listen(addr, port, listeners, {
9310 2d2d4c293efa net.server_epoll: Rename pattern to read_size Kim Alvefur <zash@zash.se> parents: 9309 diff changeset	784 read_size = read_size;
9300 1df8832bd29e net.server_epoll: Rename all variables holding TLS contexts for consistency Kim Alvefur <zash@zash.se> parents: 8983 diff changeset	785 tls_ctx = tls_ctx;
9309 33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	786 tls_direct = tls_ctx and true or false;
9835 20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	787 });
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	788 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	789
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	790 -- COMPAT
11063 30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	791 local function wrapclient(conn, addr, port, listeners, read_size, tls_ctx, extra)
30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	792 local client = wrapsocket(conn, nil, read_size, listeners, tls_ctx, extra);
7597 cd34aa6b1632 net.server_epoll: Refactor to use common initialization Kim Alvefur <zash@zash.se> parents: 7596 diff changeset	793 if not client.peername then
cd34aa6b1632 net.server_epoll: Refactor to use common initialization Kim Alvefur <zash@zash.se> parents: 7596 diff changeset	794 client.peername, client.peerport = addr, port;
cd34aa6b1632 net.server_epoll: Refactor to use common initialization Kim Alvefur <zash@zash.se> parents: 7596 diff changeset	795 end
9473 5fdda751333a net.server: Require IP address as argument to addclient (no DNS names) Kim Alvefur <zash@zash.se> parents: 9445 diff changeset	796 local ok, err = client:init();
5fdda751333a net.server: Require IP address as argument to addclient (no DNS names) Kim Alvefur <zash@zash.se> parents: 9445 diff changeset	797 if not ok then return ok, err; end
9309 33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	798 if tls_ctx then
33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	799 client:starttls(tls_ctx);
33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	800 end
7551 838212918f11 net.server_epoll: Rename arguments and varibles for consistensy Kim Alvefur <zash@zash.se> parents: 7550 diff changeset	801 return client;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	802 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	803
7800 dadf9ba290c5 server_epoll: Add some comments describing some functions Kim Alvefur <zash@zash.se> parents: 7799 diff changeset	804 -- New outgoing TCP connection
11063 30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	805 local function addclient(addr, port, listeners, read_size, tls_ctx, typ, extra)
9497 183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	806 local create;
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	807 if not typ then
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	808 local n = inet_pton(addr);
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	809 if not n then return nil, "invalid-ip"; end
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	810 if #n == 16 then
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	811 typ = "tcp6";
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	812 else
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	813 typ = "tcp4";
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	814 end
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	815 end
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	816 if typ then
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	817 create = socket[typ];
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	818 end
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	819 if type(create) ~= "function" then
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	820 return nil, "invalid socket type";
9473 5fdda751333a net.server: Require IP address as argument to addclient (no DNS names) Kim Alvefur <zash@zash.se> parents: 9445 diff changeset	821 end
5fdda751333a net.server: Require IP address as argument to addclient (no DNS names) Kim Alvefur <zash@zash.se> parents: 9445 diff changeset	822 local conn, err = create();
10082 1df53ef1f60d net.server_epoll: Return errors from creating sockets Kim Alvefur <zash@zash.se> parents: 10081 diff changeset	823 if not conn then return conn, err; end
9498 cc593002f2e2 net.server_epoll: Check return conditions of early socket setup Kim Alvefur <zash@zash.se> parents: 9497 diff changeset	824 local ok, err = conn:settimeout(0);
cc593002f2e2 net.server_epoll: Check return conditions of early socket setup Kim Alvefur <zash@zash.se> parents: 9497 diff changeset	825 if not ok then return ok, err; end
9499 36e379f058c8 net.server: Swich method for connecting sockets with remotes Kim Alvefur <zash@zash.se> parents: 9498 diff changeset	826 local ok, err = conn:setpeername(addr, port);
9498 cc593002f2e2 net.server_epoll: Check return conditions of early socket setup Kim Alvefur <zash@zash.se> parents: 9497 diff changeset	827 if not ok and err ~= "timeout" then return ok, err; end
11063 30d3f6f85eb8 net.server: Backport client parts of SNI support from trunk (#409) Kim Alvefur <zash@zash.se> parents: 10681 diff changeset	828 local client = wrapsocket(conn, nil, read_size, listeners, tls_ctx, extra)
9473 5fdda751333a net.server: Require IP address as argument to addclient (no DNS names) Kim Alvefur <zash@zash.se> parents: 9445 diff changeset	829 local ok, err = client:init();
10332 e05ea8223b32 net.server_epoll: Save IP and port from connection creation call Kim Alvefur <zash@zash.se> parents: 10331 diff changeset	830 if not client.peername then
e05ea8223b32 net.server_epoll: Save IP and port from connection creation call Kim Alvefur <zash@zash.se> parents: 10331 diff changeset	831 -- otherwise not set until connected
e05ea8223b32 net.server_epoll: Save IP and port from connection creation call Kim Alvefur <zash@zash.se> parents: 10331 diff changeset	832 client.peername, client.peerport = addr, port;
e05ea8223b32 net.server_epoll: Save IP and port from connection creation call Kim Alvefur <zash@zash.se> parents: 10331 diff changeset	833 end
9473 5fdda751333a net.server: Require IP address as argument to addclient (no DNS names) Kim Alvefur <zash@zash.se> parents: 9445 diff changeset	834 if not ok then return ok, err; end
10328 5c2b31c823b9 net.server_epoll: Move a log message to improve ordering Kim Alvefur <zash@zash.se> parents: 10309 diff changeset	835 client:debug("Client %s created", client);
9309 33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	836 if tls_ctx then
33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	837 client:starttls(tls_ctx);
33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	838 end
7556 1f777b38b66c net.server_epoll: Make addclient conform to API (expected by net.http.request) Kim Alvefur <zash@zash.se> parents: 7555 diff changeset	839 return client, conn;
7553 4f3e4a092348 net.server_epoll: Make addclient use wrapclient Kim Alvefur <zash@zash.se> parents: 7552 diff changeset	840 end
4f3e4a092348 net.server_epoll: Make addclient use wrapclient Kim Alvefur <zash@zash.se> parents: 7552 diff changeset	841
9319 7c954c75b6ac net.server_epoll: Fix write signal handling in watchfd API Kim Alvefur <zash@zash.se> parents: 9314 diff changeset	842 local function watchfd(fd, onreadable, onwritable)
8781 53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	843 local conn = setmetatable({
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	844 conn = fd;
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	845 onreadable = onreadable;
9319 7c954c75b6ac net.server_epoll: Fix write signal handling in watchfd API Kim Alvefur <zash@zash.se> parents: 9314 diff changeset	846 onwritable = onwritable;
8781 53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	847 close = function (self)
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	848 self:del();
8781 53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	849 end
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	850 }, interface_mt);
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	851 if type(fd) == "number" then
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	852 conn.getfd = function ()
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	853 return fd;
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	854 end;
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	855 -- Otherwise it'll need to be something LuaSocket-compatible
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	856 end
10420 49a828819696 net.server_epoll: Save log tag in a field on FD watchers too Kim Alvefur <zash@zash.se> parents: 10419 diff changeset	857 conn.id = new_id();
49a828819696 net.server_epoll: Save log tag in a field on FD watchers too Kim Alvefur <zash@zash.se> parents: 10419 diff changeset	858 conn.log = logger.init(("fdwatch%s"):format(conn.id));
9319 7c954c75b6ac net.server_epoll: Fix write signal handling in watchfd API Kim Alvefur <zash@zash.se> parents: 9314 diff changeset	859 conn:add(onreadable, onwritable);
8781 53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	860 return conn;
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	861 end;
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	862
7800 dadf9ba290c5 server_epoll: Add some comments describing some functions Kim Alvefur <zash@zash.se> parents: 7799 diff changeset	863 -- Dump all data from one connection into another
10283 dff360d00dfa net.server_epoll: Handle read size argument to link Kim Alvefur <zash@zash.se> parents: 10282 diff changeset	864 local function link(from, to, read_size)
10280 6b8b255f1d10 net.server_epoll: Add debug logging for various connection events Kim Alvefur <zash@zash.se> parents: 10279 diff changeset	865 from:debug("Linking to %s", to.id);
10284 cd669975031b net.server_epoll: Fix link function to not replace listeners Kim Alvefur <zash@zash.se> parents: 10283 diff changeset	866 function from:onincoming(data)
cd669975031b net.server_epoll: Fix link function to not replace listeners Kim Alvefur <zash@zash.se> parents: 10283 diff changeset	867 self:pause();
10289 8c59b20f71dc net.server_epoll: Correct indentation Kim Alvefur <zash@zash.se> parents: 10285 diff changeset	868 to:write(data);
10284 cd669975031b net.server_epoll: Fix link function to not replace listeners Kim Alvefur <zash@zash.se> parents: 10283 diff changeset	869 end
10285 bcf61e22f841 net.server_epoll: Ignore unused self argument [luacheck] Kim Alvefur <zash@zash.se> parents: 10284 diff changeset	870 function to:ondrain() -- luacheck: ignore 212/self
10289 8c59b20f71dc net.server_epoll: Correct indentation Kim Alvefur <zash@zash.se> parents: 10285 diff changeset	871 from:resume();
10284 cd669975031b net.server_epoll: Fix link function to not replace listeners Kim Alvefur <zash@zash.se> parents: 10283 diff changeset	872 end
10283 dff360d00dfa net.server_epoll: Handle read size argument to link Kim Alvefur <zash@zash.se> parents: 10282 diff changeset	873 from:set_mode(read_size);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	874 from:set(true, nil);
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	875 to:set(nil, true);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	876 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	877
9438 916bee81eb7e net.server_epoll: Make :set_send a noop, should fix net.adns Kim Alvefur <zash@zash.se> parents: 9432 diff changeset	878 -- COMPAT
916bee81eb7e net.server_epoll: Make :set_send a noop, should fix net.adns Kim Alvefur <zash@zash.se> parents: 9432 diff changeset	879 -- net.adns calls this but then replaces :send so this can be a noop
9439 988392a56495 net.server_epoll: Fix luacheck annotation Kim Alvefur <zash@zash.se> parents: 9438 diff changeset	880 function interface:set_send(new_send) -- luacheck: ignore 212
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	881 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	882
7800 dadf9ba290c5 server_epoll: Add some comments describing some functions Kim Alvefur <zash@zash.se> parents: 7799 diff changeset	883 -- Close all connections and servers
7794 424bbbeb9257 server_epoll: Add closeall() method for closing all clients and servers Kim Alvefur <zash@zash.se> parents: 7737 diff changeset	884 local function closeall()
7799 93643a61858a server_epoll: Ignore unused loop variable [luacheck] Kim Alvefur <zash@zash.se> parents: 7797 diff changeset	885 for fd, conn in pairs(fds) do -- luacheck: ignore 213/fd
7794 424bbbeb9257 server_epoll: Add closeall() method for closing all clients and servers Kim Alvefur <zash@zash.se> parents: 7737 diff changeset	886 conn:close();
424bbbeb9257 server_epoll: Add closeall() method for closing all clients and servers Kim Alvefur <zash@zash.se> parents: 7737 diff changeset	887 end
424bbbeb9257 server_epoll: Add closeall() method for closing all clients and servers Kim Alvefur <zash@zash.se> parents: 7737 diff changeset	888 end
424bbbeb9257 server_epoll: Add closeall() method for closing all clients and servers Kim Alvefur <zash@zash.se> parents: 7737 diff changeset	889
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	890 local quitting = nil;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	891
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	892 -- Signal main loop about shutdown via above upvalue
7796 12609aee3b3b server_epoll: Handle the argument to setquitting like server_select Kim Alvefur <zash@zash.se> parents: 7795 diff changeset	893 local function setquitting(quit)
12609aee3b3b server_epoll: Handle the argument to setquitting like server_select Kim Alvefur <zash@zash.se> parents: 7795 diff changeset	894 if quit then
12609aee3b3b server_epoll: Handle the argument to setquitting like server_select Kim Alvefur <zash@zash.se> parents: 7795 diff changeset	895 quitting = "quitting";
7797 d0c32d86724f server_epoll: Flush and close all connections before quitting mainloop so no data is lost in buffers Kim Alvefur <zash@zash.se> parents: 7796 diff changeset	896 closeall();
7796 12609aee3b3b server_epoll: Handle the argument to setquitting like server_select Kim Alvefur <zash@zash.se> parents: 7795 diff changeset	897 else
12609aee3b3b server_epoll: Handle the argument to setquitting like server_select Kim Alvefur <zash@zash.se> parents: 7795 diff changeset	898 quitting = nil;
12609aee3b3b server_epoll: Handle the argument to setquitting like server_select Kim Alvefur <zash@zash.se> parents: 7795 diff changeset	899 end
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	900 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	901
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	902 -- Main loop
7795 03081bd5c5bb net.server_epoll: Add the 'once' argument to loop for parity with server_select Kim Alvefur <zash@zash.se> parents: 7794 diff changeset	903 local function loop(once)
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	904 repeat
7658 e14a124c4d73 net.server_epoll: Make minimum poll wait time configurable Kim Alvefur <zash@zash.se> parents: 7657 diff changeset	905 local t = runtimers(cfg.max_wait, cfg.min_wait);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	906 local fd, r, w = poll:wait(t);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	907 if fd then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	908 local conn = fds[fd];
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	909 if conn then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	910 if r then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	911 conn:onreadable();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	912 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	913 if w then
8542 8c39ec8e6018 net.server_epoll: Spelling writeable -> writable Kim Alvefur <zash@zash.se> parents: 8541 diff changeset	914 conn:onwritable();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	915 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	916 else
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	917 log("debug", "Removing unknown fd %d", fd);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	918 poll:del(fd);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	919 end
9508 2055b497b515 net.server_epoll: Special handling of signal interrupts Kim Alvefur <zash@zash.se> parents: 9507 diff changeset	920 elseif r ~= "timeout" and r ~= "signal" then
9445 af7eafe82447 net.server_epoll: Log error number from wait() Kim Alvefur <zash@zash.se> parents: 9441 diff changeset	921 log("debug", "epoll_wait error: %s[%d]", r, w);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	922 end
7797 d0c32d86724f server_epoll: Flush and close all connections before quitting mainloop so no data is lost in buffers Kim Alvefur <zash@zash.se> parents: 7796 diff changeset	923 until once or (quitting and next(fds) == nil);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	924 return quitting;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	925 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	926
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	927 return {
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	928 get_backend = function () return "epoll"; end;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	929 addserver = addserver;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	930 addclient = addclient;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	931 add_task = addtimer;
10983 0862325842ec net.server_epoll: Signal API-compatibilty with util.timer Kim Alvefur <zash@zash.se> parents: 10982 diff changeset	932 timer = {
0862325842ec net.server_epoll: Signal API-compatibilty with util.timer Kim Alvefur <zash@zash.se> parents: 10982 diff changeset	933 -- API-compatible with util.timer
0862325842ec net.server_epoll: Signal API-compatibilty with util.timer Kim Alvefur <zash@zash.se> parents: 10982 diff changeset	934 add_task = addtimer;
0862325842ec net.server_epoll: Signal API-compatibilty with util.timer Kim Alvefur <zash@zash.se> parents: 10982 diff changeset	935 stop = closetimer;
0862325842ec net.server_epoll: Signal API-compatibilty with util.timer Kim Alvefur <zash@zash.se> parents: 10982 diff changeset	936 reschedule = reschedule;
10987 62355b801772 net.server_epoll: Expose way to turn monotonic time into wall clock time Kim Alvefur <zash@zash.se> parents: 10985 diff changeset	937 to_absolute_time = function (t)
62355b801772 net.server_epoll: Expose way to turn monotonic time into wall clock time Kim Alvefur <zash@zash.se> parents: 10985 diff changeset	938 return t-monotonic()+realtime();
62355b801772 net.server_epoll: Expose way to turn monotonic time into wall clock time Kim Alvefur <zash@zash.se> parents: 10985 diff changeset	939 end;
10983 0862325842ec net.server_epoll: Signal API-compatibilty with util.timer Kim Alvefur <zash@zash.se> parents: 10982 diff changeset	940 };
9835 20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	941 listen = listen;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	942 loop = loop;
7794 424bbbeb9257 server_epoll: Add closeall() method for closing all clients and servers Kim Alvefur <zash@zash.se> parents: 7737 diff changeset	943 closeall = closeall;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	944 setquitting = setquitting;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	945 wrapclient = wrapclient;
10861 e12690a37795 net.server_epoll: Add way to start accepting clients on an arbitrary server socket Kim Alvefur <zash@zash.se> parents: 10854 diff changeset	946 wrapserver = wrapserver;
8781 53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	947 watchfd = watchfd;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	948 link = link;
7657 252823632401 net.server_epoll: Support for setting configuration parameters Kim Alvefur <zash@zash.se> parents: 7637 diff changeset	949 set_config = function (newconfig)
252823632401 net.server_epoll: Support for setting configuration parameters Kim Alvefur <zash@zash.se> parents: 7637 diff changeset	950 cfg = setmetatable(newconfig, default_config);
252823632401 net.server_epoll: Support for setting configuration parameters Kim Alvefur <zash@zash.se> parents: 7637 diff changeset	951 end;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	952
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	953 -- libevent emulation
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	954 event = { EV_READ = "r", EV_WRITE = "w", EV_READWRITE = "rw", EV_LEAVE = -1 };
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	955 addevent = function (fd, mode, callback)
10088 97da8452c6a6 net.server_epoll: Deprecate libevent emulation layer Kim Alvefur <zash@zash.se> parents: 10082 diff changeset	956 log("warn", "Using deprecated libevent emulation, please update code to use watchfd API instead");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	957 local function onevent(self)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	958 local ret = self:callback();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	959 if ret == -1 then
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	960 self:set(false, false);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	961 elseif ret then
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	962 self:set(mode == "r" or mode == "rw", mode == "w" or mode == "rw");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	963 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	964 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	965
7817 4e3654031693 net.server_epoll: Reuse interface metatable for event compat layer Kim Alvefur <zash@zash.se> parents: 7811 diff changeset	966 local conn = setmetatable({
4e3654031693 net.server_epoll: Reuse interface metatable for event compat layer Kim Alvefur <zash@zash.se> parents: 7811 diff changeset	967 getfd = function () return fd; end;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	968 callback = callback;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	969 onreadable = onevent;
8542 8c39ec8e6018 net.server_epoll: Spelling writeable -> writable Kim Alvefur <zash@zash.se> parents: 8541 diff changeset	970 onwritable = onevent;
7817 4e3654031693 net.server_epoll: Reuse interface metatable for event compat layer Kim Alvefur <zash@zash.se> parents: 7811 diff changeset	971 close = function (self)
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	972 self:del();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	973 fds[fd] = nil;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	974 end;
7817 4e3654031693 net.server_epoll: Reuse interface metatable for event compat layer Kim Alvefur <zash@zash.se> parents: 7811 diff changeset	975 }, interface_mt);
10420 49a828819696 net.server_epoll: Save log tag in a field on FD watchers too Kim Alvefur <zash@zash.se> parents: 10419 diff changeset	976 conn.id = conn:getfd();
49a828819696 net.server_epoll: Save log tag in a field on FD watchers too Kim Alvefur <zash@zash.se> parents: 10419 diff changeset	977 conn.log = logger.init(("fdwatch%d"):format(conn.id));
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	978 local ok, err = conn:add(mode == "r" or mode == "rw", mode == "w" or mode == "rw");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	979 if not ok then return ok, err; end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	980 return conn;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	981 end;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	982 };

prosody

97077089f3c2

net/server_epoll.lua

Software / code / prosody

Annotate

net/server_epoll.lua @ 11267:97077089f3c2

Software `/` code `/` prosody