Fixed server descriptions in /whois and /links (untested)

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 28a944ee631dfff93c1a17fc74cf4672eeaa3737..851473bf9929a9e0fadd738e010ca641a886a1e3 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"
@@ -716,6 +718,26 @@ int c_count(userrec* u)
 
 }
 
+
+std::string GetServerDescription(char* servername)
+{
+       for (int j = 0; j < 32; j++)
+       {
+               if (me[j] != NULL)
+               {
+                       for (int k = 0; k < me[j]->connectors.size(); k++)
+                       {
+                               if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),servername))
+                               {
+                                       return me[j]->connectors[k].GetDescription();
+                               }
+                       }
+               }
+               return "";
+       }
+}
+
+
 /* return 0 or 1 depending if users u and u2 share one or more common channels
  * (used by QUIT, NICK etc which arent channel specific notices) */
 
@@ -4675,7 +4697,7 @@ void handle_whois(char **parameters, int pcnt, userrec *user)
                        {
                                WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, chlist(dest));
                        }
-                       WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, dest->server, ServerDesc);
+                       WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, dest->server, GetServerDescription(dest->server));
                        if (strcmp(dest->awaymsg,""))
                        {
                                WriteServ(user->fd,"301 %s %s :%s",user->nick, dest->nick, dest->awaymsg);
@@ -5842,7 +5864,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;
@@ -6007,7 +6029,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);
@@ -6895,8 +6917,8 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
        char* params = udp_msg + 2;
        char finalparam[1024];
        strcpy(finalparam," :xxxx");
-       if (strstr(params," :")) {
-               strncpy(finalparam,strstr(params," :"),1024);
+       if (strstr(udp_msg," :")) {
+               strncpy(finalparam,strstr(udp_msg," :"),1024);
        }
        if (token == '-') {
                char* cookie = strtok(params," ");
@@ -6921,6 +6943,8 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                                                        if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),udp_host))
                                                        {
                                                                me[j]->connectors[k].SetServerName(servername);
+                                                               me[j]->connectors[k].SetDescription(serverdesc);
+                                                               me[j]->connectors[k].SetState(STATE_CONNECTED);
                                                                NetSendMyRoutingTable();
                                                                return;
                                                        }
@@ -6952,6 +6976,7 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                        if (!strcasecmp(serv->connectors[j].GetServerName().c_str(),udp_host))
                        {
                                serv->connectors[j].SetServerName(servername);
+                               serv->connectors[j].SetDescription(serverdesc);
                                serv->connectors[j].SetServerPort(atoi(myport));
                        }
                }
@@ -6980,6 +7005,15 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                                // send a 'diminutive' server message back...
                                snprintf(response,10240,"s %s %s :%s",ServerName,Link_SendPass,ServerDesc);
                                serv->SendPacket(response,servername);
+
+                               for (int t = 0; t < serv->connectors.size(); t++)
+                               {
+                                       if (!strcasecmp(serv->connectors[t].GetServerName().c_str(),servername))
+                                       {
+                                               serv->connectors[t].SetState(STATE_CONNECTED);
+                                       }
+                               }
+               
                                return;
                        }
                }
@@ -7001,9 +7035,6 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                // to an 'S' command. If we didn't recently send an 'S' to this server, theyre trying to spoof
                // a connect, so put out an oper alert!
                
-               
-               
-               
                // for now, just accept all, we'll fix that later.
                WriteOpers("%s accepted our link credentials ",servername);
                
@@ -7030,7 +7061,7 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                                // at this point we must begin key exchange and insert this
                                // server into our 'active' table.
                                for (int j = 0; j < 32; j++)
-                               {
+                               {
                                        if (me[j] != NULL)
                                        {
                                                for (int k = 0; k < me[j]->connectors.size(); k++)
@@ -7038,6 +7069,8 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                                                        if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),udp_host))
                                                        {
                                                                char buffer[MAXBUF];
+                                                               me[j]->connectors[k].SetDescription(serverdesc);
+                                                               me[j]->connectors[k].SetState(STATE_CONNECTED);
                                                                sprintf(buffer,"X 0");
                                                                serv->SendPacket(buffer,udp_host);
                                                                DoSync(me[j],udp_host);
@@ -7080,12 +7113,12 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                                        log(DEBUG,"Servers are: '%s' '%s'",udp_host,me[j]->connectors[x].GetServerName().c_str());
                                        if (!strcasecmp(me[j]->connectors[x].GetServerName().c_str(),udp_host))
                                        {
-                                               log(DEBUG,"match! process restricted stuff here");
-                                               // found a valid ircd_connector.
-                                               // TODO: Fix this so it only lets servers in that are in the 
-                                               // STATE_CONNECTED state!!!
-                                               process_restricted_commands(token,params,me[j],serv,udp_host,me[j]->connectors[x].GetServerIP(),me[j]->connectors[x].GetServerPort());
-                                               return;
+                                               if (me[j]->connectors[x].GetState() == STATE_CONNECTED)
+                                               {
+                                                       // found a valid ircd_connector.
+                                                       process_restricted_commands(token,params,me[j],serv,udp_host,me[j]->connectors[x].GetServerIP(),me[j]->connectors[x].GetServerPort());
+                                                       return;
+                                               }
                                        }
                                }
                        }
@@ -7277,6 +7310,9 @@ int InspIRCd(void)
        /* main loop, this never returns */
        for (;;)
        {
+#ifdef _POSIX_PRIORITY_SCHEDULING
+               sched_yield();
+#endif
 
                fd_set sfd;
                timeval tval;
@@ -7286,7 +7322,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)
                        {
@@ -7434,6 +7470,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)))
                                {
@@ -7443,7 +7484,8 @@ int InspIRCd(void)
                                        
                                        if (result)
                                        {
-                                               log(DEBUG,"Read %d characters from socket",result);
+                                               if (result > 0)
+                                                       log(DEBUG,"Read %d characters from socket",result);
                                                userrec* current = count2a->second;
                                                int currfd = current->fd;
                                                char* l = strtok(data,"\n");