]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Actually set 'm' datagram as a recognised type!
[user/henk/code/inspircd.git] / src / inspircd.cpp
index 9abdd7f643f43751132ef94dae036cacc05c9443..ba511e583adc2d2709b67b6497bdfff9742497c4 100644 (file)
@@ -2590,12 +2590,51 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                if (servermode)
                {
                        if (!silent)
+                       {
                                WriteChannelWithServ(ServerName,chan,user,"MODE %s %s",chan->name,outstr);
+                               // M token for a usermode must go to all servers
+                               char buffer[MAXBUF];
+                               snprintf(buffer,MAXBUF,"M %s %s",ServerName,chan->name, outstr);
+                               for (int j = 0; j < 255; j++)
+                               {
+                                       if (servers[j] != NULL)
+                                       {
+                                               if (strcmp(servers[j]->name,ServerName))
+                                               {
+                                                       if (ChanAnyOnThisServer(chan,servers[j]->name))
+                                                       {
+                                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                                               log(DEBUG,"Sent M token");
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+                               
                }
                else
                {
                        if (!silent)
+                       {
                                WriteChannel(chan,user,"MODE %s %s",chan->name,outstr);
+                               // M token for a usermode must go to all servers
+                               char buffer[MAXBUF];
+                               snprintf(buffer,MAXBUF,"m %s %s %s",user->nick,chan->name, outstr);
+                               for (int j = 0; j < 255; j++)
+                               {
+                                       if (servers[j] != NULL)
+                                       {
+                                               if (strcmp(servers[j]->name,ServerName))
+                                               {
+                                                       if (ChanAnyOnThisServer(chan,servers[j]->name))
+                                                       {
+                                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                                               log(DEBUG,"Sent m token");
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
                }
        }
 }
@@ -2875,6 +2914,21 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
 
                        WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
 
+                       // M token for a usermode must go to all servers
+                       char buffer[MAXBUF];
+                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
+                       for (int j = 0; j < 255; j++)
+                       {
+                               if (servers[j] != NULL)
+                               {
+                                       if (strcmp(servers[j]->name,ServerName))
+                                       {
+                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                               log(DEBUG,"Sent m token");
+                                       }
+                               }
+                       }
+
                        if (strlen(dmodes)>MAXMODES)
                        {
                                dmodes[MAXMODES-1] = '\0';
@@ -3084,6 +3138,21 @@ void server_mode(char **parameters, int pcnt, userrec *user)
 
                        WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
 
+                       // M token for a usermode must go to all servers
+                       char buffer[MAXBUF];
+                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
+                       for (int j = 0; j < 255; j++)
+                       {
+                               if (servers[j] != NULL)
+                               {
+                                       if (strcmp(servers[j]->name,ServerName))
+                                       {
+                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                               log(DEBUG,"Sent m token");
+                                       }
+                               }
+                       }
+                       
                        if (strlen(dmodes)>MAXMODES)
                        {
                                dmodes[MAXMODES-1] = '\0';
@@ -3288,6 +3357,181 @@ void merge_mode(char **parameters, int pcnt)
 }
 
 
+void merge_mode2(char **parameters, int pcnt, userrec* user)
+{
+       chanrec* Ptr;
+       userrec* dest;
+       int can_change,i;
+       int direction = 1;
+       char outpars[MAXBUF];
+
+       dest = Find(parameters[0]);
+       
+       // fix: ChroNiCk found this - we cant use this as debug if its null!
+       if (dest)
+       {
+               log(DEBUG,"merge_mode on %s",dest->nick);
+       }
+
+       if ((dest) && (pcnt > 1))
+       {
+               log(DEBUG,"params > 1");
+
+               char dmodes[MAXBUF];
+               strncpy(dmodes,dest->modes,MAXBUF);
+
+               strcpy(outpars,"+");
+               direction = 1;
+
+               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
+                       return;
+
+               for (int i = 0; i < strlen(parameters[1]); i++)
+               {
+                       if (parameters[1][i] == '+')
+                       {
+                               if (direction != 1)
+                               {
+                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
+                                       {
+                                               outpars[strlen(outpars)-1] = '+';
+                                       }
+                                       else
+                                       {
+                                               strcat(outpars,"+");
+                                       }
+                               }
+                               direction = 1;
+                       }
+                       else
+                       if (parameters[1][i] == '-')
+                       {
+                               if (direction != 0)
+                               {
+                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
+                                       {
+                                               outpars[strlen(outpars)-1] = '-';
+                                       }
+                                       else
+                                       {
+                                               strcat(outpars,"-");
+                                       }
+                               }
+                               direction = 0;
+                       }
+                       else
+                       {
+                               log(DEBUG,"begin mode processing entry");
+                               can_change = 1;
+                               if (can_change)
+                               {
+                                       if (direction == 1)
+                                       {
+                                               log(DEBUG,"umode %c being added",parameters[1][i]);
+                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
+                                               {
+                                                       char umode = parameters[1][i];
+                                                       log(DEBUG,"umode %c is an allowed umode",umode);
+                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+                                                       {
+                                                               dmodes[strlen(dmodes)+1]='\0';
+                                                               dmodes[strlen(dmodes)] = parameters[1][i];
+                                                               outpars[strlen(outpars)+1]='\0';
+                                                               outpars[strlen(outpars)] = parameters[1][i];
+                                                       }
+                                               }
+                                       }
+                                       else
+                                       {
+                                               // can only remove a mode they already have
+                                               log(DEBUG,"umode %c being removed",parameters[1][i]);
+                                               if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
+                                               {
+                                                       char umode = parameters[1][i];
+                                                       log(DEBUG,"umode %c is an allowed umode",umode);
+                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+                                                       {
+                                                               int q = 0;
+                                                               char temp[MAXBUF];
+                                                               char moo[MAXBUF];       
+
+                                                               outpars[strlen(outpars)+1]='\0';
+                                                               outpars[strlen(outpars)] = parameters[1][i];
+                                                       
+                                                               strcpy(temp,"");
+                                                               for (q = 0; q < strlen(dmodes); q++)
+                                                               {
+                                                                       if (dmodes[q] != parameters[1][i])
+                                                                       {
+                                                                               moo[0] = dmodes[q];
+                                                                               moo[1] = '\0';
+                                                                               strcat(temp,moo);
+                                                                       }
+                                                               }
+                                                               strcpy(dmodes,temp);
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+               if (strlen(outpars))
+               {
+                       char b[MAXBUF];
+                       strcpy(b,"");
+                       int z = 0;
+                       int i = 0;
+                       while (i < strlen (outpars))
+                       {
+                               b[z++] = outpars[i++];
+                               b[z] = '\0';
+                               if (i<strlen(outpars)-1)
+                               {
+                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
+                                       {
+                                               // someones playing silly buggers and trying
+                                               // to put a +- or -+ into the line...
+                                               i++;
+                                       }
+                               }
+                               if (i == strlen(outpars)-1)
+                               {
+                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
+                                       {
+                                               i++;
+                                       }
+                               }
+                       }
+
+                       z = strlen(b)-1;
+                       if ((b[z] == '-') || (b[z] == '+'))
+                               b[z] == '\0';
+
+                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
+                               return;
+
+                       if (strlen(dmodes)>MAXMODES)
+                       {
+                               dmodes[MAXMODES-1] = '\0';
+                       }
+                       log(DEBUG,"Stripped mode line");
+                       log(DEBUG,"Line dest is now %s",dmodes);
+                       strncpy(dest->modes,dmodes,MAXMODES);
+
+               }
+
+               return;
+       }
+       
+       Ptr = FindChan(parameters[0]);
+       if (Ptr)
+       {
+               process_modes(parameters,user,Ptr,STATUS_OP,pcnt,false,true);
+       }
+}
+
+
+
 /* This function pokes and hacks at a parameter list like the following:
  *
  * PART #winbot, #darkgalaxy :m00!
@@ -3572,13 +3816,14 @@ void kill_link(userrec *user,const char* r)
                FOREACH_MOD OnUserQuit(user);
                WriteCommonExcept(user,"QUIT :%s",reason);
 
+               // Q token must go to ALL servers!!!
                char buffer[MAXBUF];
                snprintf(buffer,MAXBUF,"Q %s :%s",user->nick,reason);
                for (int j = 0; j < 255; j++)
                {
                        if (servers[j] != NULL)
                        {
-                               if (CommonOnThisServer(user,servers[j]->name))
+                               if (strcmp(servers[j]->name,ServerName))
                                {
                                        me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
                                        log(DEBUG,"Sent Q token");
@@ -4183,7 +4428,7 @@ void handle_notice(char **parameters, int pcnt, userrec *user)
 
                        // if any users of this channel are on remote servers, broadcast the packet
                        char buffer[MAXBUF];
-                       snprintf(buffer,MAXBUF,"O %s %s :%s",user->nick,chan->name,parameters[1]);
+                       snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,chan->name,parameters[1]);
                        for (int j = 0; j < 255; j++)
                        {
                                if (servers[j] != NULL)
@@ -4228,7 +4473,7 @@ void handle_notice(char **parameters, int pcnt, userrec *user)
                                        {
                                                // direct write, same server
                                                char buffer[MAXBUF];
-                                               snprintf(buffer,MAXBUF,"O %s %s :%s",user->nick,dest->nick,parameters[1]);
+                                               snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,dest->nick,parameters[1]);
                                                me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
                                        }
                                }
@@ -4662,6 +4907,21 @@ void ConnectUser(userrec *user)
        ShowMOTD(user);
        FOREACH_MOD OnUserConnect(user);
        WriteOpers("*** Client connecting on port %d: %s!%s@%s",user->port,user->nick,user->ident,user->host);
+       
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"N %d %s %s %s %s +%s %s :%s",user->age,user->nick,user->host,user->dhost,user->ident,user->modes,ServerName,user->fullname);
+       for (int j = 0; j < 255; j++)
+       {
+               if (servers[j] != NULL)
+               {
+                       if (strcmp(servers[j]->name,ServerName))
+                       {
+                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                               log(DEBUG,"Sent N token");
+                       }
+               }
+       }
+
 }
 
 void handle_version(char **parameters, int pcnt, userrec *user)
@@ -5144,6 +5404,22 @@ void handle_nick(char **parameters, int pcnt, userrec *user)
        if (user->registered == 7)
        {
                WriteCommon(user,"NICK %s",parameters[0]);
+               
+               // Q token must go to ALL servers!!!
+               char buffer[MAXBUF];
+               snprintf(buffer,MAXBUF,"n %s %s",user->nick,parameters[0]);
+               for (int j = 0; j < 255; j++)
+               {
+                       if (servers[j] != NULL)
+                       {
+                               if (strcmp(servers[j]->name,ServerName))
+                               {
+                                       me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                       log(DEBUG,"Sent n token");
+                               }
+                       }
+               }
+               
        }
        
        /* change the nick of the user in the users_hash */
@@ -5580,12 +5856,14 @@ void DoSync(serverrec* serv, char* udp_host,int udp_port, long MyKey)
 {
        char data[MAXBUF];
        // send start of sync marker: Y <timestamp>
+       // at this point the ircd receiving it starts broadcasting this netburst to all ircds
+       // except the ones its receiving it from.
        snprintf(data,MAXBUF,"Y %d",time(NULL));
        serv->SendPacket(data,udp_host,udp_port,MyKey);
        // send users and channels
        for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
        {
-               snprintf(data,MAXBUF,"N %d %s %s %s %s %s %s :%s",u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->server,u->second->fullname);
+               snprintf(data,MAXBUF,"N %d %s %s %s %s +%s %s :%s",u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->server,u->second->fullname);
                serv->SendPacket(data,udp_host,udp_port,MyKey);
                if (strcmp(chlist(u->second),""))
                {
@@ -5614,10 +5892,11 @@ void DoSync(serverrec* serv, char* udp_host,int udp_port, long MyKey)
        // send end of sync marker: E <timestamp>
        snprintf(data,MAXBUF,"F %d",time(NULL));
        serv->SendPacket(data,udp_host,udp_port,MyKey);
+       // ircd sends its serverlist after the end of sync here
 }
 
 
-void handle_O(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+void handle_V(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
 {
        char* src = strtok(params," ");
        char* dest = strtok(NULL," :");
@@ -5720,6 +5999,45 @@ void handle_M(char token,char* params,serverrec* source,serverrec* reply, char*
        }
 }
 
+// m is modes set by users only (not servers) valid targets are channels or users.
+
+void handle_m(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+       // m blah #chatspike +b *!test@*4
+       char* pars[128];
+       char original[MAXBUF];
+       strncpy(original,params,MAXBUF);
+       int index = 0;
+       
+       char* src = strtok(params," ");
+       userrec* user = Find(src);
+       
+       if (user)
+       {
+               log(DEBUG,"Found user: %s",user->nick);
+               char* parameter = strtok(NULL," ");
+               while (parameter)
+               {
+                       pars[index++] = parameter;
+                       parameter = strtok(NULL," ");
+               }
+               
+               log(DEBUG,"Calling merge_mode2");
+               merge_mode2(pars,--index,user);
+               if (FindChan(pars[0]))
+               {
+                       log(DEBUG,"Target is channel");
+                       WriteChannelLocal(FindChan(pars[0]), user, "MODE %s",original);
+               }
+               if (Find(pars[0]))
+               {
+                       log(DEBUG,"Target is nick");
+                       WriteTo(user,Find(pars[0]),"MODE %s",original);
+               }
+       }
+}
+
+
 void handle_L(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
 {
        char* nick = strtok(params," ");
@@ -5773,6 +6091,23 @@ void handle_Q(char token,char* params,serverrec* source,serverrec* reply, char*
        }
 }
 
+void handle_n(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+       char* oldnick = strtok(params," ");
+       char* newnick = strtok(NULL," ");
+       
+       userrec* user = Find(oldnick);
+       
+       if (user)
+       {
+               WriteCommon(user,"NICK %s",newnick);
+               user = ReHashNick(user->nick, newnick);
+               if (!user) return;
+               if (!user->nick) return;
+               strncpy(user->nick, newnick,NICKMAX);
+               log(DEBUG,"new nick set: %s",user->nick);
+       }
+}
 
 void handle_N(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
 {
@@ -5785,6 +6120,7 @@ void handle_N(char token,char* params,serverrec* source,serverrec* reply, char*
        char* server = strtok(NULL," :");
        char* gecos = strtok(NULL,"\r\n");
        gecos++;
+       modes++;
        time_t TS = atoi(tm);
        user_hash::iterator iter = clientlist.find(nick);
        if (iter != clientlist.end())
@@ -5898,6 +6234,13 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                case 'N':
                        handle_N(token,params,source,reply,udp_host,udp_port);
                break;
+               // n <NICK> <NEWNICK>
+               // change nickname of client -- a server should only be able to
+               // change the nicknames of clients that reside on it unless
+               // they are ulined.
+               case 'n':
+                       handle_n(token,params,source,reply,udp_host,udp_port);
+               break;
                // J <NICK> <CHANLIST>
                // Join user to channel list, merge channel permissions
                case 'J':
@@ -5908,20 +6251,25 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                case 'T':
                        handle_T(token,params,source,reply,udp_host,udp_port);
                break;
-               // M <TS> <TARGET> <MODES> [MODE-PARAMETERS]
-               // Set modes on an object
+               // M <TARGET> <MODES> [MODE-PARAMETERS]
+               // Server setting modes on an object
                case 'M':
                        handle_M(token,params,source,reply,udp_host,udp_port);
                break;
+               // m <SOURCE> <TARGET> <MODES> [MODE-PARAMETERS]
+               // User setting modes on an object
+               case 'm':
+                       handle_m(token,params,source,reply,udp_host,udp_port);
+               break;
                // P <SOURCE> <TARGET> :<TEXT>
                // Send a private/channel message
                case 'P':
                        handle_P(token,params,source,reply,udp_host,udp_port);
                break;
-               // O <SOURCE> <TARGET> :<TEXT>
+               // V <SOURCE> <TARGET> :<TEXT>
                // Send a private/channel notice
-               case 'O':
-                       handle_O(token,params,source,reply,udp_host,udp_port);
+               case 'V':
+                       handle_V(token,params,source,reply,udp_host,udp_port);
                break;
                // L <SOURCE> <CHANNEL> :<REASON>
                // User parting a channel