Server linking fixes

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@478 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index 0bc46b2c67e383d3365292db60ffe67fb558ffa8..9f542b2a886deb0f7dbb39655e5f47f0c49ffaed 100644 (file)
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -13,9 +13,9 @@ LeftChar=1
 [Editor_1]
 Open=1
 Top=1
-CursorCol=12
-CursorRow=5139
-TopLine=5093
+CursorCol=2
+CursorRow=5565
+TopLine=5517
 LeftChar=1
 
 [Editor_2]

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 77abfb25fcaf8e259f97a3ac2b0b91615ec53af9..552d2a7f8a92dfb771cf8f585b3aaaed5992a15f 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -5562,6 +5562,12 @@ int InspIRCd(void)
        for (;;)
        {
 
+               fd_set sfd;
+               struct timeval tval;
+               FD_ZERO(&sfd);
+
+               user_hash::iterator count2 = clientlist.begin();
+
                // *FIX* Instead of closing sockets in kill_link when they receive the ERROR :blah line, we should queue
                // them in a list, then reap the list every second or so.
                if (reap_counter>5000)
@@ -5596,16 +5602,12 @@ int InspIRCd(void)
                                // link packets can manipulate the usertable so beware of
                                // any loops here watching the user or channels hash
                                log(DEBUG,"Sync: exit 3");
+                               goto label;
                        }
                }
        }
        
-       fd_set sfd;
-       struct timeval tval;
-       FD_ZERO(&sfd);
 
-       user_hash::iterator count2 = clientlist.begin();
-       
        while (count2 != clientlist.end())
        {
                char data[10240];