Software `/` code `/` prosody

Comparison

net/server_event.lua @ 11120:b2331f3dfeea

Merge 0.11->trunk

author	Matthew Wild <mwild1@gmail.com>
date	Wed, 30 Sep 2020 09:50:33 +0100
parent	11068:988ddd57e851
child	11741:dcf38ac6a38c

comparison

equal deleted inserted replaced

-:68df52bf08d5
+:b2331f3dfeea
 		self:_close()
 		debug( "fatal error while ssl wrapping:", err )
 		return false
 	end
-	if self.conn.sni and self.servername then
+	if self.conn.sni then
-		self.conn:sni(self.servername);
+		if self.servername then
+			self.conn:sni(self.servername);
+		elseif self._server and type(self._server.hosts) == "table" and next(self._server.hosts) ~= nil then
+			self.conn:sni(self._server.hosts, true);
+		end
 	end
 	self.conn:settimeout( 0 )  -- set non blocking
 	local handshakecallback = coroutine_wrap(function( event )
 		local _, err
 	return nointerface, noreading, nowriting
 end
 --TODO: Deprecate
 function interface_mt:lock_read(switch)
+	log("warn", ":lock_read is deprecated, use :pasue() and :resume()");
 	if switch then
 		return self:pause();
 	else
 		return self:resume();
 	end
 		self.eventread = addevent( base, self.conn, EV_READ, self.readcallback, cfg.READ_TIMEOUT );  -- register callback
 		return true;
 	end
 end
+function interface_mt:pause_writes()
+	return self:_lock(self.nointerface, self.noreading, true);
+end
+function interface_mt:resume_writes()
+	self:_lock(self.nointerface, self.noreading, false);
+	if self.writecallback and not self.eventwrite then
+		self.eventwrite = addevent( base, self.conn, EV_WRITE, self.writecallback, cfg.WRITE_TIMEOUT );  -- register callback
+		return true;
+	end
+end
 function interface_mt:counter(c)
 	if c then
 		self._connections = self._connections + c
 	end
 	return self._connections
 end
 -- Public methods
 function interface_mt:write(data)
-	if self.nowriting then return nil, "locked" end
+	if self.nointerface then return nil, "locked"; end
 	--vdebug( "try to send data to client, id/data:", self.id, data )
 	data = tostring( data )
 	local len = #data
 	local total = len + self.writebufferlen
 	if total > cfg.MAX_SEND_LENGTH then  -- check buffer length
 		debug( "error:", err )  -- to much, check your app
 		return nil, err
 	end
 	t_insert(self.writebuffer, data) -- new buffer
 	self.writebufferlen = total
-	if not self.eventwrite then  -- register new write event
+	if not self.eventwrite and not self.nowriting  then  -- register new write event
 		--vdebug( "register new write event" )
 		self.eventwrite = addevent( base, self.conn, EV_WRITE, self.writecallback, cfg.WRITE_TIMEOUT )
 	end
 	return true
 end
 function interface_mt:ondisconnect()
 end
 function interface_mt:ontimeout()
 end
 function interface_mt:onreadtimeout()
-	self.fatalerror = "timeout during receiving"
-	debug( "connection failed:", self.fatalerror )
-	self:_close()
-	self.eventread = nil
 end
 function interface_mt:ondrain()
 end
 function interface_mt:ondetach()
 end
 	setmetatable(interface, interface_mt)
 	interfacelist[ interface ] = true  -- add to interfacelist
 	return interface
 end
-local function handleserver( server, addr, port, pattern, listener, sslctx )  -- creates an server interface
+local function handleserver( server, addr, port, pattern, listener, sslctx, startssl )  -- creates a server interface
 	debug "creating server interface..."
 	local interface = {
 		_connections = 0;
 		type = "server";
 		fatalerror = false; -- error message
 		nointerface = true;  -- lock/unlock parameter
 		_ip = addr, _port = port, _pattern = pattern,
 		_sslctx = sslctx;
+		hosts = {};
 	}
 	interface.id = tostring(interface):match("%x+$");
 	interface.readcallback = function( event )  -- server handler, called on incoming connections
 		--vdebug( "server can accept, id/addr/port:", interface, addr, port )
 		if interface.fatalerror then
 			else
 				return EV_READ  -- accept again
 			end
 		end
 		--vdebug("max connection check ok, accepting...")
+		-- luacheck: ignore 231/err
 		local client, err = server:accept()    -- try to accept; TODO: check err
 		while client do
 			if interface._connections >= cfg.MAX_CONNECTIONS then
 				client:close( )  -- refuse connection
 				debug( "maximal connections reached, refuse client connection; accept delay:", delay )
 			end
 			local client_ip, client_port = client:getpeername( )
 			interface._connections = interface._connections + 1  -- increase connection count
 			local clientinterface = handleclient( client, client_ip, client_port, interface, pattern, listener, sslctx )
 			--vdebug( "client id:", clientinterface, "startssl:", startssl )
-			if has_luasec and sslctx then
+			if has_luasec and startssl then
 				clientinterface:starttls(sslctx, true)
 			else
 				clientinterface:_start_session( true )
 			end
 			debug( "accepted incoming client connection from:", client_ip or "<unknown IP>", client_port or "<unknown port>", "to", port or "<unknown port>");
 	interfacelist[ interface ] = true
 	interface:_start_session()
 	return interface
 end
-local function addserver( addr, port, listener, pattern, sslctx, startssl )  -- TODO: check arguments
+local function listen(addr, port, listener, config)
-	--vdebug( "creating new tcp server with following parameters:", addr or "nil", port or "nil", sslctx or "nil", startssl or "nil")
+	config = config or {}
-	if sslctx and not has_luasec then
+	if config.sslctx and not has_luasec then
 		debug "fatal error: luasec not found"
 		return nil, "luasec not found"
 	end
 	local server, err = socket.bind( addr, port, cfg.ACCEPT_QUEUE )  -- create server socket
 	if not server then
 		debug( "creating server socket on "..addr.." port "..port.." failed:", err )
 		return nil, err
 	end
-	local interface = handleserver( server, addr, port, pattern, listener, sslctx, startssl )  -- new server handler
+	local interface = handleserver( server, addr, port, config.read_size, listener, config.tls_ctx, config.tls_direct)  -- new server handler
 	debug( "new server created with id:", tostring(interface))
 	return interface
+end
+local function addserver( addr, port, listener, pattern, sslctx )  -- TODO: check arguments
+	--vdebug( "creating new tcp server with following parameters:", addr or "nil", port or "nil", sslctx or "nil", startssl or "nil")
+	return listen( addr, port, listener, {
+		read_size = pattern,
+		tls_ctx = sslctx,
+		tls_direct = not not sslctx,
+	});
 end
 local function wrapclient( client, ip, port, listeners, pattern, sslctx, extra )
 	local interface = handleclient( client, ip, port, nil, pattern, listeners, sslctx, extra )
 	interface:_start_connection(sslctx)
 		return nil, err
 	end
 	client:settimeout( 0 )  -- set nonblocking
 	local res, err = client:setpeername( addr, serverport )  -- connect
 	if res or ( err == "timeout" ) then
+		-- luacheck: ignore 211/port
 		local ip, port = client:getsockname( )
 		local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx, extra )
 		debug( "new connection id:", interface.id )
 		return interface, err
 	else
 	link = link,
 	event = levent,
 	event_base = base,
 	addevent = newevent,
 	addserver = addserver,
+	listen = listen,
 	addclient = addclient,
 	wrapclient = wrapclient,
 	setquitting = setquitting,
 	closeall = closeallservers,
 	get_backend = get_backend,

prosody

b2331f3dfeea

net/server_event.lua

Software / code / prosody

Comparison

net/server_event.lua @ 11120:b2331f3dfeea

Software `/` code `/` prosody