X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=b1aedde73132f856334235d52ce0967fff4b1969;hb=2df3ad5cfeaea6ca095695fa4b3c786ee8237080;hp=962badfb04f754c0a1904dba3067e01c99b28f74;hpb=d33d0fd990b216f64529bf2cd4f6804829a9f5c3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 962badfb0..b1aedde73 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -632,7 +632,6 @@ void WriteFrom(int sock, userrec *user,char* text, ...) chop(tb); if (sock != -1) { - log(DEBUG,"DATAOUT: %s",tb); write(sock,tb,bytes > 514 ? 514 : bytes); } } @@ -822,7 +821,8 @@ void WriteCommon(userrec *u, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - WriteFrom(u->fd,u,"%s",textbuffer); + // FIX: Stops a message going to the same person more than once + std::vector already_sent; for (int i = 0; i < MAXCHANS; i++) { @@ -833,11 +833,29 @@ void WriteCommon(userrec *u, char* text, ...) { char* o = (*ulist)[j]; userrec* otheruser = (userrec*)o; - log(DEBUG,"WriteCommon: Sending to: %s",otheruser->nick); - WriteFrom(otheruser->fd,u,"%s",textbuffer); + bool do_send = true; + for (int t = 0; t < already_sent.size(); t++) + { + if (already_sent[t] == otheruser->fd) + { + do_send = false; + break; + } + } + if (do_send) + { + already_sent.push_back(otheruser->fd); + WriteFrom(otheruser->fd,u,"%s",textbuffer); + } } } } + // if the user was not in any channels, no users will receive the text. Make sure the user + // receives their OWN message for WriteCommon + if (!already_sent.size()) + { + WriteFrom(u->fd,u,"%s",textbuffer); + } } /* write a formatted string to all users who share at least one common @@ -862,6 +880,8 @@ void WriteCommonExcept(userrec *u, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); + std::vector already_sent; + for (int i = 0; i < MAXCHANS; i++) { if (u->chans[i].channel) @@ -872,7 +892,22 @@ void WriteCommonExcept(userrec *u, char* text, ...) char* o = (*ulist)[j]; userrec* otheruser = (userrec*)o; if (u != otheruser) - WriteFrom(otheruser->fd,u,"%s",textbuffer); + { + bool do_send = true; + for (int t = 0; t < already_sent.size(); t++) + { + if (already_sent[t] == otheruser->fd) + { + do_send = false; + break; + } + } + if (do_send) + { + already_sent.push_back(otheruser->fd); + WriteFrom(otheruser->fd,u,"%s",textbuffer); + } + } } } } @@ -2649,18 +2684,45 @@ void ConnectUser(userrec *user) } } -void handle_version(char **parameters, int pcnt, userrec *user) +std::string GetVersionString() { - char Revision[] = "$Revision$"; + char Revision[] = "$Revision$"; + char versiondata[MAXBUF]; + char *s1 = Revision; + char *savept; + char *v2 = strtok_r(s1," ",&savept); + s1 = savept; + v2 = strtok_r(s1," ",&savept); + s1 = savept; + snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s (O=%lu)",VERSION,v2,ServerName,SYSTEM,(unsigned long)OPTIMISATION); + return versiondata; +} - char *s1 = Revision; - char *savept; - char *v2 = strtok_r(s1," ",&savept); - s1 = savept; - v2 = strtok_r(s1," ",&savept); - s1 = savept; - - WriteServ(user->fd,"351 %s :%s Rev. %s %s :%s (O=%lu)",user->nick,VERSION,v2,ServerName,SYSTEM,(unsigned long)OPTIMISATION); +void handle_version(char **parameters, int pcnt, userrec *user) +{ + if (!pcnt) + { + WriteServ(user->fd,"351 %s :%s",user->nick,GetVersionString().c_str()); + } + else + { + for (int j = 0; j < 32; j++) + { + if (me[j] != NULL) + { + for (int x = 0; x < me[j]->connectors.size(); x++) + { + if (match(me[j]->connectors[x].GetServerName().c_str(),parameters[0])) + { + WriteServ(user->fd,"351 %s :%s",user->nick,me[j]->connectors[x].GetVersionString().c_str()); + return; + } + } + } + } + WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]); + } + return; } @@ -3276,6 +3338,30 @@ void DoSync(serverrec* serv, char* tcp_host) snprintf(data,MAXBUF,"Y %lu",(unsigned long)TIME); serv->SendPacket(data,tcp_host); // send users and channels + + NetSendMyRoutingTable(); + + // send all routing table and uline voodoo. The ordering of these commands is IMPORTANT! + for (int j = 0; j < 32; j++) + { + if (me[j] != NULL) + { + for (int k = 0; k < me[j]->connectors.size(); k++) + { + if (is_uline(me[j]->connectors[k].GetServerName().c_str())) + { + snprintf(data,MAXBUF,"H %s",me[j]->connectors[k].GetServerName().c_str()); + serv->SendPacket(data,tcp_host); + } + } + } + } + + // send our version for the remote side to cache + snprintf(data,MAXBUF,"v %s %s",ServerName,GetVersionString().c_str()); + serv->SendPacket(data,tcp_host); + + // sync the users and channels, give the modules a look-in. for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) { snprintf(data,MAXBUF,"N %lu %s %s %s %s +%s %s %s :%s",(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->ip,u->second->server,u->second->fullname); @@ -3331,22 +3417,6 @@ void DoSync(serverrec* serv, char* tcp_host) // sync global zlines, glines, etc sync_xlines(serv,tcp_host); - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (is_uline(me[j]->connectors[k].GetServerName().c_str())) - { - snprintf(data,MAXBUF,"H %s",me[j]->connectors[k].GetServerName().c_str()); - serv->SendPacket(data,tcp_host); - NetSendMyRoutingTable(); - } - } - } - } - snprintf(data,MAXBUF,"F %lu",(unsigned long)TIME); serv->SendPacket(data,tcp_host); log(DEBUG,"Sent sync"); @@ -3793,7 +3863,7 @@ int InspIRCd(void) tvs.tv_sec = 0; tv.tv_sec = 0; tv.tv_usec = 10000L; - char data[10240]; + char data[65535]; timeval tval; fd_set sfd; tval.tv_usec = 10000L; @@ -3995,9 +4065,7 @@ int InspIRCd(void) result = EAGAIN; if ((count2a->second->fd != FD_MAGIC_NUMBER) && (count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd))) { - memset(data, 0, 10240); - result = read(count2a->second->fd, data, 10240); - + result = read(count2a->second->fd, data, 65535); if (result) { // perform a check on the raw buffer as an array (not a string!) to remove @@ -4008,40 +4076,53 @@ int InspIRCd(void) if ((data[checker] == 0) || (data[checker] == 7)) data[checker] = ' '; } + if (result > 0) + data[result] = '\0'; userrec* current = count2a->second; int currfd = current->fd; - char* l = strtok(data,"\n"); int floodlines = 0; - while (l) + current->AddBuffer(data); + if (current->recvq.length() > NetBufferSize) { - floodlines++; - if ((floodlines > current->flood) && (current->flood != 0)) + if (current->registered == 7) { - log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - kill_link(current,"Excess flood"); - goto label; + kill_link(current,"RecvQ exceeded"); } - char sanitized[NetBufferSize]; - memset(sanitized, 0, NetBufferSize); - int ptt = 0; - for (int pt = 0; pt < strlen(l); pt++) + else + { + add_zline(120,ServerName,"Flood from unregistered connection",current->ip); + apply_lines(); + } + goto label; + } + // while there are complete lines to process... + while (current->BufferIsReady()) + { + floodlines++; + if ((floodlines > current->flood) && (current->flood != 0)) { - if (l[pt] != '\r') + if (current->registered == 7) + { + log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + kill_link(current,"Excess flood"); + } + else { - sanitized[ptt++] = l[pt]; + add_zline(120,ServerName,"Flood from unregistered connection",current->ip); + apply_lines(); } + goto label; } - sanitized[ptt] = '\0'; + char sanitized[MAXBUF]; + // use GetBuffer to copy single lines into the sanitized string + strlcpy(sanitized,current->GetBuffer().c_str(),MAXBUF); if (*sanitized) { - - // we're gonna re-scan to check if the nick is gone, after every // command - if it has, we're gonna bail bool find_again = false; process_buffer(sanitized,current); - // look for the user's record in case it's changed for (user_hash::iterator c2 = clientlist.begin(); c2 != clientlist.end(); c2++) { @@ -4057,7 +4138,6 @@ int InspIRCd(void) goto label; } - l = strtok(NULL,"\n"); } goto label; }