Signed octets in dns forward lookup! GAH

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 24c37324a53a7b133fa82a7ba88e2d8669d878f2..7a6db9a61cd857194ea68d05d0725b49d9fcfb55 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -78,15 +78,11 @@ extern std::vector<std::string> module_names;
 
 extern int boundPortCount;
 extern int portCount;
-extern int SERVERportCount;
+
 extern int ports[MAXSOCKS];
-extern int defaultRoute;
 
-extern std::vector<long> auth_cookies;
 extern std::stringstream config_f;
 
-extern serverrec* me[32];
-
 extern FILE *log_file;
 
 typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
@@ -310,36 +306,6 @@ bool zline_make_global(const char* ipaddr)
        return false;
 }
 
-void sync_xlines(serverrec* serv, char* tcp_host)
-{
-       char data[MAXBUF];
-       
-       // for zlines and qlines, we should first check if theyre global...
-       for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
-       {
-               if (i->is_global)
-               {
-                       snprintf(data,MAXBUF,"%s } %s %s %lu %lu :%s",CreateSum().c_str(),i->ipaddr,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
-                       serv->SendPacket(data,tcp_host);
-               }
-       }
-       for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
-       {
-               if (i->is_global)
-               {
-                       snprintf(data,MAXBUF,"%s { %s %s %lu %lu :%s",CreateSum().c_str(),i->nick,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
-                       serv->SendPacket(data,tcp_host);
-               }
-       }
-       // glines are always global, so no need to check
-       for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
-       {
-               snprintf(data,MAXBUF,"%s # %s %s %lu %lu :%s",CreateSum().c_str(),i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
-               serv->SendPacket(data,tcp_host);
-       }
-}
-
-
 // deletes a z:line, returns true if the line existed and was removed
 
 bool del_zline(const char* ipaddr)
@@ -499,6 +465,12 @@ void expire_lines()
        
        // because we mess up an iterator when we remove from the vector, we must bail from
        // the loop early if we delete an item, therefore this outer while loop is required.
+       //
+       // 30/11/2005-- I can imagine that if we get a large number of *lines, this would perform dog slow.
+       // While we try and think of a better solution, for now I've simply split the loops up, instead of
+       // one huge while () -- this means if we remove a g-line, we only need to re-check glines, not z/g/.
+       // lines too, hopefully a little faster, even if it looks a little messier ;) --w00t
+
        while (go_again)
        {
                go_again = false;
@@ -513,6 +485,13 @@ void expire_lines()
                                break;
                        }
                }
+       }
+
+       go_again = true;
+
+       while (go_again)
+       {
+               go_again = false;
 
                 for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
                 {
@@ -524,6 +503,13 @@ void expire_lines()
                                 break;
                         }
                 }
+       }
+
+       go_again = true;
+
+       while (go_again)
+       {
+               go_again = false;
 
                for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
                {
@@ -535,6 +521,13 @@ void expire_lines()
                                break;
                        }
                }
+       }
+
+       go_again = true;
+
+       while (go_again)
+       {
+               go_again = false;
 
                for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
                {
@@ -546,6 +539,14 @@ void expire_lines()
                                break;
                        }
                }
+       }
+
+       go_again = true;
+
+
+       while (go_again)
+       {
+               go_again = false;
 
                for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
                {