* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
* E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
#include "inspircd_config.h"
#include "inspircd.h"
#include "inspircd_io.h"
-#include "inspircd_util.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/errno.h>
#include "helperfuncs.h"
#include "hashcomp.h"
#include "socketengine.h"
+#include "userprocess.h"
#include "typedefs.h"
+#include "command_parse.h"
+#include "cull_list.h"
extern int MODCOUNT;
extern struct sockaddr_in client,server;
extern std::vector<InspSocket*> module_sockets;
extern time_t TIME;
extern time_t OLDTIME;
+extern std::vector<userrec*> local_users;
extern InspIRCd* ServerInstance;
-extern SocketEngine* SE;
-extern serverstats* stats;
extern ServerConfig *Config;
-
-extern userrec* fd_ref_table[65536];
+extern userrec* fd_ref_table[MAX_DESCRIPTORS];
char data[65536];
extern user_hash clientlist;
void ProcessUser(userrec* cu)
{
int result = EAGAIN;
+ if (cu->fd == FD_MAGIC_NUMBER)
+ return;
log(DEBUG,"Processing user with fd %d",cu->fd);
- int MOD_RESULT = 0;
- int result2 = 0;
- FOREACH_RESULT(OnRawSocketRead(cu->fd,data,65535,result2));
- if (!MOD_RESULT)
- {
- result = cu->ReadData(data, 65535);
- }
- else
- {
- log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
- result = result2;
- }
+ if (Config->GetIOHook(cu->port))
+ {
+ int result2 = 0;
+ 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;
+ }
+ else
+ {
+ result = result2;
+ }
+ }
+ else
+ {
+ result = cu->ReadData(data, 65535);
+ }
log(DEBUG,"Read result: %d",result);
- if (result)
+ if ((result) && (result != -EAGAIN))
{
- stats->statsRecv += result;
+ 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: *"
{
// 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;
userrec* old_comp = fd_ref_table[currfd];
// we're gonna re-scan to check if the nick is gone, after every
// command - if it has, we're gonna bail
- process_buffer(sanitized,current);
+ 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
}
}
// 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;
for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
{
InspSocket* s = (InspSocket*)*a;
}
if (module_sockets.size() != numsockets) break;
}
- /* TODO: We need a seperate hash containing only local users for this
- */
- for (user_hash::iterator count2 = clientlist.begin(); count2 != clientlist.end(); count2++)
+}
+
+/**
+ * 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++)
{
/* Sanity checks for corrupted iterators (yes, really) */
userrec* curr = NULL;
- if (count2->second)
- curr = count2->second;
+ if (*count2)
+ curr = (userrec*)(*count2);
if ((long)curr == -1)
- return false;
+ return;
- if ((curr) && (curr->fd != 0)) /* XXX - why are we checking fd != 0? --w00t */
+ if (curr)
{
- int currfd = curr->fd;
- // we don't check the state of remote users.
- if (IS_LOCAL(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))
{
- curr->FlushWriteBuf();
- if (curr->GetWriteError() != "")
- {
- log(DEBUG,"InspIRCd: write error: %s",curr->GetWriteError().c_str());
- kill_link(curr,curr->GetWriteError().c_str());
- return true;
- }
- // 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);
- kill_link(curr,"Registration timeout");
- return true;
- }
- if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr)))
- {
- log(DEBUG,"signon exceed, registered=3, and modules ready, OK: %d %d",TIME,curr->signon);
- curr->dns_done = true;
- stats->statsDnsBad++;
- FullConnectUser(curr);
- if (fd_ref_table[currfd] != curr) // something changed, bail pronto
- return true;
- }
- if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr)))
- {
- log(DEBUG,"dns done, registered=3, and modules ready, OK");
- FullConnectUser(curr);
- if (fd_ref_table[currfd] != curr) // something changed, bail pronto
- return true;
- }
- if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7))
- {
- if ((!curr->lastping) && (curr->registered == 7))
- {
- log(DEBUG,"InspIRCd: ping timeout: %s",curr->nick);
- kill_link(curr,"Ping timeout");
- return true;
- }
- Write(curr->fd,"PING :%s",Config->ServerName);
- log(DEBUG,"InspIRCd: pinging: %s",curr->nick);
- curr->lastping = 0;
- curr->nping = TIME+curr->pingmax; // was hard coded to 120
- }
+ 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;
+ }
+ if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(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)
+ {
+ GlobalGoners->AddItem(curr,"Ping timeout");
+ 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() != "")
+ {
+ GlobalGoners->AddItem(curr,curr->GetWriteError());
+ continue;
+ }
}
}
- return false;
+ /** Remove all the queued users who are due to be quit
+ */
+ GlobalGoners->Apply();
+ /** Free to memory used
+ */
+ delete GlobalGoners;
+ return;
}
void OpenLog(char** argv, int argc)
{
- std::string logpath = GetFullProgDir(argv,argc) + "/ircd.log";
- Config->log_file = fopen(logpath.c_str(),"a+");
+ if (Config->logpath == "")
+ {
+ Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log";
+ }
+ Config->log_file = fopen(Config->logpath.c_str(),"a+");
if (!Config->log_file)
{
- printf("ERROR: Could not write to logfile %s, bailing!\n\n",logpath.c_str());
+ printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
Exit(ERROR);
}
-#ifdef IS_CYGWIN
- printf("Logging to ircd.log...\n");
-#else
- printf("Logging to %s...\n",logpath.c_str());
-#endif
}
}
}
-void LoadAllModules()
+void LoadAllModules(InspIRCd* ServerInstance)
{
/* We must load the modules AFTER initializing the socket engine, now */
MODCOUNT = -1;
{
Config->ConfValue("module","name",count,configToken,&Config->config_f);
printf("Loading module... \033[1;32m%s\033[0m\n",configToken);
- if (!LoadModule(configToken))
+ if (!ServerInstance->LoadModule(configToken))
{
log(DEFAULT,"Exiting due to a module loader error.");
- printf("\nThere was an error loading a module: %s\n\nYou might want to do './inspircd start' instead of 'bin/inspircd'\n\n",ModuleError());
+ printf("\nThere was an error loading a module: %s\n\nYou might want to do './inspircd start' instead of 'bin/inspircd'\n\n",ServerInstance->ModuleError());
Exit(0);
}
}
projects / user / henk / code / inspircd.git / blobdiff