Remove un-needed strlen and pointer in duration()

[user/henk/code/inspircd.git] / src / userprocess.cpp

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 0c72a53b5e305b9a06d22f4e244c50bb67810398..67cd3cca900a3deb2d8c3c1db189e4ecbdc77ab4 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -70,6 +70,7 @@ extern std::vector<InspSocket*> module_sockets;
 extern time_t TIME;
 extern time_t OLDTIME;
 extern std::vector<userrec*> local_users;
+extern InspSocket* socket_ref[MAX_DESCRIPTORS];
 char LOG_FILE[MAXBUF];
 
 extern InspIRCd* ServerInstance;
@@ -101,7 +102,7 @@ void ProcessUser(userrec* cu)
                }
                catch (ModuleException& modexcept)
                {
-                       log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+                       log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
                }
 
                if (MOD_RESULT < 0)
@@ -135,6 +136,8 @@ void ProcessUser(userrec* cu)
 
                /*
                 * XXX - potential replacement for the below using my beloved pointers. --w00t
+                * XXX - no garauntee there's not \0's in the middle of the data,
+                *       and no reason for it to be terminated either. -- Om
                 *
                 * for (char *c = data; data && *data; data++)
                 * {
@@ -316,12 +319,13 @@ void DoSocketTimeouts(time_t TIME)
        for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
        {
                InspSocket* s = (InspSocket*)*a;
-               if (s->Timeout(TIME))
+               if ((s) && (s->GetFd() >= 0) && (s->GetFd() < MAX_DESCRIPTORS) && (socket_ref[s->GetFd()] != NULL) && (s->Timeout(TIME)))
                {
-                       log(DEBUG,"Socket poll returned false, close and bail");
+                       log(DEBUG,"userprocess.cpp: Socket poll returned false, close and bail");
+                       socket_ref[s->GetFd()] = NULL;
                        SE->DelFd(s->GetFd());
-                       s->Close();
                        module_sockets.erase(a);
+                       s->Close();
                        delete s;
                        break;
                }
@@ -473,6 +477,7 @@ void CheckDie()
 void LoadAllModules(InspIRCd* ServerInstance)
 {
        char configToken[MAXBUF];
+       Config->module_names.clear();
 
        MODCOUNT = -1;
 
@@ -491,5 +496,3 @@ void LoadAllModules(InspIRCd* ServerInstance)
 
        log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1);
 }
-
-