if (Config->GetIOHook(cu->port))
{
int result2 = 0;
- int MOD_RESULT = Config->GetIOHook(cu->port)->OnRawSocketRead(cu->fd,data,65535,result2);
- log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
+ int MOD_RESULT = 0;
+ try
+ {
+ MOD_RESULT = Config->GetIOHook(cu->port)->OnRawSocketRead(cu->fd,data,65535,result2);
+ log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
+ }
+ catch (ModuleException& modexcept)
+ {
+ log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+ }
if (MOD_RESULT < 0)
{
- result = EAGAIN;
+ result = -EAGAIN;
}
else
{
result = cu->ReadData(data, 65535);
}
log(DEBUG,"Read result: %d",result);
- if (result)
+ if ((result) && (result != -EAGAIN))
{
ServerInstance->stats->statsRecv += result;
// perform a check on the raw buffer as an array (not a string!) to remove
{
// AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good.
if (current->registered == 7)
- {
- kill_link(current,"RecvQ exceeded");
+ {
+ // Make sure they arn't flooding long lines.
+ if (TIME > current->reset_due)
+ {
+ current->reset_due = TIME + current->threshold;
+ current->lines_in = 0;
+ }
+ current->lines_in++;
+ 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);
+ kill_link(current,"Excess flood");
+ return;
+ } else {
+ WriteServ(currfd, "NOTICE %s :Your previous line was too long and was not delivered (Over 512chars) Please shorten it.", current->nick);
+ current->recvq = "";
+ }
}
else
{
- WriteOpers("*** Excess flood from %s",current->ip);
- log(DEFAULT,"Excess flood from: %s",current->ip);
- add_zline(120,Config->ServerName,"Flood from unregistered connection",current->ip);
+ WriteOpers("*** Excess flood from %s",(char*)inet_ntoa(current->ip4));
+ log(DEFAULT,"Excess flood from: %s",(char*)inet_ntoa(current->ip4));
+ add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4));
apply_lines(APPLY_ZLINES);
}
return;
}
else
{
- WriteOpers("*** Excess flood from %s",current->ip);
- log(DEFAULT,"Excess flood from: %s",current->ip);
- add_zline(120,Config->ServerName,"Flood from unregistered connection",current->ip);
+ WriteOpers("*** Excess flood from %s",(char*)inet_ntoa(current->ip4));
+ log(DEFAULT,"Excess flood from: %s",(char*)inet_ntoa(current->ip4));
+ add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4));
apply_lines(APPLY_ZLINES);
}
return;
}
else
{
- add_zline(120,Config->ServerName,"Flood from unregistered connection",current->ip);
+ add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4));
apply_lines(APPLY_ZLINES);
}
return;
}
}
// result EAGAIN means nothing read
- else if (result == EAGAIN)
+ else if ((result == EAGAIN) || (result == -EAGAIN))
{
}
else if (result == 0)
}
}
-/**
- * This function is called once a second from the mainloop.
- * It is intended to do background checking on all the user structs, e.g.
- * stuff like ping checks, registration timeouts, etc.
- * The function returns false when it is finished, and true if
- * it needs to be run again (e.g. it has processed one of a batch of
- * QUIT messages, but couldnt continue iterating because the iterator
- * became invalid). This function is also responsible for checking
- * if InspSocket derived classes are timed out.
- */
-bool DoBackgroundUserStuff(time_t TIME)
+void DoSocketTimeouts(time_t TIME)
{
unsigned int numsockets = module_sockets.size();
- SocketEngine* SE = ServerInstance->SE;
+ SocketEngine* SE = ServerInstance->SE;
for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
{
InspSocket* s = (InspSocket*)*a;
}
if (module_sockets.size() != numsockets) break;
}
+}
+
+/**
+ * This function is called once a second from the mainloop.
+ * It is intended to do background checking on all the user structs, e.g.
+ * stuff like ping checks, registration timeouts, etc. This function is
+ * also responsible for checking if InspSocket derived classes are timed out.
+ */
+void DoBackgroundUserStuff(time_t TIME)
+{
CullList* GlobalGoners = new CullList();
for (std::vector<userrec*>::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++)
{
if (*count2)
curr = (userrec*)(*count2);
if ((long)curr == -1)
- return false;
+ return;
if (curr)
{
continue;
}
// It's time to PING this user. Send them a ping.
- // XXX: We were checking isnick() here -- why when we check curr->registered? - Brain
if ((TIME > curr->nping) && (curr->registered == 7))
{
// This user didn't answer the last ping, remove them
curr->lastping = 0;
curr->nping = TIME+curr->pingmax;
}
- // XXX: We can flush the write buffer as the last thing we do, because if they
+ // 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() != "")
/** Free to memory used
*/
delete GlobalGoners;
- /** XXX: The old system prior to 1.0RC2 would call this function
- * repeatedly until everything was ship-shape, however now we are
- * using CullList to avoid bailing from the loop, so this is no
- * longer required. We always return false here so this only executes
- * once. At some future date the while loop may be removed from
- * the mainloop which calls this function.
- */
- return false;
+ return;
}
void OpenLog(char** argv, int argc)
projects / user / henk / code / inspircd.git / blobdiff