Software `/` code `/` prosody

Annotate

net/server_epoll.lua @ 10224:94e341dee51c

core.certmanager: Move EECDH ciphers before EDH in default cipherstring The original intent of having kEDH before kEECDH was that if a `dhparam` file was specified, this would be interpreted as a preference by the admin for old and well-tested Diffie-Hellman key agreement over newer elliptic curve ones. Otherwise the faster elliptic curve ciphersuites would be preferred. This didn't really work as intended since this affects the ClientHello on outgoing s2s connections, leading to some servers using poorly configured kEDH. With Debian shipping OpenSSL settings that enforce a higher security level, this caused interoperability problems with servers that use DH params smaller than 2048 bits. E.g. jabber.org at the time of this writing has 1024 bit DH params. MattJ says > Curves have won, and OpenSSL is less weird about them now

author	Kim Alvefur <zash@zash.se>
date	Sun, 25 Aug 2019 20:22:35 +0200
parent	10098:dda1c7ccb209
child	10228:e77bf4222fae

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;
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	16 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	17 local log = logger.init("server_epoll");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	18 local socket = require "socket";
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	19 local luasec = require "ssl";
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	20 local gettime = require "util.time".now;
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	21 local indexedbheap = require "util.indexedbheap";
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	22 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	23 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	24 local inet_pton = inet.pton;
7737 f93b3083b46b net.server_epoll: Use _SOCKETINVALID from LuaSocket Kim Alvefur <zash@zash.se> parents: 7707 diff changeset	25 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	26 local new_id = require "util.id".medium;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	27
9506 ae6636052be9 net.server_epoll: Graceful handling of registering already added socket Kim Alvefur <zash@zash.se> parents: 9499 diff changeset	28 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	29 local EEXIST = poller.EEXIST;
9507 33d21f020b66 net.server_epoll: Ignore ENOENT when deregitering socket Kim Alvefur <zash@zash.se> parents: 9506 diff changeset	30 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	31
ae6636052be9 net.server_epoll: Graceful handling of registering already added socket Kim Alvefur <zash@zash.se> parents: 9499 diff changeset	32 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	33
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	34 local _ENV = nil;
8555 4f0f5b49bb03 vairious: Add annotation when an empty environment is set [luacheck] Kim Alvefur <zash@zash.se> parents: 8552 diff changeset	35 -- luacheck: std none
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	36
7657 252823632401 net.server_epoll: Support for setting configuration parameters Kim Alvefur <zash@zash.se> parents: 7637 diff changeset	37 local default_config = { __index = {
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	38 -- 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	39 read_timeout = 14 * 60;
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	40
4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	41 -- 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	42 send_timeout = 180;
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	43
9824 729de68f0068 net.server_epoll: Separate timeout for initial connection attempts Kim Alvefur <zash@zash.se> parents: 9823 diff changeset	44 -- 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	45 connect_timeout = 20;
9665 4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	46
4790d1b88919 server_epoll: Add comments describing config options Kim Alvefur <zash@zash.se> parents: 9664 diff changeset	47 -- 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	48 tcp_backlog = 128;
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 -- 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	51 accept_retry_interval = 10;
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 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	54 read_retry_delay = 1e-06;
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 -- 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	57 read_size = 8192;
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 -- 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	60 ssl_handshake_timeout = 60;
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 -- 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	63 max_wait = 86400;
7658 e14a124c4d73 net.server_epoll: Make minimum poll wait time configurable Kim Alvefur <zash@zash.se> parents: 7657 diff changeset	64 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	65
72adf1f39404 net.server_epoll: Add experimental option to close connections in case of listener error Kim Alvefur <zash@zash.se> parents: 10080 diff changeset	66 -- 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	67 -- 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	68 fatal_errors = false;
7657 252823632401 net.server_epoll: Support for setting configuration parameters Kim Alvefur <zash@zash.se> parents: 7637 diff changeset	69 }};
252823632401 net.server_epoll: Support for setting configuration parameters Kim Alvefur <zash@zash.se> parents: 7637 diff changeset	70 local cfg = default_config.__index;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	71
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	72 local fds = createtable(10, 0); -- FD -> conn
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	73
cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	74 -- Timer and scheduling --
cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	75
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	76 local timers = indexedbheap.create();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	77
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	78 local function noop() end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	79 local function closetimer(t)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	80 t[1] = 0;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	81 t[2] = noop;
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	82 timers:remove(t.id);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	83 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	84
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	85 local function reschedule(t, time)
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	86 t[1] = time;
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	87 timers:reprioritize(t.id, time);
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	88 end
7573 0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	89
0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	90 -- Add absolute timer
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	91 local function at(time, f)
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	92 local timer = { time, f, close = closetimer, reschedule = reschedule, id = nil };
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	93 timer.id = timers:insert(timer, time);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	94 return timer;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	95 end
7573 0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	96
0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	97 -- Add relative timer
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	98 local function addtimer(timeout, f)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	99 return at(gettime() + timeout, f);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	100 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	101
7573 0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	102 -- Run callbacks of expired timers
0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	103 -- 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	104 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	105 -- Any timers at all?
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	106 local now = gettime();
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	107 local peek = timers:peek();
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	108 while peek do
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	109
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	110 if peek > now then
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	111 next_delay = peek - now;
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	112 break;
9855 6c2370f17027 net.server_epoll: Optimize timer handling Kim Alvefur <zash@zash.se> parents: 9853 diff changeset	113 end
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	114
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	115 local _, timer, id = timers:pop();
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	116 local ok, ret = pcall(timer[2], now);
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	117 if ok and type(ret) == "number" then
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	118 local next_time = now+ret;
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	119 timer[1] = next_time;
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	120 timers:insert(timer, next_time);
9855 6c2370f17027 net.server_epoll: Optimize timer handling Kim Alvefur <zash@zash.se> parents: 9853 diff changeset	121 end
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	122
c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	123 peek = timers:peek();
9855 6c2370f17027 net.server_epoll: Optimize timer handling Kim Alvefur <zash@zash.se> parents: 9853 diff changeset	124 end
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	125 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	126 return next_delay;
0fcde9869cc1 net.server_epoll: Return early in the event of zero timers Kim Alvefur <zash@zash.se> parents: 7628 diff changeset	127 end
0fcde9869cc1 net.server_epoll: Return early in the event of zero timers Kim Alvefur <zash@zash.se> parents: 7628 diff changeset	128
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	129 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	130 return min_wait;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	131 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	132 return next_delay;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	133 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	134
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	135 -- Socket handler interface
cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	136
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	137 local interface = {};
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	138 local interface_mt = { __index = interface };
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	139
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	140 function interface_mt:__tostring()
7585 b64218c816de net.server_epoll: Improve string representation of connections Kim Alvefur <zash@zash.se> parents: 7584 diff changeset	141 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	142 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	143 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	144 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	145 end
9321 146dc1e4c7ff net.server_epoll: Simplify minimal string representation Kim Alvefur <zash@zash.se> parents: 9320 diff changeset	146 return ("FD %d"):format(self:getfd());
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	147 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	148
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	149 interface.log = log;
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	150 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	151 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	152 end
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	153
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	154 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	155 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	156 end
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	157
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	158 -- 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	159 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	160 self:on("detach");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	161 self.listeners = listeners;
9387 33e52f727f0f net.connect: Fix passing request table to new listener Kim Alvefur <zash@zash.se> parents: 9385 diff changeset	162 self:on("attach", data);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	163 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	164
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	165 -- 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	166 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	167 if not self.listeners then
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	168 self:debug("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	169 return;
be374a5778f3 net.server_epoll: Log if there's a connection without listeners Kim Alvefur <zash@zash.se> parents: 7910 diff changeset	170 end
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	171 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	172 if not listener then
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	173 -- self:debug("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	174 return;
0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	175 end
0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	176 local ok, err = pcall(listener, self, ...);
0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	177 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	178 if cfg.fatal_errors then
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	179 self:debug("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	180 self:destroy();
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	181 else
90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	182 self:debug("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	183 end
10080 39ca4202ae1e net.server_epoll: Return listener error message Kim Alvefur <zash@zash.se> parents: 10061 diff changeset	184 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	185 end
0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	186 return err;
0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	187 end
0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	188
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	189 -- Return the file descriptor number
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	190 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	191 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	192 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	193 end
7737 f93b3083b46b net.server_epoll: Use _SOCKETINVALID from LuaSocket Kim Alvefur <zash@zash.se> parents: 7707 diff changeset	194 return _SOCKETINVALID;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	195 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	196
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	197 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	198 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	199 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	200
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	201 -- Get IP address
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	202 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	203 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	204 end
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	205
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	206 -- 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	207 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	208 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	209 end
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	210
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	211 -- 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	212 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	213 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	214 end
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	215
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	216 -- 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	217 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	218 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	219 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	220 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	221 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	222 end
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	223 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	224
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	225 -- Return underlying socket
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	226 function interface:socket()
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	227 return self.conn;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	228 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	229
7910 91db637be237 net.server_epoll: Add method for changing read pattern Kim Alvefur <zash@zash.se> parents: 7817 diff changeset	230 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	231 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	232 end
91db637be237 net.server_epoll: Add method for changing read pattern Kim Alvefur <zash@zash.se> parents: 7817 diff changeset	233
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	234 function interface:setoption(k, v)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	235 -- LuaSec doesn't expose setoption :(
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	236 if self.conn.setoption then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	237 self.conn:setoption(k, v);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	238 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	239 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	240
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	241 -- Timeout for detecting dead or idle sockets
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	242 function interface:setreadtimeout(t)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	243 if t == false then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	244 if self._readtimeout then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	245 self._readtimeout:close();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	246 self._readtimeout = nil;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	247 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	248 return
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	249 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	250 t = t or cfg.read_timeout;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	251 if self._readtimeout then
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	252 self._readtimeout:reschedule(gettime() + t);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	253 else
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	254 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	255 if self:on("readtimeout") then
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	256 return cfg.read_timeout;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	257 else
7583 0498daffa6f0 net.server_epoll: Call callbacks through common method in protected mode Kim Alvefur <zash@zash.se> parents: 7574 diff changeset	258 self:on("disconnect", "read timeout");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	259 self:destroy();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	260 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	261 end);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	262 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	263 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	264
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	265 -- Timeout for detecting dead sockets
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	266 function interface:setwritetimeout(t)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	267 if t == false then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	268 if self._writetimeout then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	269 self._writetimeout:close();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	270 self._writetimeout = nil;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	271 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	272 return
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	273 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	274 t = t or cfg.send_timeout;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	275 if self._writetimeout then
10059 c8c3f2eba898 net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) Kim Alvefur <zash@zash.se> parents: 9994 diff changeset	276 self._writetimeout:reschedule(gettime() + t);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	277 else
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	278 self._writetimeout = 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	279 self:on("disconnect", "write timeout");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	280 self:destroy();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	281 end);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	282 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	283 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	284
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	285 function interface:add(r, w)
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	286 local fd = self:getfd();
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	287 if fd < 0 then
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	288 return nil, "invalid fd";
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	289 end
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	290 if r == nil then r = self._wantread; end
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	291 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	292 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	293 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	294 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	295 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	296 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	297 end
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	298 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	299 return ok, err;
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	300 end
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	301 self._wantread, self._wantwrite = r, w;
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	302 fds[fd] = self;
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	303 self:debug("Registered in poller");
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	304 return true;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	305 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	306
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	307 function interface:set(r, w)
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	308 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	309 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	310 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	311 end
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	312 if r == nil then r = self._wantread; end
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	313 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	314 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	315 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	316 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	317 return ok, err;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	318 end
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	319 self._wantread, self._wantwrite = r, w;
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	320 return true;
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	321 end
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	322
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	323 function interface:del()
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	324 local fd = self:getfd();
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	325 if fd < 0 then
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	326 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	327 end
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	328 if fds[fd] ~= self then
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	329 return nil, "unregistered fd";
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	330 end
9384 5c8006ce8cb8 net.server_epoll: Include errno in log messages Kim Alvefur <zash@zash.se> parents: 9383 diff changeset	331 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	332 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	333 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	334 return ok, err;
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	335 end
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	336 self._wantread, self._wantwrite = nil, nil;
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	337 fds[fd] = nil;
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	338 self:debug("Unregistered from poller");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	339 return true;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	340 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	341
9320 8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	342 function interface:setflags(r, w)
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	343 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	344 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	345 return true; -- no change
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	346 end
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	347 return self:add(r, w);
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	348 end
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	349 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	350 return self:del();
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	351 end
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	352 return self:set(r, w);
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	353 end
8cc498cb0df7 net.server_epoll: Add back setflags API for compat Kim Alvefur <zash@zash.se> parents: 9319 diff changeset	354
7573 0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	355 -- Called when socket is readable
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	356 function interface:onreadable()
9311 9b0604fe01f1 net.server_epoll: Make read_size a server-wide option Kim Alvefur <zash@zash.se> parents: 9310 diff changeset	357 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	358 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	359 self:onconnect();
7687 ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	360 self:on("incoming", data);
ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	361 else
9931 485231f8b75d net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) Kim Alvefur <zash@zash.se> parents: 9822 diff changeset	362 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	363 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	364 err = "timeout";
485231f8b75d net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) Kim Alvefur <zash@zash.se> parents: 9822 diff changeset	365 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	366 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	367 err = "timeout";
485231f8b75d net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) Kim Alvefur <zash@zash.se> parents: 9822 diff changeset	368 end
8540 ba9fd886b34d net.server_epoll: Call onconnect listener on first successful read or write Kim Alvefur <zash@zash.se> parents: 8507 diff changeset	369 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	370 self:onconnect();
7687 ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	371 self:on("incoming", partial, err);
ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	372 end
9931 485231f8b75d net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) Kim Alvefur <zash@zash.se> parents: 9822 diff changeset	373 if err ~= "timeout" then
7687 ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	374 self:on("disconnect", err);
ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	375 self:destroy()
ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	376 return;
ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	377 end
ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	378 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	379 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	380 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	381 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	382 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	383 self:setreadtimeout(false);
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	384 self:pausefor(cost);
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	385 return;
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	386 end
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	387 end
9932 df73ca804719 net.server_epoll: Skip delayed continuation read on paused connections Kim Alvefur <zash@zash.se> parents: 9931 diff changeset	388 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	389 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	390 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	391 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	392 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	393 end
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	394 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	395
7573 0f0a6febbc5a net.server_epoll: Add some comments Kim Alvefur <zash@zash.se> parents: 7564 diff changeset	396 -- Called when socket is writable
8542 8c39ec8e6018 net.server_epoll: Spelling writeable -> writable Kim Alvefur <zash@zash.se> parents: 8541 diff changeset	397 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	398 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	399 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	400 local buffer = self.writebuffer;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	401 local data = t_concat(buffer);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	402 local ok, err, partial = self.conn:send(data);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	403 if ok then
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	404 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	405 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	406 buffer[i] = nil;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	407 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	408 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	409 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	410 return;
8540 ba9fd886b34d net.server_epoll: Call onconnect listener on first successful read or write Kim Alvefur <zash@zash.se> parents: 8507 diff changeset	411 elseif partial then
7591 138f16eb39fb net.server_epoll: Improve syntax Kim Alvefur <zash@zash.se> parents: 7590 diff changeset	412 buffer[1] = data:sub(partial+1);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	413 for i = #buffer, 2, -1 do
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	414 buffer[i] = nil;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	415 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	416 self:setwritetimeout();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	417 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	418 if err == "wantwrite" or err == "timeout" then
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	419 self:set(nil, true);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	420 elseif err == "wantread" then
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	421 self:set(true, nil);
7687 ae24deae6488 net.server_epoll: Separate ok from err branch more Kim Alvefur <zash@zash.se> parents: 7658 diff changeset	422 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	423 self:on("disconnect", err);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	424 self:destroy();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	425 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	426 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	427
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	428 -- The write buffer has been successfully emptied
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	429 function interface:ondrain()
8008 62ed3795be13 net.server_epoll: Attempt to simplify state control Kim Alvefur <zash@zash.se> parents: 8007 diff changeset	430 return self:on("drain");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	431 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	432
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	433 -- 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	434 function interface:write(data)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	435 local buffer = self.writebuffer;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	436 if buffer then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	437 t_insert(buffer, data);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	438 else
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	439 self.writebuffer = { data };
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	440 end
9581 1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	441 if not self._write_lock then
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	442 self:setwritetimeout();
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	443 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	444 end
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	445 return #data;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	446 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	447 interface.send = interface.write;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	448
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	449 -- Close, possibly after writing is done
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	450 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	451 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	452 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	453 self.write, self.send = noop, noop; -- No more writing
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	454 self:debug("Close after writing");
8008 62ed3795be13 net.server_epoll: Attempt to simplify state control Kim Alvefur <zash@zash.se> parents: 8007 diff changeset	455 self.ondrain = interface.close;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	456 else
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	457 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	458 self.write, self.send = noop, noop;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	459 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	460 self:on("disconnect");
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	461 self:destroy();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	462 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	463 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	464
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	465 function interface:destroy()
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	466 self:del();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	467 self:setwritetimeout(false);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	468 self:setreadtimeout(false);
7594 5e884501a9ac net.server_epoll: Prevent anything from happening to destroyed sockets Kim Alvefur <zash@zash.se> parents: 7593 diff changeset	469 self.onreadable = noop;
8542 8c39ec8e6018 net.server_epoll: Spelling writeable -> writable Kim Alvefur <zash@zash.se> parents: 8541 diff changeset	470 self.onwritable = noop;
7594 5e884501a9ac net.server_epoll: Prevent anything from happening to destroyed sockets Kim Alvefur <zash@zash.se> parents: 7593 diff changeset	471 self.destroy = noop;
5e884501a9ac net.server_epoll: Prevent anything from happening to destroyed sockets Kim Alvefur <zash@zash.se> parents: 7593 diff changeset	472 self.close = noop;
5e884501a9ac net.server_epoll: Prevent anything from happening to destroyed sockets Kim Alvefur <zash@zash.se> parents: 7593 diff changeset	473 self.on = noop;
5e884501a9ac net.server_epoll: Prevent anything from happening to destroyed sockets Kim Alvefur <zash@zash.se> parents: 7593 diff changeset	474 self.conn:close();
5e884501a9ac net.server_epoll: Prevent anything from happening to destroyed sockets Kim Alvefur <zash@zash.se> parents: 7593 diff changeset	475 self.conn = nil;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	476 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	477
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	478 function interface:ssl()
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	479 return self._tls;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	480 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	481
9300 1df8832bd29e net.server_epoll: Rename all variables holding TLS contexts for consistency Kim Alvefur <zash@zash.se> parents: 8983 diff changeset	482 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	483 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	484 self.starttls = false;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	485 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	486 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	487 self.ondrain = interface.starttls;
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	488 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	489 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	490 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	491 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	492 end
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	493 self.onwritable = interface.tlshandskake;
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	494 self.onreadable = interface.tlshandskake;
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	495 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	496 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	497 end
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	498 end
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	499
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	500 function interface:tlshandskake()
412ff404bf58 net.server_epoll: Delay wrapping sockets in TLS until just before first handshake Kim Alvefur <zash@zash.se> parents: 9387 diff changeset	501 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	502 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	503 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	504 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	505 self:debug("Starting TLS now");
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	506 self:del();
9431 c3c0523a37c6 net.server_epoll: Catch errors from luasec.wrap Kim Alvefur <zash@zash.se> parents: 9430 diff changeset	507 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	508 if not ok then
c3c0523a37c6 net.server_epoll: Catch errors from luasec.wrap Kim Alvefur <zash@zash.se> parents: 9430 diff changeset	509 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	510 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	511 end
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	512 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	513 self:on("disconnect", err);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	514 self:destroy();
7595 166b2e0766a4 net.server_epoll: Return status from starttls method Kim Alvefur <zash@zash.se> parents: 7594 diff changeset	515 return conn, err;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	516 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	517 conn:settimeout(0);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	518 self.conn = conn;
9847 adc0672b700e net.server_epoll: Add support for SNI (#409) Kim Alvefur <zash@zash.se> parents: 9835 diff changeset	519 if conn.sni then
adc0672b700e net.server_epoll: Add support for SNI (#409) Kim Alvefur <zash@zash.se> parents: 9835 diff changeset	520 if self.servername then
adc0672b700e net.server_epoll: Add support for SNI (#409) Kim Alvefur <zash@zash.se> parents: 9835 diff changeset	521 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	522 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	523 conn:sni(self._server.hosts, true);
adc0672b700e net.server_epoll: Add support for SNI (#409) Kim Alvefur <zash@zash.se> parents: 9835 diff changeset	524 end
adc0672b700e net.server_epoll: Add support for SNI (#409) Kim Alvefur <zash@zash.se> parents: 9835 diff changeset	525 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	526 self:on("starttls");
8008 62ed3795be13 net.server_epoll: Attempt to simplify state control Kim Alvefur <zash@zash.se> parents: 8007 diff changeset	527 self.ondrain = nil;
8542 8c39ec8e6018 net.server_epoll: Spelling writeable -> writable Kim Alvefur <zash@zash.se> parents: 8541 diff changeset	528 self.onwritable = interface.tlshandskake;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	529 self.onreadable = interface.tlshandskake;
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	530 return self:init();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	531 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	532 local ok, err = self.conn:dohandshake();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	533 if ok then
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	534 self:debug("TLS handshake complete");
8542 8c39ec8e6018 net.server_epoll: Spelling writeable -> writable Kim Alvefur <zash@zash.se> parents: 8541 diff changeset	535 self.onwritable = nil;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	536 self.onreadable = nil;
8008 62ed3795be13 net.server_epoll: Attempt to simplify state control Kim Alvefur <zash@zash.se> parents: 8007 diff changeset	537 self:on("status", "ssl-handshake-complete");
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	538 self:setwritetimeout();
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	539 self:set(true, true);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	540 elseif err == "wantread" then
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	541 self:debug("TLS handshake to wait until readable");
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	542 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	543 self:setreadtimeout(cfg.ssl_handshake_timeout);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	544 elseif err == "wantwrite" then
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	545 self:debug("TLS handshake to wait until writable");
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	546 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	547 self:setwritetimeout(cfg.ssl_handshake_timeout);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	548 else
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	549 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	550 self:on("disconnect", err);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	551 self:destroy();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	552 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	553 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	554
9310 2d2d4c293efa net.server_epoll: Rename pattern to read_size Kim Alvefur <zash@zash.se> parents: 9309 diff changeset	555 local function wrapsocket(client, server, read_size, listeners, tls_ctx) -- luasocket object -> interface object
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	556 client:settimeout(0);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	557 local conn = setmetatable({
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	558 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	559 _server = server;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	560 created = gettime();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	561 listeners = listeners;
9310 2d2d4c293efa net.server_epoll: Rename pattern to read_size Kim Alvefur <zash@zash.se> parents: 9309 diff changeset	562 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	563 writebuffer = {};
9432 2e3f66475cc8 net.server_epoll: Inherit Direct TLS flag from servers to their clients Kim Alvefur <zash@zash.se> parents: 9431 diff changeset	564 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	565 tls_direct = server and server.tls_direct;
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	566 log = logger.init(("conn%s"):format(new_id()));
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	567 }, interface_mt);
7591 138f16eb39fb net.server_epoll: Improve syntax Kim Alvefur <zash@zash.se> parents: 7590 diff changeset	568
9383 3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	569 conn:updatenames();
3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	570 return conn;
3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	571 end
3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	572
3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	573 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	574 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	575 local ok, peername, peerport = pcall(conn.getpeername, conn);
9382 31a2be28729c net.server_epoll: Protect from errors in get{peer,sock}name Kim Alvefur <zash@zash.se> parents: 9381 diff changeset	576 if ok then
9383 3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	577 self.peername, self.peerport = peername, peerport;
7584 98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	578 end
9383 3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	579 local ok, sockname, sockport = pcall(conn.getsockname, conn);
9382 31a2be28729c net.server_epoll: Protect from errors in get{peer,sock}name Kim Alvefur <zash@zash.se> parents: 9381 diff changeset	580 if ok then
9383 3260902a5b22 net.server_epoll: Factor out IP/port detection into its own method Kim Alvefur <zash@zash.se> parents: 9382 diff changeset	581 self.sockname, self.sockport = sockname, sockport;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	582 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	583 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	584
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	585 -- A server interface has new incoming connections waiting
cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	586 -- This replaces the onreadable callback
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	587 function interface:onacceptable()
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	588 local conn, err = self.conn:accept();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	589 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	590 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	591 self:pausefor(cfg.accept_retry_interval);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	592 return;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	593 end
9309 33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	594 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	595 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	596 client:init();
9309 33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	597 if self.tls_direct then
33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	598 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	599 else
5ec4eaf76de8 net.server_epoll: Call onconnect right after accept()ing a new client Kim Alvefur <zash@zash.se> parents: 9666 diff changeset	600 client:onconnect();
9309 33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	601 end
7597 cd34aa6b1632 net.server_epoll: Refactor to use common initialization Kim Alvefur <zash@zash.se> parents: 7596 diff changeset	602 end
cd34aa6b1632 net.server_epoll: Refactor to use common initialization Kim Alvefur <zash@zash.se> parents: 7596 diff changeset	603
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	604 -- Initialization
7597 cd34aa6b1632 net.server_epoll: Refactor to use common initialization Kim Alvefur <zash@zash.se> parents: 7596 diff changeset	605 function interface:init()
9824 729de68f0068 net.server_epoll: Separate timeout for initial connection attempts Kim Alvefur <zash@zash.se> parents: 9823 diff changeset	606 self:setwritetimeout(cfg.connect_timeout);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	607 return self:add(true, true);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	608 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	609
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	610 function interface:pause()
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	611 return self:set(false);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	612 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	613
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	614 function interface:resume()
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	615 return self:set(true);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	616 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	617
7624 23fb3a084956 net.server_epoll: Comments Kim Alvefur <zash@zash.se> parents: 7623 diff changeset	618 -- Pause connection for some time
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	619 function interface:pausefor(t)
10098 dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	620 self:debug("Pause for %fs", t);
7559 b1b27dedf4cf net.server_epoll: Replace any previous pausefor timer Kim Alvefur <zash@zash.se> parents: 7558 diff changeset	621 if self._pausefor then
b1b27dedf4cf net.server_epoll: Replace any previous pausefor timer Kim Alvefur <zash@zash.se> parents: 7558 diff changeset	622 self._pausefor:close();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	623 end
7559 b1b27dedf4cf net.server_epoll: Replace any previous pausefor timer Kim Alvefur <zash@zash.se> parents: 7558 diff changeset	624 if t == false then return; end
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	625 self:set(false);
7559 b1b27dedf4cf net.server_epoll: Replace any previous pausefor timer Kim Alvefur <zash@zash.se> parents: 7558 diff changeset	626 self._pausefor = addtimer(t, function ()
b1b27dedf4cf net.server_epoll: Replace any previous pausefor timer Kim Alvefur <zash@zash.se> parents: 7558 diff changeset	627 self._pausefor = nil;
9994 524b8cd76780 net.server_epoll: Restore wantread flag after pause (fixes #1354) Kim Alvefur <zash@zash.se> parents: 9932 diff changeset	628 self:set(true);
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	629 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	630 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	631 end
7559 b1b27dedf4cf net.server_epoll: Replace any previous pausefor timer Kim Alvefur <zash@zash.se> parents: 7558 diff changeset	632 end);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	633 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	634
10098 dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	635 function interface:setlimit(Bps)
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	636 if Bps > 0 then
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	637 self._limit = 1/Bps;
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	638 else
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	639 self._limit = nil;
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	640 end
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	641 end
dda1c7ccb209 server_epoll: Add native support for per socket bandwith limits Kim Alvefur <zash@zash.se> parents: 10091 diff changeset	642
9581 1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	643 function interface:pause_writes()
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	644 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	645 self:setwritetimeout(false);
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	646 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	647 end
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	648
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	649 function interface:resume_writes()
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	650 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	651 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	652 self:setwritetimeout();
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	653 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	654 end
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	655 end
1be99aedb0b3 net.server: Add an API for holding writes of outgoing data Kim Alvefur <zash@zash.se> parents: 9573 diff changeset	656
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	657 -- Connected!
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	658 function interface:onconnect()
9594 dcf466e04f81 net.server_epoll: Use method to update peername on connect Kim Alvefur <zash@zash.se> parents: 9587 diff changeset	659 self:updatenames();
8540 ba9fd886b34d net.server_epoll: Call onconnect listener on first successful read or write Kim Alvefur <zash@zash.se> parents: 8507 diff changeset	660 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	661 self:on("connect");
8506 174fd716c9fa server_epoll: Rework how socket readyness is detected Kim Alvefur <zash@zash.se> parents: 8271 diff changeset	662 end
174fd716c9fa server_epoll: Rework how socket readyness is detected Kim Alvefur <zash@zash.se> parents: 8271 diff changeset	663
9835 20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	664 local function listen(addr, port, listeners, config)
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	665 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	666 if not conn then return conn, err; end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	667 conn:settimeout(0);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	668 local server = setmetatable({
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	669 conn = conn;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	670 created = gettime();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	671 listeners = listeners;
9835 20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	672 read_size = config and config.read_size;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	673 onreadable = interface.onacceptable;
9835 20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	674 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	675 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	676 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	677 sockname = addr;
98ee3ed105cf net.server_epoll: Collect and expose local and remote address and ports Kim Alvefur <zash@zash.se> parents: 7583 diff changeset	678 sockport = port;
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	679 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	680 }, interface_mt);
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	681 server:debug("Server %s created", server);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	682 server:add(true, false);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	683 return server;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	684 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	685
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	686 -- COMPAT
9835 20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	687 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	688 return listen(addr, port, listeners, {
20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	689 read_size = read_size;
20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	690 tls_ctx = tls_ctx;
20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	691 tls_direct = tls_ctx and true or false;
20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	692 });
20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	693 end
20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	694
20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	695 -- COMPAT
9310 2d2d4c293efa net.server_epoll: Rename pattern to read_size Kim Alvefur <zash@zash.se> parents: 9309 diff changeset	696 local function wrapclient(conn, addr, port, listeners, read_size, tls_ctx)
2d2d4c293efa net.server_epoll: Rename pattern to read_size Kim Alvefur <zash@zash.se> parents: 9309 diff changeset	697 local client = wrapsocket(conn, nil, read_size, listeners, tls_ctx);
7597 cd34aa6b1632 net.server_epoll: Refactor to use common initialization Kim Alvefur <zash@zash.se> parents: 7596 diff changeset	698 if not client.peername then
cd34aa6b1632 net.server_epoll: Refactor to use common initialization Kim Alvefur <zash@zash.se> parents: 7596 diff changeset	699 client.peername, client.peerport = addr, port;
cd34aa6b1632 net.server_epoll: Refactor to use common initialization Kim Alvefur <zash@zash.se> parents: 7596 diff changeset	700 end
9473 5fdda751333a net.server: Require IP address as argument to addclient (no DNS names) Kim Alvefur <zash@zash.se> parents: 9445 diff changeset	701 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	702 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	703 if tls_ctx then
33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	704 client:starttls(tls_ctx);
33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	705 end
7551 838212918f11 net.server_epoll: Rename arguments and varibles for consistensy Kim Alvefur <zash@zash.se> parents: 7550 diff changeset	706 return client;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	707 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	708
7800 dadf9ba290c5 server_epoll: Add some comments describing some functions Kim Alvefur <zash@zash.se> parents: 7799 diff changeset	709 -- New outgoing TCP connection
9497 183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	710 local function addclient(addr, port, listeners, read_size, tls_ctx, typ)
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	711 local create;
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	712 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	713 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	714 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	715 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	716 typ = "tcp6";
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	717 else
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	718 typ = "tcp4";
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	719 end
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	720 end
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	721 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	722 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	723 end
183ff7a8051b net.server_epoll: Add support for the conn_type argument to addclient Kim Alvefur <zash@zash.se> parents: 9477 diff changeset	724 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	725 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	726 end
5fdda751333a net.server: Require IP address as argument to addclient (no DNS names) Kim Alvefur <zash@zash.se> parents: 9445 diff changeset	727 local conn, err = create();
10082 1df53ef1f60d net.server_epoll: Return errors from creating sockets Kim Alvefur <zash@zash.se> parents: 10081 diff changeset	728 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	729 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	730 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	731 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	732 if not ok and err ~= "timeout" then return ok, err; end
9310 2d2d4c293efa net.server_epoll: Rename pattern to read_size Kim Alvefur <zash@zash.se> parents: 9309 diff changeset	733 local client = wrapsocket(conn, nil, read_size, listeners, tls_ctx)
9473 5fdda751333a net.server: Require IP address as argument to addclient (no DNS names) Kim Alvefur <zash@zash.se> parents: 9445 diff changeset	734 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	735 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	736 if tls_ctx then
33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	737 client:starttls(tls_ctx);
33d500c25d76 net.server_epoll: Refactor Direct TLS assumptions outwards Kim Alvefur <zash@zash.se> parents: 9306 diff changeset	738 end
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	739 client:debug("Client %s created", client);
7556 1f777b38b66c net.server_epoll: Make addclient conform to API (expected by net.http.request) Kim Alvefur <zash@zash.se> parents: 7555 diff changeset	740 return client, conn;
7553 4f3e4a092348 net.server_epoll: Make addclient use wrapclient Kim Alvefur <zash@zash.se> parents: 7552 diff changeset	741 end
4f3e4a092348 net.server_epoll: Make addclient use wrapclient Kim Alvefur <zash@zash.se> parents: 7552 diff changeset	742
9319 7c954c75b6ac net.server_epoll: Fix write signal handling in watchfd API Kim Alvefur <zash@zash.se> parents: 9314 diff changeset	743 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	744 local conn = setmetatable({
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	745 conn = fd;
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	746 onreadable = onreadable;
9319 7c954c75b6ac net.server_epoll: Fix write signal handling in watchfd API Kim Alvefur <zash@zash.se> parents: 9314 diff changeset	747 onwritable = onwritable;
8781 53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	748 close = function (self)
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	749 self:del();
8781 53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	750 end
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	751 }, interface_mt);
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	752 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	753 conn.getfd = function ()
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	754 return fd;
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	755 end;
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	756 -- 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	757 end
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	758 conn.log = logger.init(("fdwatch%s"):format(new_id()));
9319 7c954c75b6ac net.server_epoll: Fix write signal handling in watchfd API Kim Alvefur <zash@zash.se> parents: 9314 diff changeset	759 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	760 return conn;
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	761 end;
53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	762
7800 dadf9ba290c5 server_epoll: Add some comments describing some functions Kim Alvefur <zash@zash.se> parents: 7799 diff changeset	763 -- Dump all data from one connection into another
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	764 local function link(from, to)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	765 from.listeners = setmetatable({
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	766 onincoming = function (_, data)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	767 from:pause();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	768 to:write(data);
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	769 end,
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	770 }, {__index=from.listeners});
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	771 to.listeners = setmetatable({
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	772 ondrain = function ()
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	773 from:resume();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	774 end,
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	775 }, {__index=to.listeners});
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	776 from:set(true, nil);
c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	777 to:set(nil, true);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	778 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	779
9438 916bee81eb7e net.server_epoll: Make :set_send a noop, should fix net.adns Kim Alvefur <zash@zash.se> parents: 9432 diff changeset	780 -- COMPAT
916bee81eb7e net.server_epoll: Make :set_send a noop, should fix net.adns Kim Alvefur <zash@zash.se> parents: 9432 diff changeset	781 -- 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	782 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	783 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	784
7800 dadf9ba290c5 server_epoll: Add some comments describing some functions Kim Alvefur <zash@zash.se> parents: 7799 diff changeset	785 -- 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	786 local function closeall()
7799 93643a61858a server_epoll: Ignore unused loop variable [luacheck] Kim Alvefur <zash@zash.se> parents: 7797 diff changeset	787 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	788 conn:close();
424bbbeb9257 server_epoll: Add closeall() method for closing all clients and servers Kim Alvefur <zash@zash.se> parents: 7737 diff changeset	789 end
424bbbeb9257 server_epoll: Add closeall() method for closing all clients and servers Kim Alvefur <zash@zash.se> parents: 7737 diff changeset	790 end
424bbbeb9257 server_epoll: Add closeall() method for closing all clients and servers Kim Alvefur <zash@zash.se> parents: 7737 diff changeset	791
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	792 local quitting = nil;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	793
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	794 -- 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	795 local function setquitting(quit)
12609aee3b3b server_epoll: Handle the argument to setquitting like server_select Kim Alvefur <zash@zash.se> parents: 7795 diff changeset	796 if quit then
12609aee3b3b server_epoll: Handle the argument to setquitting like server_select Kim Alvefur <zash@zash.se> parents: 7795 diff changeset	797 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	798 closeall();
7796 12609aee3b3b server_epoll: Handle the argument to setquitting like server_select Kim Alvefur <zash@zash.se> parents: 7795 diff changeset	799 else
12609aee3b3b server_epoll: Handle the argument to setquitting like server_select Kim Alvefur <zash@zash.se> parents: 7795 diff changeset	800 quitting = nil;
12609aee3b3b server_epoll: Handle the argument to setquitting like server_select Kim Alvefur <zash@zash.se> parents: 7795 diff changeset	801 end
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
7637 cccea9136b2d net.server_epoll: More comments Kim Alvefur <zash@zash.se> parents: 7630 diff changeset	804 -- 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	805 local function loop(once)
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	806 repeat
7658 e14a124c4d73 net.server_epoll: Make minimum poll wait time configurable Kim Alvefur <zash@zash.se> parents: 7657 diff changeset	807 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	808 local fd, r, w = poll:wait(t);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	809 if fd then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	810 local conn = fds[fd];
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	811 if conn then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	812 if r then
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	813 conn:onreadable();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	814 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	815 if w then
8542 8c39ec8e6018 net.server_epoll: Spelling writeable -> writable Kim Alvefur <zash@zash.se> parents: 8541 diff changeset	816 conn:onwritable();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	817 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	818 else
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	819 log("debug", "Removing unknown fd %d", fd);
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	820 poll:del(fd);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	821 end
9508 2055b497b515 net.server_epoll: Special handling of signal interrupts Kim Alvefur <zash@zash.se> parents: 9507 diff changeset	822 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	823 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	824 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	825 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	826 return quitting;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	827 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	828
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	829 return {
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	830 get_backend = function () return "epoll"; end;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	831 addserver = addserver;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	832 addclient = addclient;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	833 add_task = addtimer;
9835 20bf5b47c1fb net.server: New API for creating server listeners Kim Alvefur <zash@zash.se> parents: 9825 diff changeset	834 listen = listen;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	835 at = at;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	836 loop = loop;
7794 424bbbeb9257 server_epoll: Add closeall() method for closing all clients and servers Kim Alvefur <zash@zash.se> parents: 7737 diff changeset	837 closeall = closeall;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	838 setquitting = setquitting;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	839 wrapclient = wrapclient;
8781 53178b6ba589 net.server: Add watchfd, a simple API for watching file descriptors Kim Alvefur <zash@zash.se> parents: 8778 diff changeset	840 watchfd = watchfd;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	841 link = link;
7657 252823632401 net.server_epoll: Support for setting configuration parameters Kim Alvefur <zash@zash.se> parents: 7637 diff changeset	842 set_config = function (newconfig)
252823632401 net.server_epoll: Support for setting configuration parameters Kim Alvefur <zash@zash.se> parents: 7637 diff changeset	843 cfg = setmetatable(newconfig, default_config);
252823632401 net.server_epoll: Support for setting configuration parameters Kim Alvefur <zash@zash.se> parents: 7637 diff changeset	844 end;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	845
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	846 -- libevent emulation
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	847 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	848 addevent = function (fd, mode, callback)
10088 97da8452c6a6 net.server_epoll: Deprecate libevent emulation layer Kim Alvefur <zash@zash.se> parents: 10082 diff changeset	849 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	850 local function onevent(self)
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	851 local ret = self:callback();
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	852 if ret == -1 then
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	853 self:set(false, false);
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	854 elseif ret then
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	855 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	856 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	857 end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	858
7817 4e3654031693 net.server_epoll: Reuse interface metatable for event compat layer Kim Alvefur <zash@zash.se> parents: 7811 diff changeset	859 local conn = setmetatable({
4e3654031693 net.server_epoll: Reuse interface metatable for event compat layer Kim Alvefur <zash@zash.se> parents: 7811 diff changeset	860 getfd = function () return fd; end;
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	861 callback = callback;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	862 onreadable = onevent;
8542 8c39ec8e6018 net.server_epoll: Spelling writeable -> writable Kim Alvefur <zash@zash.se> parents: 8541 diff changeset	863 onwritable = onevent;
7817 4e3654031693 net.server_epoll: Reuse interface metatable for event compat layer Kim Alvefur <zash@zash.se> parents: 7811 diff changeset	864 close = function (self)
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	865 self:del();
7547 b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	866 fds[fd] = nil;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	867 end;
7817 4e3654031693 net.server_epoll: Reuse interface metatable for event compat layer Kim Alvefur <zash@zash.se> parents: 7811 diff changeset	868 }, interface_mt);
10089 90e459f48cbd net.server_epoll: Overhaul logging with one log sink per connection Kim Alvefur <zash@zash.se> parents: 10088 diff changeset	869 conn.log = logger.init(("fdwatch%d"):format(conn:getfd()));
9314 c9eef7e8ee65 net.server_epoll: Use util.poll Kim Alvefur <zash@zash.se> parents: 9311 diff changeset	870 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	871 if not ok then return ok, err; end
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	872 return conn;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	873 end;
b327322ce2dd net.server_epoll: New experimental server backend Kim Alvefur <zash@zash.se> parents: diff changeset	874 };

prosody

94e341dee51c

net/server_epoll.lua

Software / code / prosody

Annotate

net/server_epoll.lua @ 10224:94e341dee51c

Software `/` code `/` prosody