prosody-hg: net/server_event.lua comparison

comparison net/server_event.lua @ 5625:e67891ad18d6

net.server_event: Add support for listener.onreadtimeout(conn), which can return true to prevent the connection from being closed when a read timeout occurs

author	Matthew Wild <mwild1@gmail.com>
date	Fri, 24 May 2013 14:46:16 +0100
parents	483f795f6f99
children	61521ce49aae

comparison

equal deleted inserted replaced

-:187f734bc996
+:e67891ad18d6
 		end
 		return false, "setoption not implemented";
 	end
 	function interface_mt:setlistener(listener)
-		self.onconnect, self.ondisconnect, self.onincoming, self.ontimeout, self.onstatus
+		self.onconnect, self.ondisconnect, self.onincoming, self.ontimeout, self.onreadtimeout, self.onstatus
-			= listener.onconnect, listener.ondisconnect, listener.onincoming, listener.ontimeout, listener.onstatus;
+			= listener.onconnect, listener.ondisconnect, listener.onincoming,
-	end
+			  listener.ontimeout, listener.onreadtimeout, listener.onstatus;
+	end
 	-- Stub handlers
 	function interface_mt:onconnect()
 	end
 	function interface_mt:onincoming()
 	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:onstatus()
 	end
 			receive = client.receive;
 			onconnect = listener.onconnect;  -- will be called when client disconnects
 			ondisconnect = listener.ondisconnect;  -- will be called when client disconnects
 			onincoming = listener.onincoming;  -- will be called when client sends data
 			ontimeout = listener.ontimeout; -- called when fatal socket timeout occurs
+			onreadtimeout = listener.onreadtimeout; -- called when socket inactivity timeout occurs
 			onstatus = listener.onstatus; -- called for status changes (e.g. of SSL/TLS)
 			eventread = false, eventwrite = false, eventclose = false,
 			eventhandshake = false, eventstarthandshake = false;  -- event handler
 			eventconnect = false, eventsession = false;  -- more event handler...
 			eventwritetimeout = false;  -- even more event handler...
 			if interface.noreading or interface.fatalerror then  -- leave this event
 				--vdebug( "leaving this event because:", tostring(interface.noreading or interface.fatalerror) )
 				interface.eventread = nil
 				return -1
 			end
-			if EV_TIMEOUT == event then  -- took too long to get some data from client -> disconnect
+			if EV_TIMEOUT == event and interface:onreadtimeout() ~= true then
-				interface.fatalerror = "timeout during receiving"
+				return -1 -- took too long to get some data from client -> disconnect
-				debug( "connection failed:", interface.fatalerror )
+			end
+			if interface._usingssl then  -- handle luasec
+				if interface.eventwritetimeout then  -- ok, in the past writecallback was regged
+					local ret = interface.writecallback( )  -- call it
+					--vdebug( "tried to write in readcallback, result:", tostring(ret) )
+				end
+				if interface.eventreadtimeout then
+					interface.eventreadtimeout:close( )
+					interface.eventreadtimeout = nil
+				end
+			end
+			local buffer, err, part = interface.conn:receive( interface._pattern )  -- receive buffer with "pattern"
+			--vdebug( "read data:", tostring(buffer), "error:", tostring(err), "part:", tostring(part) )
+			buffer = buffer or part
+			if buffer and #buffer > cfg.MAX_READ_LENGTH then  -- check buffer length
+				interface.fatalerror = "receive buffer exceeded"
+				debug( "fatal error:", interface.fatalerror )
 				interface:_close()
 				interface.eventread = nil
 				return -1
-			else -- can read
+			end
-				if interface._usingssl then  -- handle luasec
+			if err and ( err ~= "timeout" and err ~= "wantread" ) then
-					if interface.eventwritetimeout then  -- ok, in the past writecallback was regged
+				if "wantwrite" == err then -- need to read on write event
-						local ret = interface.writecallback( )  -- call it
+					if not interface.eventwrite then  -- register new write event if needed
-						--vdebug( "tried to write in readcallback, result:", tostring(ret) )
+						interface.eventwrite = addevent( base, interface.conn, EV_WRITE, interface.writecallback, cfg.WRITE_TIMEOUT )
 					end
-					if interface.eventreadtimeout then
+					interface.eventreadtimeout = addevent( base, nil, EV_TIMEOUT,
-						interface.eventreadtimeout:close( )
+						function( )
-						interface.eventreadtimeout = nil
+							interface:_close()
-					end
+						end, cfg.READ_TIMEOUT
-				end
+					)
-				local buffer, err, part = interface.conn:receive( interface._pattern )  -- receive buffer with "pattern"
+					debug( "wantwrite during read attempt, reg it in writecallback but dont know what really happens next..." )
-				--vdebug( "read data:", tostring(buffer), "error:", tostring(err), "part:", tostring(part) )
+					-- to be honest i dont know what happens next, if it is allowed to first read, the write etc...
-				buffer = buffer or part
+				else  -- connection was closed or fatal error
-				if buffer and #buffer > cfg.MAX_READ_LENGTH then  -- check buffer length
+					interface.fatalerror = err
-					interface.fatalerror = "receive buffer exceeded"
+					debug( "connection failed in read event:", interface.fatalerror )
-					debug( "fatal error:", interface.fatalerror )
 					interface:_close()
 					interface.eventread = nil
 					return -1
 				end
-				if err and ( err ~= "timeout" and err ~= "wantread" ) then
+			else
-					if "wantwrite" == err then -- need to read on write event
+				interface.onincoming( interface, buffer, err )  -- send new data to listener
-						if not interface.eventwrite then  -- register new write event if needed
+			end
-							interface.eventwrite = addevent( base, interface.conn, EV_WRITE, interface.writecallback, cfg.WRITE_TIMEOUT )
+			if interface.noreading then
-						end
+				interface.eventread = nil;
-						interface.eventreadtimeout = addevent( base, nil, EV_TIMEOUT,
+				return -1;
-							function( )
+			end
-								interface:_close()
+			return EV_READ, cfg.READ_TIMEOUT
-							end, cfg.READ_TIMEOUT
-						)
-						debug( "wantwrite during read attempt, reg it in writecallback but dont know what really happens next..." )
-						-- to be honest i dont know what happens next, if it is allowed to first read, the write etc...
-					else  -- connection was closed or fatal error
-						interface.fatalerror = err
-						debug( "connection failed in read event:", interface.fatalerror )
-						interface:_close()
-						interface.eventread = nil
-						return -1
-					end
-				else
-					interface.onincoming( interface, buffer, err )  -- send new data to listener
-				end
-				if interface.noreading then
-					interface.eventread = nil;
-					return -1;
-				end
-				return EV_READ, cfg.READ_TIMEOUT
-			end
 		end
 		client:settimeout( 0 )  -- set non blocking
 		setmetatable(interface, interface_mt)
 		interfacelist( "add", interface )  -- add to interfacelist

Mercurial > prosody-hg

comparison net/server_event.lua @ 5625:e67891ad18d6