Minor code tweaks, tidyups

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index bc512cebd9abf44669981022d3515025d015b8b2..874f9b9ff9f3697bfa137b8e7b9f1bf3e46920a0 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -41,6 +41,8 @@ using namespace std;
 #include <errno.h>
 #include <deque>
 #include <errno.h>
+#include <unistd.h>
+#include <sched.h>
 #include "connection.h"
 #include "users.h"
 #include "servers.h"
@@ -5370,9 +5372,69 @@ void handle_connect(char **parameters, int pcnt, userrec *user)
        }
 }
 
+void DoSplitEveryone()
+{
+       bool go_again = true;
+       while (go_again)
+       {
+               go_again = false;
+               for (int i = 0; i < 32; i++)
+               {
+                       if (me[i] != NULL)
+                       {
+                               for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
+                               {
+                                       if (strcasecmp(j->GetServerName().c_str(),ServerName))
+                                       {
+                                               j->routes.clear();
+                                               j->CloseConnection();
+                                               me[i]->connectors.erase(j);
+                                               go_again = true;
+                                               break;
+                                       }
+                               }
+                       }
+               }
+       }
+       log(DEBUG,"Removed server. Will remove clients...");
+       // iterate through the userlist and remove all users on this server.
+       // because we're dealing with a mesh, we dont have to deal with anything
+       // "down-route" from this server (nice huh)
+       go_again = true;
+       char reason[MAXBUF];
+       while (go_again)
+       {
+               go_again = false;
+               for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
+               {
+                       if (strcasecmp(u->second->server,ServerName))
+                       {
+                               snprintf(reason,MAXBUF,"%s %s",ServerName,u->second->server);
+                               kill_link(u->second,reason);
+                               go_again = true;
+                               break;
+                       }
+               }
+       }
+}
+
+
+
 void handle_squit(char **parameters, int pcnt, userrec *user)
 {
        // send out an squit across the mesh and then clear the server list (for local squit)
+       if (!pcnt)
+       {
+               WriteOpers("SQUIT command issued by %s",user->nick);
+               char buffer[MAXBUF];
+               snprintf(buffer,MAXBUF,"& %s",ServerName);
+               NetSendToAll(buffer);
+               DoSplitEveryone();
+       }
+       else
+       {
+               WriteServ(user->fd,"NOTICE :*** Remote SQUIT not supported yet.");
+       }
 }
 
 char islast(const char* s)
@@ -5782,7 +5844,7 @@ void process_command(userrec *user, char* cmd)
                {
                        if (((command[x] < '0') || (command[x]> '9')) && (command[x] != '-'))
                        {
-                               if (strchr("@!\"$%^&*(){}[]_-=+;:'#~,.<>/?\\|`",command[x]))
+                               if (!strchr("@!\"$%^&*(){}[]_-=+;:'#~,.<>/?\\|`",command[x]))
                                {
                                        kill_link(user,"Protocol violation (3)");
                                        return;
@@ -5947,7 +6009,7 @@ void SetupCommandTable(void)
        createcommand("TRACE",handle_trace,'o',0);
        createcommand("WHOWAS",handle_whowas,0,1);
        createcommand("CONNECT",handle_connect,'o',1);
-       createcommand("SQUIT",handle_squit,'o',1);
+       createcommand("SQUIT",handle_squit,'o',0);
        createcommand("MODULES",handle_modules,'o',0);
        createcommand("LINKS",handle_links,0,0);
        createcommand("MAP",handle_map,0,0);
@@ -6654,10 +6716,11 @@ void handle_amp(char token,char* params,serverrec* source,serverrec* reply, char
        }
 }
 
+long authcookie;
+
 
 void process_restricted_commands(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,char* ipaddr,int port)
 {
-       long authcookie = rand()*rand();
        char buffer[MAXBUF];
 
        switch(token)
@@ -6667,6 +6730,11 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                case 'Y':
                        nb_start = time(NULL);
                        WriteOpers("Server %s is starting netburst.",udp_host);
+                       // now broadcast this new servers address out to all servers that are linked to us,
+                       // except the newcomer. They'll all attempt to connect back to it.
+                       authcookie = rand()*rand();
+                       snprintf(buffer,MAXBUF,"~ %d",authcookie);
+                       NetSendToAll(buffer);
                break;
                // ~
                // Store authcookie
@@ -6801,10 +6869,6 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                        WriteOpers("Server %s has completed netburst. (%d secs)",udp_host,time(NULL)-nb_start);
                        handle_F(token,params,source,reply,udp_host);
                        nb_start = 0;
-                       // now broadcast this new servers address out to all servers that are linked to us,
-                       // except the newcomer. They'll all attempt to connect back to it.
-                       snprintf(buffer,MAXBUF,"~ %d",authcookie);
-                       source->SendPacket(buffer,udp_host);
                        // tell all the other servers to use this authcookie to connect back again
                        // got '+ test3.chatspike.net 7010 -2016508415' from test.chatspike.net
                        snprintf(buffer,MAXBUF,"+ %s %s %d %d",udp_host,ipaddr,port,authcookie);
@@ -7215,6 +7279,9 @@ int InspIRCd(void)
        /* main loop, this never returns */
        for (;;)
        {
+#ifdef _POSIX_PRIORITY_SCHEDULING
+               sched_yield();
+#endif
 
                fd_set sfd;
                timeval tval;
@@ -7224,7 +7291,7 @@ int InspIRCd(void)
 
                // *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>2500)
+               if (reap_counter>300)
                {
                        if (fd_reap.size() > 0)
                        {
@@ -7372,6 +7439,11 @@ int InspIRCd(void)
                        //if (selectResult2 > 0)
                        for (user_hash::iterator count2a = xcount; count2a != endingiter; count2a++)
                        {
+
+#ifdef _POSIX_PRIORITY_SCHEDULING
+                               sched_yield();
+#endif
+
                                result = EAGAIN;
                                if ((count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd)))
                                {