From c4cb1f9477b1fbf8662bedb1c36f84ff6f87e1f3 Mon Sep 17 00:00:00 2001 From: danieldg Date: Wed, 2 Sep 2009 00:48:23 +0000 Subject: Change OnHookUserIO to OnHookIO, making it usable for more than User* and less picky on string matching git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11628 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/modules.h | 8 ++++++-- include/usermanager.h | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/modules.h b/include/modules.h index 3f36f23da..f4a9b0fb6 100644 --- a/include/modules.h +++ b/include/modules.h @@ -461,7 +461,7 @@ enum Implementation I_OnChangeLocalUserGECOS, I_OnUserRegister, I_OnChannelPreDelete, I_OnChannelDelete, I_OnPostOper, I_OnSyncNetwork, I_OnSetAway, I_OnUserList, I_OnPostCommand, I_OnPostJoin, I_OnWhoisLine, I_OnBuildExemptList, I_OnRawSocketConnect, I_OnGarbageCollect, I_OnBufferFlushed, - I_OnText, I_OnPassCompare, I_OnRunTestSuite, I_OnNamesListItem, I_OnNumeric, I_OnHookUserIO, + I_OnText, I_OnPassCompare, I_OnRunTestSuite, I_OnNamesListItem, I_OnNumeric, I_OnHookIO, I_OnHostCycle, I_OnPreRehash, I_OnModuleRehash, I_END }; @@ -1313,7 +1313,11 @@ class CoreExport Module : public Extensible */ virtual int OnDelBan(User* source, Channel* channel,const std::string &banmask); - virtual void OnHookUserIO(User* user); + /** Called to install an I/O hook on an event handler + * @param user The item to possibly install the I/O hook on + * @param via The port that connected on + */ + virtual void OnHookIO(EventHandler* user, ListenSocketBase* via); /** Called immediately after any connection is accepted. This is intended for raw socket * processing (e.g. modules which wrap the tcp connection within another library) and provides diff --git a/include/usermanager.h b/include/usermanager.h index 56a545353..72b10b224 100644 --- a/include/usermanager.h +++ b/include/usermanager.h @@ -75,12 +75,12 @@ class CoreExport UserManager : public Extensible * initialize it as not yet registered, and add it to the socket engine. * @param Instance a pointer to the server instance * @param socket The socket id (file descriptor) this user is on - * @param iscached This variable is reserved for future use + * @param via The socket that this user connected using * @param client The IP address and client port of the user * @param server The server IP address and port used by the user * @return This function has no return value, but a call to AddClient may remove the user. */ - void AddUser(InspIRCd* Instance, int socket, bool iscached, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server); + void AddUser(InspIRCd* Instance, int socket, ClientListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server); /** Disconnect a user gracefully * @param user The user to remove -- cgit v1.2.3