Added CASEMAPPING and CHARSET to ISUPPORT (005)

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 6f1889bbf1d419314514ca49cad6f9db8c5c10ad..dbae71a9b1335e9d391d757415bcb9aba918b0eb 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -76,7 +76,7 @@ int openSockfd[MAXSOCKS];
 sockaddr_in client,server;
 socklen_t length;
 
-extern InspSocket* socket_ref[65535];
+extern InspSocket* socket_ref[MAX_DESCRIPTORS];
 
 time_t TIME = time(NULL), OLDTIME = time(NULL);
 
@@ -276,6 +276,17 @@ void InspIRCd::erase_module(int j)
 
 }
 
+void InspIRCd::BuildISupport()
+{
+        // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
+       std::stringstream v;
+       v << "WALLCHOPS MODES=13 CHANTYPES=# PREFIX=(ohv)@%+ MAP SAFELIST MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 NICKLEN=" << NICKMAX;
+       v << " CASEMAPPING=rfc1459 STATUSMSG=@+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=20 AWAYLEN=";
+       v << MAXAWAY << " CHANMODES=ohvb,k,l,psmnti NETWORK=" << Config->Network;
+       Config->data005 = v.str();
+       FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005));
+}
+
 bool InspIRCd::UnloadModule(const char* filename)
 {
        std::string filename_str = filename;
@@ -314,6 +325,7 @@ bool InspIRCd::UnloadModule(const char* filename)
                         Parser->RemoveCommands(filename);
                        log(DEFAULT,"Module %s unloaded",filename);
                        MODCOUNT--;
+                       BuildISupport();
                        return true;
                }
        }
@@ -326,7 +338,7 @@ bool InspIRCd::LoadModule(const char* filename)
 {
        char modfile[MAXBUF];
 #ifdef STATIC_LINK
-       snprintf(modfile,MAXBUF,"%s",filename);
+       strlcpy(modfile,filename,MAXBUF);
 #else
        snprintf(modfile,MAXBUF,"%s/%s",Config->ModPath,filename);
 #endif
@@ -402,13 +414,14 @@ bool InspIRCd::LoadModule(const char* filename)
 #endif
        MODCOUNT++;
        FOREACH_MOD(I_OnLoadModule,OnLoadModule(modules[MODCOUNT],filename_str));
+       BuildISupport();
        return true;
 }
 
 int InspIRCd::Run()
 {
        bool expire_run = false;
-       int activefds[65535];
+       int activefds[MAX_DESCRIPTORS];
        int incomingSockfd;
        int in_port;
        userrec* cu = NULL;
@@ -466,7 +479,7 @@ int InspIRCd::Run()
                }
                
                /* Once a second, do the background processing */
-               if ((TIME != OLDTIME) && ((TIME % 2) == 0))
+               if (TIME != OLDTIME)
                        DoBackgroundUserStuff(TIME);
 
                /* Call the socket engine to wait on the active
@@ -474,13 +487,9 @@ int InspIRCd::Run()
                 * descriptors in its list... dns, modules, users,
                 * servers... so its nice and easy, just one call.
                 */
-               numberactive = SE->Wait(activefds);
-
-               if (!numberactive)
+               if (!(numberactive = SE->Wait(activefds)))
                        continue;
 
-               log(DEBUG,"%d active fds this time around",numberactive);
-
                /**
                 * Now process each of the fd's. For users, we have a fast
                 * lookup table which can find a user by file descriptor, so