X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=fae96721df0f4f09f72d5398935b85ff0dcc9a4c;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=29560871f83b0ce06084ae8453272e155092daed;hpb=653638c68684ec035fd58bc2d0d91c9bf9aa2ab9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 29560871f..fae96721d 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -88,8 +88,16 @@ void ProcessUser(userrec* cu)
 	if (Config->GetIOHook(cu->port))
 	{
 	        int result2 = 0;
-		int MOD_RESULT = Config->GetIOHook(cu->port)->OnRawSocketRead(cu->fd,data,65535,result2);
-                log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
+		int MOD_RESULT = 0;
+		try
+		{
+			MOD_RESULT = Config->GetIOHook(cu->port)->OnRawSocketRead(cu->fd,data,65535,result2);
+	                log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
+		}
+                catch (ModuleException& modexcept)
+                {
+                        log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+                }
 		if (MOD_RESULT < 0)
 		{
 			result = -EAGAIN;
@@ -259,20 +267,10 @@ void ProcessUser(userrec* cu)
         }
 }
 
-/**
- * This function is called once a second from the mainloop.
- * It is intended to do background checking on all the user structs, e.g.
- * stuff like ping checks, registration timeouts, etc.
- * The function returns false when it is finished, and true if
- * it needs to be run again (e.g. it has processed one of a batch of
- * QUIT messages, but couldnt continue iterating because the iterator
- * became invalid). This function is also responsible for checking
- * if InspSocket derived classes are timed out.
- */
-bool DoBackgroundUserStuff(time_t TIME)
+void DoSocketTimeouts(time_t TIME)
 {
         unsigned int numsockets = module_sockets.size();
-	SocketEngine* SE = ServerInstance->SE;
+        SocketEngine* SE = ServerInstance->SE;
         for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
         {
                 InspSocket* s = (InspSocket*)*a;
@@ -287,6 +285,16 @@ bool DoBackgroundUserStuff(time_t TIME)
                 }
                 if (module_sockets.size() != numsockets) break;
         }
+}
+
+/**
+ * This function is called once a second from the mainloop.
+ * It is intended to do background checking on all the user structs, e.g.
+ * stuff like ping checks, registration timeouts, etc. This function is
+ * also responsible for checking if InspSocket derived classes are timed out.
+ */
+void DoBackgroundUserStuff(time_t TIME)
+{
         CullList* GlobalGoners = new CullList();
         for (std::vector<userrec*>::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++)
         {
@@ -295,7 +303,7 @@ bool DoBackgroundUserStuff(time_t TIME)
                 if (*count2)
                         curr = (userrec*)(*count2);
                 if ((long)curr == -1)
-                        return false;
+                        return;
 
                 if (curr)
                 {
@@ -323,7 +331,6 @@ bool DoBackgroundUserStuff(time_t TIME)
                                 continue;
                         }
 			// It's time to PING this user. Send them a ping.
-			// XXX: We were checking isnick() here -- why when we check curr->registered? - Brain
                         if ((TIME > curr->nping) && (curr->registered == 7))
                         {
 				// This user didn't answer the last ping, remove them
@@ -336,7 +343,7 @@ bool DoBackgroundUserStuff(time_t TIME)
 				curr->lastping = 0;
 				curr->nping = TIME+curr->pingmax;
 			}
-			// XXX: We can flush the write buffer as the last thing we do, because if they
+			// We can flush the write buffer as the last thing we do, because if they
 			// match any of the above conditions its no use flushing their buffer anyway.
 			curr->FlushWriteBuf();
 			if (curr->GetWriteError() != "")
@@ -352,14 +359,7 @@ bool DoBackgroundUserStuff(time_t TIME)
 	/** Free to memory used
 	 */
 	delete GlobalGoners;
-	/** XXX: The old system prior to 1.0RC2 would call this function
-	 * repeatedly until everything was ship-shape, however now we are
-	 * using CullList to avoid bailing from the loop, so this is no
-	 * longer required. We always return false here so this only executes
-	 * once. At some future date the while loop may be removed from
-	 * the mainloop which calls this function.
-	 */
-        return false;
+        return;
 }
 
 void OpenLog(char** argv, int argc)