Fixed Windows build on VS 2010

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index fe0ac0a1170842e1c4c9fd4f6195942b52170d4d..2ac844bb6abfa625705b493c6ff4bb4d02b2fb2a 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -171,37 +171,41 @@ void InspIRCd::ResetMaxBans()
                i->second->ResetMaxBans();
 }
 
-/** Because hash_map doesnt free its buckets when we delete items (this is a 'feature')
- * we must occasionally rehash the hash (yes really).
+/** Because hash_map doesn't free its buckets when we delete items, we occasionally
+ * recreate the hash to free them up.
  * We do this by copying the entries from the old hash to a new hash, causing all
- * empty buckets to be weeded out of the hash. We dont do this on a timer, as its
- * very expensive, so instead we do it when the user types /REHASH and expects a
- * short delay anyway.
+ * empty buckets to be weeded out of the hash.
+ * Since this is quite expensive, it's not done very often.
  */
 void InspIRCd::RehashUsersAndChans()
 {
-       user_hash* old_users = this->Users->clientlist;
-       user_hash* old_uuid  = this->Users->uuidlist;
-       chan_hash* old_chans = this->chanlist;
+       user_hash* old_users = Users->clientlist;
+       user_hash* old_uuid  = Users->uuidlist;
+       chan_hash* old_chans = chanlist;
 
-       this->Users->clientlist = new user_hash();
-       this->Users->uuidlist = new user_hash();
-       this->chanlist = new chan_hash();
+       Users->clientlist = new user_hash();
+       Users->uuidlist = new user_hash();
+       chanlist = new chan_hash();
 
        for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++)
-               this->Users->clientlist->insert(*n);
-
-       delete old_users;
+               Users->clientlist->insert(*n);
 
        for (user_hash::const_iterator n = old_uuid->begin(); n != old_uuid->end(); n++)
-               this->Users->uuidlist->insert(*n);
-
-       delete old_uuid;
+               Users->uuidlist->insert(*n);
 
        for (chan_hash::const_iterator n = old_chans->begin(); n != old_chans->end(); n++)
-               this->chanlist->insert(*n);
+               chanlist->insert(*n);
 
+       delete old_users;
+       delete old_uuid;
        delete old_chans;
+
+       // Reset the already_sent IDs so we don't wrap it around and drop a message
+       LocalUser::already_sent_id = 0;
+       for (std::vector<LocalUser*>::const_iterator i = Users->local_users.begin(); i != Users->local_users.end(); i++)
+       {
+               (**i).already_sent = 0;
+       }
 }
 
 void InspIRCd::SetSignals()
@@ -295,12 +299,14 @@ InspIRCd::InspIRCd(int argc, char** argv) :
          */
         NICKForced("NICKForced", NULL),
         OperQuit("OperQuit", NULL),
+        GenRandom(&HandleGenRandom),
         IsChannel(&HandleIsChannel),
         IsSID(&HandleIsSID),
         Rehash(&HandleRehash),
         IsNick(&HandleIsNick),
         IsIdent(&HandleIsIdent),
-        FloodQuitUser(&HandleFloodQuitUser)
+        FloodQuitUser(&HandleFloodQuitUser),
+        OnCheckExemption(&HandleOnCheckExemption)
 {
 #ifdef WIN32
        // Strict, frequent checking of memory on debug builds
@@ -338,8 +344,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        this->Res = 0;
        this->ConfigThread = NULL;
 
-       // Initialise TIME
-       clock_gettime(CLOCK_REALTIME, &TIME);
+       UpdateTime();
        this->startup_time = TIME.tv_sec;
 
        // This must be created first, so other parts of Insp can use it while starting up
@@ -375,7 +380,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        this->Config->cmdline.argv = argv;
        this->Config->cmdline.argc = argc;
 
-       srand(TIME.tv_nsec ^ TIME.tv_sec);
+       srandom(TIME.tv_nsec ^ TIME.tv_sec);
 
        struct option longopts[] =
        {
@@ -391,7 +396,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        };
 
        int index;
-       while ((c = getopt_long_only(argc, argv, ":f:", longopts, &index)) != -1)
+       while ((c = getopt_long(argc, argv, ":f:", longopts, &index)) != -1)
        {
                switch (c)
                {
@@ -451,7 +456,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        if (do_debug)
        {
                FileWriter* fw = new FileWriter(stdout);
-               FileLogStream* fls = new FileLogStream(DEBUG, fw);
+               FileLogStream* fls = new FileLogStream(RAWIO, fw);
                Logs->AddLogTypes("*", fls, true);
        }
        else if (!this->OpenLog(argv, argc))
@@ -610,7 +615,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        }
 #else
        WindowsIPC = new IPC;
-       if(!Config->nofork)
+       if(!Config->cmdline.nofork)
        {
                WindowsForkKillOwner();
                FreeConsole();
@@ -687,7 +692,14 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
 void InspIRCd::UpdateTime()
 {
+#ifdef HAS_CLOCK_GETTIME
        clock_gettime(CLOCK_REALTIME, &TIME);
+#else
+       struct timeval tv;
+       gettimeofday(&tv, NULL);
+       TIME.tv_sec = tv.tv_sec;
+       TIME.tv_nsec = tv.tv_usec * 1000;
+#endif
 }
 
 int InspIRCd::Run()