# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1258865026 0
# Node ID fcdcdf00787ceb8a94a3e7bb92454ff7aa3e4dab
# Parent  f107f020579307662d8af39b586fcf71024563fe
*_listener: Update for new net.server API, specifically .listener -> .onincoming, .disconnect -> .ondisconnect

diff -r f107f0205793 -r fcdcdf00787c net/httpclient_listener.lua
--- a/net/httpclient_listener.lua	Sun Nov 22 04:42:47 2009 +0000
+++ b/net/httpclient_listener.lua	Sun Nov 22 04:43:46 2009 +0000
@@ -15,7 +15,7 @@
 
 local httpclient = { default_port = 80, default_mode = "*a" };
 
-function httpclient.listener(conn, data)
+function httpclient.onincoming(conn, data)
 	local request = requests[conn];
 
 	if not request then
@@ -28,7 +28,7 @@
 	end
 end
 
-function httpclient.disconnect(conn, err)
+function httpclient.ondisconnect(conn, err)
 	local request = requests[conn];
 	if request then
 		request:reader(nil);
diff -r f107f0205793 -r fcdcdf00787c net/httpserver_listener.lua
--- a/net/httpserver_listener.lua	Sun Nov 22 04:42:47 2009 +0000
+++ b/net/httpserver_listener.lua	Sun Nov 22 04:43:46 2009 +0000
@@ -16,7 +16,7 @@
 
 local httpserver = { default_port = 80, default_mode = "*a" };
 
-function httpserver.listener(conn, data)
+function httpserver.onincoming(conn, data)
 	local request = requests[conn];
 
 	if not request then
@@ -34,7 +34,7 @@
 	end
 end
 
-function httpserver.disconnect(conn, err)
+function httpserver.ondisconnect(conn, err)
 	local request = requests[conn];
 	if request and not request.destroyed then
 		request.conn = nil;
diff -r f107f0205793 -r fcdcdf00787c net/xmppclient_listener.lua
--- a/net/xmppclient_listener.lua	Sun Nov 22 04:42:47 2009 +0000
+++ b/net/xmppclient_listener.lua	Sun Nov 22 04:43:46 2009 +0000
@@ -101,7 +101,7 @@
 		end
 		session.send("</stream:stream>");
 		session.conn:close();
-		xmppclient.disconnect(session.conn, (reason and (reason.text or reason.condition)) or reason or "session closed");
+		xmppclient.ondisconnect(session.conn, (reason and (reason.text or reason.condition)) or reason or "session closed");
 	end
 end
 
@@ -133,7 +133,7 @@
 	end
 end
 	
-function xmppclient.disconnect(conn, err)
+function xmppclient.ondisconnect(conn, err)
 	local session = sessions[conn];
 	if session then
 		(session.log or log)("info", "Client disconnected: %s", err);
diff -r f107f0205793 -r fcdcdf00787c net/xmppcomponent_listener.lua
--- a/net/xmppcomponent_listener.lua	Sun Nov 22 04:42:47 2009 +0000
+++ b/net/xmppcomponent_listener.lua	Sun Nov 22 04:43:46 2009 +0000
@@ -118,12 +118,12 @@
 		end
 		session.send("</stream:stream>");
 		session.conn.close();
-		component_listener.disconnect(session.conn, "stream error");
+		component_listener.ondisconnect(session.conn, "stream error");
 	end
 end
 
 --- Component connlistener
-function component_listener.listener(conn, data)
+function component_listener.onincoming(conn, data)
 	local session = sessions[conn];
 	if not session then
 		local _send = conn.write;
@@ -157,7 +157,7 @@
 	end
 end
 	
-function component_listener.disconnect(conn, err)
+function component_listener.ondisconnect(conn, err)
 	local session = sessions[conn];
 	if session then
 		(session.log or log)("info", "component disconnected: %s (%s)", tostring(session.host), tostring(err));
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