diff -r f107f0205793 -r fcdcdf00787c net/xmppserver_listener.lua
--- a/net/xmppserver_listener.lua	Sun Nov 22 04:42:47 2009 +0000
+++ b/net/xmppserver_listener.lua	Sun Nov 22 04:43:46 2009 +0000
@@ -104,14 +104,14 @@
 			session.conn.close(true); -- Force FIXME: timer?
 		end
 		session.conn.close();
-		xmppserver.disconnect(session.conn, "stream error");
+		xmppserver.ondisconnect(session.conn, "stream error");
 	end
 end
 
 
 -- End of session methods --
 
-function xmppserver.listener(conn, data)
+function xmppserver.onincoming(conn, data)
 	local session = sessions[conn];
 	if not session then
 		session = s2s_new_incoming(conn);
@@ -148,7 +148,7 @@
 	end
 end
 
-function xmppserver.disconnect(conn, err)
+function xmppserver.ondisconnect(conn, err)
 	local session = sessions[conn];
 	if session then
 		if err and err ~= "closed" and session.srv_hosts then