{
userrec *current;
int currfd;
- int floodlines;
+ int floodlines = 0;
ServerInstance->stats->statsRecv += result;
/*
* perform a check on the raw buffer as an array (not a string!) to remove
- * characters 0 and 7 which are illegal in the RFC - replace them with spaces.
- * hopefully this should stop even more people whining about "Unknown command: *"
- */
-
- /*
- * XXX - potential replacement for the below using my beloved pointers. --w00t
+ * character 0 which is illegal in the RFC - replace them with spaces.
* XXX - no garauntee there's not \0's in the middle of the data,
* and no reason for it to be terminated either. -- Om
- *
- * for (char *c = data; data && *data; data++)
- * {
- * if (*data == 0 || *data == 7)
- * data = ' ';
- * }
*/
for (int checker = 0; checker < result; checker++)
{
- if ((data[checker] == 0) || (data[checker] == 7))
+ if (data[checker] == 0)
data[checker] = ' ';
}
current = cu;
currfd = current->fd;
- floodlines = 0;
// add the data to the users buffer
if (result > 0)
// while there are complete lines to process...
while (current->BufferIsReady())
{
- char sanitized[MAXBUF];
-
- floodlines++;
if (TIME > current->reset_due)
{
current->reset_due = TIME + current->threshold;
current->lines_in = 0;
}
- current->lines_in++;
-
- if (current->lines_in > current->flood)
+ if (++current->lines_in > current->flood)
{
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);
return;
}
- if ((floodlines > current->flood) && (current->flood != 0))
+ if ((++floodlines > current->flood) && (current->flood != 0))
{
if (current->registered == 7)
{
std::string single_line = current->GetBuffer();
current->bytes_in += single_line.length();
current->cmds_in++;
- strlcpy(sanitized,single_line.c_str(),511);
-
- if (*sanitized)
+ if (single_line.length() > 512)
+ single_line.resize(512);
+
+ userrec* old_comp = fd_ref_table[currfd];
+
+ ServerInstance->Parser->ProcessBuffer(single_line,current);
+ /*
+ * look for the user's record in case it's changed... if theyve quit,
+ * we cant do anything more with their buffer, so bail.
+ * there used to be an ugly, slow loop here. Now we have a reference
+ * table, life is much easier (and FASTER)
+ */
+ userrec* new_comp = fd_ref_table[currfd];
+ if ((currfd < 0) || (!fd_ref_table[currfd]) || (old_comp != new_comp))
{
- userrec* old_comp = fd_ref_table[currfd];
-
- ServerInstance->Parser->ProcessBuffer(sanitized,current);
- /*
- * look for the user's record in case it's changed... if theyve quit,
- * we cant do anything more with their buffer, so bail.
- * there used to be an ugly, slow loop here. Now we have a reference
- * table, life is much easier (and FASTER)
- */
- userrec* new_comp = fd_ref_table[currfd];
- if ((currfd < 0) || (!fd_ref_table[currfd]) || (old_comp != new_comp))
- {
- return;
- }
- else
- {
- /* The user is still here, flush their buffer */
- current->FlushWriteBuf();
- }
+ return;
+ }
+ else
+ {
+ /* The user is still here, flush their buffer */
+ current->FlushWriteBuf();
}
}
{
CullList GlobalGoners;
- for (std::vector<userrec*>::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++)
+ int cfd = 0;
+
+ /* XXX: IT IS NOT SAFE TO USE AN ITERATOR HERE. DON'T EVEN THINK ABOUT IT. */
+ for (unsigned long count2 = 0; count2 != local_users.size(); count2++)
{
- /* Sanity checks for corrupted iterators (yes, really) */
- userrec* curr = NULL;
+ if (count2 >= local_users.size())
+ break;
- if (*count2)
- curr = (userrec*)(*count2);
- if ((long)curr == -1)
- return;
+ userrec* curr = local_users[count2];
if (curr)
{
- /*
- * registration timeout -- didnt send USER/NICK/HOST
- * in the time specified in their connection class.
- */
- if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != 7))
- {
- log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick);
- GlobalGoners.AddItem(curr,"Registration timeout");
- continue;
- }
-
- /*
- * user has signed on with USER/NICK/PASS, and dns has completed, all the modules
- * say this user is ok to proceed, fully connect them.
- */
- if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr)))
- {
- curr->dns_done = true;
- ServerInstance->stats->statsDnsBad++;
- FullConnectUser(curr,&GlobalGoners);
- continue;
- }
+ cfd = curr->fd;
- if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr)))
+ if ((cfd > 0) && (cfd < MAX_DESCRIPTORS) && (fd_ref_table[cfd] == curr) && (curr))
{
- log(DEBUG,"dns done, registered=3, and modules ready, OK");
- FullConnectUser(curr,&GlobalGoners);
- continue;
- }
-
- // It's time to PING this user. Send them a ping.
- if ((TIME > curr->nping) && (curr->registered == 7))
- {
- // This user didn't answer the last ping, remove them
- if (!curr->lastping)
+ /*
+ * registration timeout -- didnt send USER/NICK/HOST
+ * in the time specified in their connection class.
+ */
+ if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != 7))
{
- GlobalGoners.AddItem(curr,"Ping timeout");
+ log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick);
+ ZapThisDns(curr->fd);
+ GlobalGoners.AddItem(curr,"Registration timeout");
continue;
}
- Write(curr->fd,"PING :%s",Config->ServerName);
- curr->lastping = 0;
- curr->nping = TIME+curr->pingmax;
+ /*
+ * user has signed on with USER/NICK/PASS, and dns has completed, all the modules
+ * say this user is ok to proceed, fully connect them.
+ */
+ if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr)))
+ {
+ curr->dns_done = true;
+ ZapThisDns(curr->fd);
+ ServerInstance->stats->statsDnsBad++;
+ FullConnectUser(curr,&GlobalGoners);
+ continue;
+ }
+
+ if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr)))
+ {
+ log(DEBUG,"dns done, registered=3, and modules ready, OK");
+ FullConnectUser(curr,&GlobalGoners);
+ ZapThisDns(curr->fd);
+ continue;
+ }
+
+ // It's time to PING this user. Send them a ping.
+ if ((TIME > curr->nping) && (curr->registered == 7))
+ {
+ // This user didn't answer the last ping, remove them
+ if (!curr->lastping)
+ {
+ GlobalGoners.AddItem(curr,"Ping timeout");
+ curr->lastping = 1;
+ curr->nping = TIME+curr->pingmax;
+ continue;
+ }
+
+ Write(curr->fd,"PING :%s",Config->ServerName);
+ curr->lastping = 0;
+ curr->nping = TIME+curr->pingmax;
+ }
}
/*
* We can flush the write buffer as the last thing we do, because if they
* match any of the above conditions its no use flushing their buffer anyway.
*/
- curr->FlushWriteBuf();
- if (*curr->GetWriteError())
+ /* Check again that theyre still here (something above may have changed that) */
+ if ((cfd > 0) && (cfd < MAX_DESCRIPTORS) && (fd_ref_table[cfd] == curr) && (curr))
{
- GlobalGoners.AddItem(curr,curr->GetWriteError());
- continue;
+ curr->FlushWriteBuf();
+ if (*curr->GetWriteError())
+ {
+ GlobalGoners.AddItem(curr,curr->GetWriteError());
+ continue;
+ }
}
}
}
projects / user / henk / code / inspircd.git / blobdiff