Extra error detection, thwap me if this comes up with false positives

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index bf124164a63862e80c66edf3a6603660f82bd7a9..9b7d6fa1786d1b131dc6492ea8b396c619149e9c 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -167,16 +167,20 @@ InspIRCd::InspIRCd(int argc, char** argv)
        if (argc > 1) {
                for (int i = 1; i < argc; i++)
                {
-                       if (!strcmp(argv[i],"-nofork")) {
+                       if (!strcmp(argv[i],"-nofork"))
+                       {
                                Config->nofork = true;
                        }
-                       if (!strcmp(argv[i],"-wait")) {
+                       if (!strcmp(argv[i],"-wait"))
+                       {
                                sleep(6);
                        }
-                       if (!strcmp(argv[i],"-nolimit")) {
-                               Config->unlimitcore = true;
+                       if (!strcmp(argv[i],"-nolimit"))
+                       {
+                               printf("WARNING: The `-nolimit' option is deprecated, and now on by default. This behaviour may change in the future.\n");
                        }
-                       if (!strcmp(argv[i],"-logfile")) {
+                       if (!strcmp(argv[i],"-logfile"))
+                       {
                                if (argc > i+1)
                                {
                                        strlcpy(LOG_FILE,argv[i+1],MAXBUF);
@@ -679,6 +683,8 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
          * listening ports or module sockets though, things could get
          * ugly.
          */
+       log(DEBUG,"There are %d fd's to process.",numberactive);
+
         for (unsigned int activefd = 0; activefd < numberactive; activefd++)
         {
                 int socket_type = SE->GetType(activefds[activefd]);
@@ -686,6 +692,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                 {
                         case X_ESTAB_CLIENT:
 
+                               log(DEBUG,"Type: X_ESTAB_CLIENT: fd=%d",activefds[activefd]);
                                 cu = fd_ref_table[activefds[activefd]];
                                 if (cu)
                                         ProcessUser(cu);  
@@ -694,6 +701,8 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
         
                         case X_ESTAB_MODULE:
 
+                               log(DEBUG,"Type: X_ESTAB_MODULE: fd=%d",activefds[activefd]);
+
                                if (!process_module_sockets)
                                        break;
 
@@ -720,6 +729,11 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                                         s->Close();
                                         delete s;
                                 }
+                               else if (!s)
+                               {
+                                       log(DEBUG,"WTF, X_ESTAB_MODULE for nonexistent InspSocket, removed!");
+                                       SE->DelFd(s->GetFd());
+                               }
                         break;
 
                         case X_ESTAB_DNS:
@@ -731,12 +745,15 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                                  * and independent of the mainloop.
                                  */
 #ifndef THREADED_DNS
+                               log(DEBUG,"Type: X_ESTAB_DNS: fd=%d",activefds[activefd]);
                                 dns_poll(activefds[activefd]);
 #endif
                         break;
 
                        case X_LISTEN:
 
+                               log(DEBUG,"Type: X_LISTEN_MODULE: fd=%d",activefds[activefd]);
+
                                 /* It's a listener */
                                 uslen = sizeof(sock_us);
                                 length = sizeof(client);
@@ -781,6 +798,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                                  * what we would do, so for now, its going
                                  * to safely do bugger all.
                                  */
+                               log(DEBUG,"Type: X_WHAT_THE_FUCK_BBQ: fd=%d",activefds[activefd]);
                                SE->DelFd(activefds[activefd]);
                         break;
                 }
@@ -794,6 +812,9 @@ int InspIRCd::Run()
        
         LoadAllModules(this);
 
+       /* Just in case no modules were loaded - fix for bug #101 */
+       this->BuildISupport();
+
         printf("\nInspIRCd is now running!\n");
        
        if (!Config->nofork)