From c597795590536f96434913dbe3ba9026081d445e Mon Sep 17 00:00:00 2001 From: brain Date: Sat, 10 Apr 2004 20:24:05 +0000 Subject: [PATCH] Added 'm' datagram type (user mode change) git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@507 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/InspIRCd.layout | 10 +- src/inspircd.cpp | 281 +++++++++++++++++++++++++++++++++++++++ src/modules/m_sanick.cpp | 4 +- 3 files changed, 289 insertions(+), 6 deletions(-) diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout index 8bb00c7f9..24d296dee 100644 --- a/src/InspIRCd.layout +++ b/src/InspIRCd.layout @@ -13,9 +13,9 @@ LeftChar=1 [Editor_1] Open=1 Top=1 -CursorCol=2 -CursorRow=5738 -TopLine=5702 +CursorCol=11 +CursorRow=6026 +TopLine=5977 LeftChar=1 [Editor_2] @@ -232,8 +232,8 @@ LeftChar=1 [Editor_29] Open=1 Top=0 -CursorCol=49 -CursorRow=9 +CursorCol=70 +CursorRow=21 TopLine=1 LeftChar=1 [Editor_30] diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 234dd0eb4..204c6a74f 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -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,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 (iMAXMODES) + { + 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,true,true); + } +} + + + /* This function pokes and hacks at a parameter list like the following: * * PART #winbot, #darkgalaxy :m00! @@ -5612,6 +5856,8 @@ void DoSync(serverrec* serv, char* udp_host,int udp_port, long MyKey) { char data[MAXBUF]; // send start of sync marker: Y + // 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 @@ -5646,6 +5892,7 @@ void DoSync(serverrec* serv, char* udp_host,int udp_port, long MyKey) // send end of sync marker: E 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 } @@ -5752,6 +5999,40 @@ 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) +{ + char* pars[128]; + char original[MAXBUF],target[MAXBUF]; + strncpy(original,params,MAXBUF); + int index = 0; + + char* src = strtok(params," "); + userrec* user = Find(src); + + if (user) + { + char* parameter = strtok(NULL," "); + strncpy(target,parameter,MAXBUF); + while (parameter) + { + pars[index++] = parameter; + parameter = strtok(NULL," "); + } + merge_mode2(pars,--index,user); + if (FindChan(target)) + { + WriteChannelLocal(FindChan(target), user, "MODE %s",original); + } + if (Find(target)) + { + WriteTo(user,Find(target),"MODE %s",original); + } + } +} + + void handle_L(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port) { char* nick = strtok(params," "); diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp index a95caa028..1452c1376 100644 --- a/src/modules/m_sanick.cpp +++ b/src/modules/m_sanick.cpp @@ -17,7 +17,9 @@ void handle_sanick(char **parameters, int pcnt, userrec *user) { if (Srv->IsNick(std::string(parameters[1]))) { - Srv->SendOpers(std::string(user->nick)+" used SANICK to change "+std::string(source->nick)+" to "+parameters[1]); + // FIX by brain: Cant use source->nick here because if it traverses a server link then + // source->nick becomes invalid as the object data moves in memory. + Srv->SendOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]); Srv->ChangeUserNick(source,std::string(parameters[1])); } } -- 2.39.5