Now clears the autoconns map on rehash

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 5862400ceec001ad871636a886e9b711ce29b137..c9b2719424488569143c9fcc06173b3032ea863c 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -124,6 +124,7 @@ typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHa
 typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, irc::InAddr_HashComp> address_cache;
 typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, irc::StrHashComp> whowas_hash;
 typedef std::deque<command_t> command_table;
+typedef std::map<std::string,time_t> autoconnects;
 
 // This table references users by file descriptor.
 // its an array to make it VERY fast, as all lookups are referenced
@@ -140,6 +141,7 @@ user_hash clientlist;
 chan_hash chanlist;
 whowas_hash whowas;
 command_table cmdlist;
+autoconnects autoconns;
 file_cache MOTD;
 file_cache RULES;
 address_cache IP;
@@ -188,7 +190,7 @@ void DeleteOper(userrec* user)
         }
 }
 
-long GetRevision()
+std::string GetRevision()
 {
        char Revision[] = "$Revision$";
        char *s1 = Revision;
@@ -197,7 +199,7 @@ long GetRevision()
        s1 = savept;
        v2 = strtok_r(s1," ",&savept);
        s1 = savept;
-       return (long)(atof(v2)*10000);
+       return std::string(v2);
 }
 
 
@@ -398,6 +400,20 @@ void ReadConfig(bool bail, userrec* user)
        read_xline_defaults();
        log(DEFAULT,"Applying K lines, Q lines and Z lines...");
        apply_lines();
+
+       autoconns.clear();
+        for (int i = 0; i < ConfValueEnum("link",&config_f); i++)
+        {
+               char Link_ServerName[MAXBUF],Link_AConn[MAXBUF];
+                ConfValue("link","name",i,Link_ServerName,&config_f);
+                ConfValue("link","autoconnect",i,Link_AConn,&config_f);
+               if (strcmp(Link_AConn,""))
+               {
+                       autoconns[std::string(Link_ServerName)] = atoi(Link_AConn) + time(NULL);
+               }
+        }
+
+
        log(DEFAULT,"Done reading configuration file, InspIRCd is now starting.");
        if (!bail)
        {
@@ -1107,8 +1123,7 @@ void kill_link(userrec *user,const char* r)
                        log(DEBUG,"epoll: List deletion failure!");
                }
 #endif
-                shutdown(user->fd,2);
-                close(user->fd);
+               user->CloseSocket();
        }
 
        // this must come before the WriteOpers so that it doesnt try to fill their buffer with anything
@@ -1182,8 +1197,7 @@ void kill_link_silent(userrec *user,const char* r)
                         log(DEBUG,"epoll: List deletion failure!");
                 }
 #endif
-                shutdown(user->fd,2);
-                close(user->fd);
+               user->CloseSocket();
         }
 
         if (user->registered == 7) {
@@ -2504,6 +2518,26 @@ bool LoadModule(const char* filename)
        return true;
 }
 
+
+bool GotServer(std::string name)
+{
+        for (int j = 0; j < 32; j++)
+        {
+                if (me[j] != NULL)
+                {
+                        for (int k = 0; k < me[j]->connectors.size(); k++)
+                        {
+                               if (name == me[j]->connectors[k].GetServerName())
+                               {
+                                       return true;
+                               }
+                        }
+                }
+        }
+       return false;
+}
+
+
 int InspIRCd(char** argv, int argc)
 {
        struct sockaddr_in client,server;
@@ -2808,6 +2842,25 @@ int InspIRCd(char** argv, int argc)
                // them in a list, then reap the list every second or so.
                if (((TIME % 5) == 0) && (!expire_run))
                {
+                       for (int i = 0; i < ConfValueEnum("link",&config_f); i++)
+                       {
+                               char Link_ServerName[MAXBUF],Link_AConn[MAXBUF];
+                               ConfValue("link","name",i,Link_ServerName,&config_f);
+                               ConfValue("link","autoconnect",i,Link_AConn,&config_f);
+                               if ((Link_AConn[0]) && (!GotServer(Link_ServerName)))
+                               {
+                                       autoconnects::iterator a = autoconns.find(std::string(Link_ServerName));
+                                       if (a != autoconns.end())
+                                       {
+                                               if (TIME > a->second)
+                                               {
+                                                       ConnectServer(Link_ServerName,NULL);
+                                                       a->second = TIME + atoi(Link_AConn);
+                                               }
+                                       }
+                               }
+                       }
+
                        expire_lines();
                        FOREACH_MOD OnBackgroundTimer(TIME);
                        expire_run = true;
@@ -2881,6 +2934,8 @@ int InspIRCd(char** argv, int argc)
                std::deque<std::string> sums;
                for (int x = 0; x < SERVERportCount; x++)
                {
+                       if (me[x])
+                               me[x]->FlushWriteBuffers();
                        sums.clear();
                        msgs.clear();
                        while ((me[x]) && (me[x]->RecvPacket(msgs, tcp_host, sums))) // returns 0 or more lines (can be multiple lines!)
@@ -2913,6 +2968,11 @@ int InspIRCd(char** argv, int argc)
                                        strlcpy(tcp_msg,msg.c_str(),MAXBUF);
                                        if (me[x])
                                                handle_link_packet(tcp_msg, tcp_host, me[x], tcp_sum);
+                                       if (!me[x]->FindHost(tcp_host))
+                                       {
+                                               log(DEBUG,"Connector gone, bailing!");
+                                               goto label;
+                                       }
                                }
                                        sums.clear();   // we're done, clear the list for the next operation
                                        msgs.clear();
@@ -3145,7 +3205,7 @@ int InspIRCd(char** argv, int argc)
                                        FOREACH_RESULT(OnRawSocketRead(cu->fd,data,65535,result2));
                                        if (!MOD_RESULT)
                                        {
-                                               result = read(cu->fd, data, 65535);
+                                               result = cu->ReadData(data, 65535);
                                        }
                                        else result = result2;
                                        log(DEBUG,"Read result: %d",result);