From e2af2347fc035d702e45f12e772223a8d578410d Mon Sep 17 00:00:00 2001
From: danieldg
Date: Mon, 21 Sep 2009 13:26:31 +0000
Subject: Create StreamSocket for IO hooking implementation

Fixes the SSL SendQ bug
Removes duplicate code between User and BufferedSocket
Simplify SSL module API
Simplify EventHandler API (Readable/Writeable moved to SE)
Add hook for culled objects to invoke callbacks prior to destructor
 Replace SocketCull with GlobalCull now that sockets can close themselves
Shorten common case of user read/parse/write path:
 User::Write is now zero-copy up to syscall/SSL invocation
 User::Read has only two copy/scan passes from read() to ProcessCommand

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11752 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/modules.cpp')

diff --git a/src/modules.cpp b/src/modules.cpp
index 51fecb47c..c11b63bec 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -159,11 +159,11 @@ void		Module::OnGlobalOper(User*) { }
 void		Module::OnPostConnect(User*) { }
 ModResult	Module::OnAddBan(User*, Channel*, const std::string &) { return MOD_RES_PASSTHRU; }
 ModResult	Module::OnDelBan(User*, Channel*, const std::string &) { return MOD_RES_PASSTHRU; }
-void		Module::OnRawSocketAccept(int, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { }
-int		Module::OnRawSocketWrite(int, const char*, int) { return 0; }
-void		Module::OnRawSocketClose(int) { }
-void		Module::OnRawSocketConnect(int) { }
-int		Module::OnRawSocketRead(int, char*, unsigned int, int&) { return 0; }
+void		Module::OnStreamSocketAccept(StreamSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { }
+int		Module::OnStreamSocketWrite(StreamSocket*, std::string&) { return -1; }
+void		Module::OnStreamSocketClose(StreamSocket*) { }
+void		Module::OnStreamSocketConnect(StreamSocket*) { }
+int		Module::OnStreamSocketRead(StreamSocket*, std::string&) { return -1; }
 void		Module::OnUserMessage(User*, void*, int, const std::string&, char, const CUList&) { }
 void		Module::OnUserNotice(User*, void*, int, const std::string&, char, const CUList&) { }
 void 		Module::OnRemoteKill(User*, User*, const std::string&, const std::string&) { }
@@ -196,7 +196,7 @@ void 		Module::OnText(User*, void*, int, const std::string&, char, CUList&) { }
 void		Module::OnRunTestSuite() { }
 void		Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { }
 ModResult	Module::OnNumeric(User*, unsigned int, const std::string&) { return MOD_RES_PASSTHRU; }
-void		Module::OnHookIO(EventHandler*, ListenSocketBase*) { }
+void		Module::OnHookIO(StreamSocket*, ListenSocketBase*) { }
 ModResult	Module::OnHostCycle(User*) { return MOD_RES_PASSTHRU; }
 void		Module::OnSendWhoLine(User*, User*, Channel*, std::string&) { }
 
-- 
cgit v1.3.1-10-gc9f91