* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ * Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
* E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
#ifdef USE_EPOLL
#include <sys/epoll.h>
-#define EP_DELAY 50
+#define EP_DELAY 5
#endif
#include <time.h>
#include <vector>
#include <deque>
#include <sched.h>
-#include "connection.h"
+#ifdef THREADED_DNS
+#include <pthread.h>
+#endif
#include "users.h"
-#include "servers.h"
#include "ctables.h"
#include "globals.h"
#include "modules.h"
#include "dnsqueue.h"
#include "helperfuncs.h"
#include "hashcomp.h"
+#include "socketengine.h"
+#include "socket.h"
+#include "dns.h"
int LogLevel = DEFAULT;
char ServerName[MAXBUF];
std::vector<std::string> module_names;
extern std::vector<ircd_module*> factory;
+std::vector<InspSocket*> module_sockets;
+
extern int MODCOUNT;
int openSockfd[MAXSOCKS];
bool nofork = false;
int statsAccept = 0, statsRefused = 0, statsUnknown = 0, statsCollisions = 0, statsDns = 0, statsDnsGood = 0, statsDnsBad = 0, statsConnects = 0, statsSent= 0, statsRecv = 0;
-serverrec* me[32];
+Server* MyServer = new Server;
FILE *log_file;
char MyExecutable[1024];
int boundPortCount = 0;
int portCount = 0, SERVERportCount = 0, ports[MAXSOCKS];
-int defaultRoute = 0;
+
char ModPath[MAXBUF];
/* prototypes */
bool IsDenied(userrec *user);
void AddWhoWas(userrec* u);
-std::vector<long> auth_cookies;
std::stringstream config_f(stringstream::in | stringstream::out);
std::vector<userrec*> all_opers;
if (*a == servername)
return a->c_str();
}
- return "";
+ AddServerName(servername);
+ return FindServerNamePtr(servername);
}
void DeleteOper(userrec* user)
}
else
{
- WriteOpers("There were errors in the configuration file:",user->nick);
+ WriteOpers("There were errors in the configuration file:");
while (!errstr.eof())
{
errstr.getline(dataline,1024);
if (!FindChan(cname))
{
- MOD_RESULT = 0;
- FOREACH_RESULT(OnUserPreJoin(user,NULL,cname));
- if (MOD_RESULT == 1) {
- return NULL;
+ if (!strcasecmp(ServerName,user->server))
+ {
+ MOD_RESULT = 0;
+ FOREACH_RESULT(OnUserPreJoin(user,NULL,cname));
+ if (MOD_RESULT == 1) {
+ return NULL;
+ }
}
/* create a new one */
{
log(DEBUG,"add_channel: joining to: %s",Ptr->name);
- // the override flag allows us to bypass channel modes
+ // remote users are allowed us to bypass channel modes
// and bans (used by servers)
- if ((!override) || (!strcasecmp(user->server,ServerName)))
+ if (!strcasecmp(ServerName,user->server))
{
log(DEBUG,"Not overriding...");
MOD_RESULT = 0;
Ptr->AddUser((char*)user);
WriteChannel(Ptr,user,"JOIN :%s",Ptr->name);
- if (!override) // we're not overriding... so this isnt part of a netburst, broadcast it.
- {
- // use the stamdard J token with no privilages.
- char buffer[MAXBUF];
- if (created == 2)
- {
- snprintf(buffer,MAXBUF,"J %s @%s",user->nick,Ptr->name);
- }
- else
- {
- snprintf(buffer,MAXBUF,"J %s %s",user->nick,Ptr->name);
- }
- NetSendToAll(buffer);
- }
-
log(DEBUG,"Sent JOIN to client");
if (Ptr->topicset)
if (reason)
{
WriteChannel(Ptr,user,"PART %s :%s",Ptr->name, reason);
-
- if (!local)
- {
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"L %s %s :%s",user->nick,Ptr->name,reason);
- NetSendToAll(buffer);
- }
-
-
}
else
{
- if (!local)
- {
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"L %s %s :",user->nick,Ptr->name);
- NetSendToAll(buffer);
- }
-
WriteChannel(Ptr,user,"PART :%s",Ptr->name);
}
user->chans[i].uc_modes = 0;
int MOD_RESULT = 0;
FOREACH_RESULT(OnAccessCheck(src,user,Ptr,AC_KICK));
- if (MOD_RESULT == ACR_DENY)
+ if ((MOD_RESULT == ACR_DENY) && (!is_uline(src->server)))
return;
- if (MOD_RESULT == ACR_DEFAULT)
+ if ((MOD_RESULT == ACR_DEFAULT) || (!is_uline(src->server)))
{
- if (((cstatus(src,Ptr) < STATUS_HOP) || (cstatus(src,Ptr) < cstatus(user,Ptr))) && (!is_uline(src->server)))
+ if ((cstatus(src,Ptr) < STATUS_HOP) || (cstatus(src,Ptr) < cstatus(user,Ptr)))
{
if (cstatus(src,Ptr) == STATUS_HOP)
{
}
}
- MOD_RESULT = 0;
- FOREACH_RESULT(OnUserPreKick(src,user,Ptr,reason));
- if (MOD_RESULT)
- return;
+ if (!is_uline(src->server))
+ {
+ MOD_RESULT = 0;
+ FOREACH_RESULT(OnUserPreKick(src,user,Ptr,reason));
+ if (MOD_RESULT)
+ return;
+ }
FOREACH_MOD OnUserKick(src,user,Ptr,reason);
log(DEBUG,"closing fd %lu",(unsigned long)user->fd);
if (user->registered == 7) {
- FOREACH_MOD OnUserQuit(user);
+ FOREACH_MOD OnUserQuit(user,reason);
WriteCommonExcept(user,"QUIT :%s",reason);
-
- // Q token must go to ALL servers!!!
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"Q %s :%s",user->nick,reason);
- NetSendToAll(buffer);
}
user->FlushWriteBuf();
if (user->fd > -1)
{
FOREACH_MOD OnRawSocketClose(user->fd);
-#ifdef USE_KQUEUE
- struct kevent ke;
- EV_SET(&ke, user->fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
- int i = kevent(kq, &ke, 1, 0, 0, NULL);
- if (i == -1)
- {
- log(DEBUG,"kqueue: Failed to remove user from queue!");
- }
-#endif
-#ifdef USE_EPOLL
- struct epoll_event ev;
- ev.events = EPOLLIN | EPOLLET;
- ev.data.fd = user->fd;
- int i = epoll_ctl(ep, EPOLL_CTL_DEL, user->fd, &ev);
- if (i < 0)
- {
- log(DEBUG,"epoll: List deletion failure!");
- }
-#endif
+ engine_delete_fd;
user->CloseSocket();
}
user->FlushWriteBuf();
if (user->registered == 7) {
- FOREACH_MOD OnUserQuit(user);
+ FOREACH_MOD OnUserQuit(user,reason);
WriteCommonExcept(user,"QUIT :%s",reason);
-
- // Q token must go to ALL servers!!!
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"Q %s :%s",user->nick,reason);
- NetSendToAll(buffer);
}
FOREACH_MOD OnUserDisconnect(user);
if (user->fd > -1)
{
FOREACH_MOD OnRawSocketClose(user->fd);
-#ifdef USE_KQUEUE
- struct kevent ke;
- EV_SET(&ke, user->fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
- int i = kevent(kq, &ke, 1, 0, 0, NULL);
- if (i == -1)
- {
- log(DEBUG,"kqueue: Failed to remove user from queue!");
- }
-#endif
-#ifdef USE_EPOLL
- struct epoll_event ev;
- ev.events = EPOLLIN | EPOLLET;
- ev.data.fd = user->fd;
- int i = epoll_ctl(ep, EPOLL_CTL_DEL, user->fd, &ev);
- if (i < 0)
- {
- log(DEBUG,"epoll: List deletion failure!");
- }
-#endif
+ engine_delete_fd;
user->CloseSocket();
}
}
+/*void *task(void *arg)
+{
+ for (;;) {
+ cout << (char *)arg;
+ cout.flush();
+ }
+ return NULL;
+}*/
+
int main(int argc, char** argv)
{
Start();
}
}
}
+
strlcpy(MyExecutable,argv[0],MAXBUF);
// initialize the lowercase mapping table
}
}
+#ifdef THREADED_DNS
+void* dns_task(void* arg)
+{
+ userrec* u = (userrec*)arg;
+ log(DEBUG,"DNS thread for user %s",u->nick);
+ DNS dns1;
+ DNS dns2;
+ std::string host;
+ std::string ip;
+ if (dns1.ReverseLookup(u->ip))
+ {
+ log(DEBUG,"DNS Step 1");
+ while (!dns1.HasResult())
+ {
+ usleep(100);
+ }
+ host = dns1.GetResult();
+ if (host != "")
+ {
+ log(DEBUG,"DNS Step 2: '%s'",host.c_str());
+ if (dns2.ForwardLookup(host))
+ {
+ while (!dns2.HasResult())
+ {
+ usleep(100);
+ }
+ ip = dns2.GetResultIP();
+ log(DEBUG,"DNS Step 3 '%s'(%d) '%s'(%d)",ip.c_str(),ip.length(),u->ip,strlen(u->ip));
+ if (ip == std::string(u->ip))
+ {
+ log(DEBUG,"DNS Step 4");
+ if (host.length() < 160)
+ {
+ log(DEBUG,"DNS Step 5");
+ strcpy(u->host,host.c_str());
+ strcpy(u->dhost,host.c_str());
+ }
+ }
+ }
+ }
+ }
+ u->dns_done = true;
+ return NULL;
+}
+#endif
/* add a client connection to the sockets list */
void AddClient(int socket, char* host, int port, bool iscached, char* ip)
}
}
fd_ref_table[socket] = clientlist[tempnick];
+ engine_add_fd;
-#ifdef USE_EPOLL
- struct epoll_event ev;
- log(DEBUG,"epoll: Adduser to events, ep=%d socket=%d",ep,socket);
- ev.events = EPOLLIN | EPOLLET;
- ev.data.fd = socket;
- int i = epoll_ctl(ep, EPOLL_CTL_ADD, socket, &ev);
- if (i < 0)
- {
- log(DEBUG,"epoll: List insertion failure!");
- }
-#endif
-#ifdef USE_KQUEUE
- struct kevent ke;
- log(DEBUG,"kqueue: Add user to events, kq=%d socket=%d",kq,socket);
- EV_SET(&ke, socket, EVFILT_READ, EV_ADD, 0, 0, NULL);
- int i = kevent(kq, &ke, 1, 0, 0, NULL);
- if (i == -1)
- {
- log(DEBUG,"kqueue: List insertion failure!");
- }
-
-#endif
+ // initialize their dns lookup thread
+ //if (pthread_create(&clientlist[tempnick]->dnsthread, NULL, dns_task, (void *)clientlist[tempnick]) != 0)
+ //{
+ // log(DEBUG,"Failed to create DNS lookup thread for user %s",clientlist[tempnick]->nick);
+ //}
}
/* shows the message of the day, and any other on-logon stuff */
}
}
- // fix by brain: move this below the xline checks to prevent spurious quits going onto the net that dont belong
- user->registered = 7;
WriteServ(user->fd,"NOTICE Auth :Welcome to \002%s\002!",Network);
WriteServ(user->fd,"001 %s :Welcome to the %s IRC Network %s!%s@%s",user->nick,Network,user->nick,user->ident,user->host);
WriteServ(user->fd,"004 %s %s %s iowghraAsORVSxNCWqBzvdHtGI lvhopsmntikrRcaqOALQbSeKVfHGCuzN",user->nick,ServerName,VERSION);
// the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
std::stringstream v;
- v << "MESHED WALLCHOPS MODES=13 CHANTYPES=# PREFIX=(ohv)@%+ MAP SAFELIST MAXCHANNELS=" << MAXCHANS;
+ v << "WALLCHOPS MODES=13 CHANTYPES=# PREFIX=(ohv)@%+ MAP SAFELIST MAXCHANNELS=" << MAXCHANS;
v << " MAXBANS=60 NICKLEN=" << NICKMAX;
v << " TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=20 AWAYLEN=" << MAXAWAY << " CHANMODES=ohvb,k,l,psmnti NETWORK=";
v << Network;
}
ShowMOTD(user);
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"N %lu %s %s %s %s +%s %s %s :%s",(unsigned long)user->age,user->nick,user->host,user->dhost,user->ident,user->modes,user->ip,ServerName,user->fullname);
- NetSendToAll(buffer);
-
- // fix by brain: these should be AFTER the N token, so other servers know what the HELL we're on about... :)
+ // fix 3 by brain, move registered = 7 below these so that spurious modes and host changes dont go out
+ // onto the network and produce 'fake direction'
FOREACH_MOD OnUserConnect(user);
FOREACH_MOD OnGlobalConnect(user);
+ user->registered = 7;
WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,user->ip);
}
s1 = savept;
v2 = strtok_r(s1," ",&savept);
s1 = savept;
-#ifdef USE_KQUEUE
- char socketengine[] = "kqueue";
-#endif
-#ifdef USE_SELECT
- char socketengine[] = "select";
-#endif
-#ifdef USE_EPOLL
- char socketengine[] = "epoll";
+ char socketengine[] = engine_name;
+#ifdef THREADED_DNS
+ char dnsengine[] = "multithread";
+#else
+ char dnsengine[] = "singlethread";
#endif
- snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s (O=%lu) [SE=%s]",VERSION,v2,ServerName,SYSTEM,(unsigned long)OPTIMISATION,socketengine);
+ snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s [FLAGS=%lu,%s,%s]",VERSION,v2,ServerName,SYSTEM,(unsigned long)OPTIMISATION,socketengine,dnsengine);
return versiondata;
}
void handle_version(char **parameters, int pcnt, userrec *user)
{
- if (!pcnt)
- {
- WriteServ(user->fd,"351 %s :%s",user->nick,GetVersionString().c_str());
- }
- else
+ WriteServ(user->fd,"351 %s :%s",user->nick,GetVersionString().c_str());
+}
+
+
+bool is_valid_cmd(const char* commandname, int pcnt, userrec * user)
+{
+ for (unsigned int i = 0; i < cmdlist.size(); i++)
{
- if (!strcmp(parameters[0],"*"))
+ if (!strcasecmp(cmdlist[i].command,commandname))
{
- for (int j = 0; j < 32; j++)
+ if (cmdlist[i].handler_function)
{
- if (me[j] != NULL)
+ if ((pcnt>=cmdlist[i].min_params) && (strcasecmp(cmdlist[i].source,"<core>")))
{
- for (unsigned int x = 0; x < me[j]->connectors.size(); x++)
+ if ((strchr(user->modes,cmdlist[i].flags_needed)) || (!cmdlist[i].flags_needed))
{
- WriteServ(user->fd,"351 %s :Server %d:%d (%s): %s",user->nick,j,x,me[j]->connectors[x].GetServerName().c_str(),me[j]->connectors[x].GetVersionString().c_str());
- }
- }
- }
- return;
- }
- if (match(ServerName,parameters[0]))
- {
- WriteServ(user->fd,"351 %s :%s",user->nick,GetVersionString().c_str());
- return;
- }
- bool displayed = false, found = false;
- for (int j = 0; j < 32; j++)
- {
- if (me[j] != NULL)
- {
- for (unsigned int x = 0; x < me[j]->connectors.size(); x++)
- {
- if (match(me[j]->connectors[x].GetServerName().c_str(),parameters[0]))
- {
- found = true;
- if ((me[j]->connectors[x].GetVersionString() != "") && (!displayed))
+ if (cmdlist[i].flags_needed)
{
- displayed = true;
- WriteServ(user->fd,"351 %s :%s",user->nick,me[j]->connectors[x].GetVersionString().c_str());
+ if ((user->HasPermission((char*)commandname)) || (is_uline(user->server)))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
}
+ return true;
}
}
}
}
- if ((!displayed) && (found))
- {
- WriteServ(user->fd,"402 %s %s :Server %s has no version information",user->nick,parameters[0],parameters[0]);
- return;
- }
- if (!found)
- {
- WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]);
- }
}
- return;
+ return false;
}
-
// calls a handler function for a command
void call_handler(const char* commandname,char **parameters, int pcnt, userrec *user)
{
- for (unsigned int i = 0; i < cmdlist.size(); i++)
+ for (unsigned int i = 0; i < cmdlist.size(); i++)
+ {
+ if (!strcasecmp(cmdlist[i].command,commandname))
{
- if (!strcasecmp(cmdlist[i].command,commandname))
+ if (cmdlist[i].handler_function)
{
- if (cmdlist[i].handler_function)
+ if (pcnt>=cmdlist[i].min_params)
{
- if (pcnt>=cmdlist[i].min_params)
+ if ((strchr(user->modes,cmdlist[i].flags_needed)) || (!cmdlist[i].flags_needed))
{
- if (strchr(user->modes,cmdlist[i].flags_needed))
+ if (cmdlist[i].flags_needed)
+ {
+ if ((user->HasPermission((char*)commandname)) || (is_uline(user->server)))
+ {
+ cmdlist[i].handler_function(parameters,pcnt,user);
+ }
+ }
+ else
{
cmdlist[i].handler_function(parameters,pcnt,user);
}
}
}
}
-}
-
-void DoSplitEveryone()
-{
- bool go_again = true;
- while (go_again)
- {
- go_again = false;
- for (int i = 0; i < 32; i++)
- {
- if (me[i] != NULL)
- {
- for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
- {
- if (strcasecmp(j->GetServerName().c_str(),ServerName))
- {
- j->routes.clear();
- j->CloseConnection();
- me[i]->connectors.erase(j);
- go_again = true;
- break;
- }
- }
- }
- }
- }
- log(DEBUG,"Removed server. Will remove clients...");
- // iterate through the userlist and remove all users on this server.
- // because we're dealing with a mesh, we dont have to deal with anything
- // "down-route" from this server (nice huh)
- go_again = true;
- char reason[MAXBUF];
- while (go_again)
- {
- go_again = false;
- for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- if (strcasecmp(u->second->server,ServerName))
- {
- snprintf(reason,MAXBUF,"%s %s",ServerName,u->second->server);
- kill_link(u->second,reason);
- go_again = true;
- break;
- }
- }
}
- has_been_netsplit = true;
}
-
void force_nickchange(userrec* user,const char* newnick)
{
char nick[MAXBUF];
}
}
-void DoSync(serverrec* serv, char* tcp_host)
-{
- char data[MAXBUF];
- log(DEBUG,"Sending sync");
- // send start of sync marker: Y <timestamp>
- // at this point the ircd receiving it starts broadcasting this netburst to all ircds
- // except the ones its receiving it from.
- snprintf(data,MAXBUF,"%s Y %lu",CreateSum().c_str(),(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 (unsigned int k = 0; k < me[j]->connectors.size(); k++)
- {
- if (is_uline(me[j]->connectors[k].GetServerName().c_str()))
- {
- snprintf(data,MAXBUF,"%s H %s",CreateSum().c_str(),me[j]->connectors[k].GetServerName().c_str());
- serv->SendPacket(data,tcp_host);
- }
- }
- }
- }
-
- // send our version for the remote side to cache
- snprintf(data,MAXBUF,"%s v %s %s",CreateSum().c_str(),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,"%s N %lu %s %s %s %s +%s %s %s :%s",CreateSum().c_str(),(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);
- serv->SendPacket(data,tcp_host);
- if (strchr(u->second->modes,'o'))
- {
- snprintf(data,MAXBUF,"%s | %s %s",CreateSum().c_str(),u->second->nick,u->second->oper);
- serv->SendPacket(data,tcp_host);
- }
- for (int i = 0; i <= MODCOUNT; i++)
- {
- string_list l = modules[i]->OnUserSync(u->second);
- for (unsigned int j = 0; j < l.size(); j++)
- {
- snprintf(data,MAXBUF,"%s %s",CreateSum().c_str(),l[j].c_str());
- serv->SendPacket(data,tcp_host);
- }
- }
- char* chl = chlist(u->second,u->second);
- if (strcmp(chl,""))
- {
- snprintf(data,MAXBUF,"%s J %s %s",CreateSum().c_str(),u->second->nick,chl);
- serv->SendPacket(data,tcp_host);
- }
- }
- // send channel modes, topics etc...
- for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++)
- {
- snprintf(data,MAXBUF,"M %s +%s",c->second->name,chanmodes(c->second));
- serv->SendPacket(data,tcp_host);
- for (int i = 0; i <= MODCOUNT; i++)
- {
- string_list l = modules[i]->OnChannelSync(c->second);
- for (unsigned int j = 0; j < l.size(); j++)
- {
- snprintf(data,MAXBUF,"%s %s",CreateSum().c_str(),l[j].c_str());
- serv->SendPacket(data,tcp_host);
- }
- }
- if (c->second->topic[0])
- {
- snprintf(data,MAXBUF,"%s T %lu %s %s :%s",CreateSum().c_str(),(unsigned long)c->second->topicset,c->second->setby,c->second->name,c->second->topic);
- serv->SendPacket(data,tcp_host);
- }
- // send current banlist
-
- for (BanList::iterator b = c->second->bans.begin(); b != c->second->bans.end(); b++)
- {
- snprintf(data,MAXBUF,"%s M %s +b %s",CreateSum().c_str(),c->second->name,b->data);
- serv->SendPacket(data,tcp_host);
- }
- }
- // sync global zlines, glines, etc
- sync_xlines(serv,tcp_host);
-
- snprintf(data,MAXBUF,"%s F %lu",CreateSum().c_str(),(unsigned long)TIME);
- serv->SendPacket(data,tcp_host);
- log(DEBUG,"Sent sync");
- // ircd sends its serverlist after the end of sync here
-}
-
-
-void NetSendMyRoutingTable()
-{
- // send out a line saying what is reachable to us.
- // E.g. if A is linked to B C and D, send out:
- // $ A B C D
- // if its only linked to B and D send out:
- // $ A B D
- // if it has no links, dont even send out the line at all.
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"$ %s",ServerName);
- bool sendit = false;
- for (int i = 0; i < 32; i++)
- {
- if (me[i] != NULL)
- {
- for (unsigned int j = 0; j < me[i]->connectors.size(); j++)
- {
- if ((me[i]->connectors[j].GetState() != STATE_DISCONNECTED) || (is_uline(me[i]->connectors[j].GetServerName().c_str())))
- {
- strlcat(buffer," ",MAXBUF);
- strlcat(buffer,me[i]->connectors[j].GetServerName().c_str(),MAXBUF);
- sendit = true;
- }
- }
- }
- }
- if (sendit)
- NetSendToAll(buffer);
-}
-
-
-void DoSplit(const char* params)
-{
- bool go_again = true;
- while (go_again)
- {
- go_again = false;
- for (int i = 0; i < 32; i++)
- {
- if (me[i] != NULL)
- {
- for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
- {
- if (!strcasecmp(j->GetServerName().c_str(),params))
- {
- j->routes.clear();
- j->CloseConnection();
- me[i]->connectors.erase(j);
- go_again = true;
- break;
- }
- }
- }
- }
- }
- log(DEBUG,"Removed server. Will remove clients...");
- // iterate through the userlist and remove all users on this server.
- // because we're dealing with a mesh, we dont have to deal with anything
- // "down-route" from this server (nice huh)
- go_again = true;
- char reason[MAXBUF];
- snprintf(reason,MAXBUF,"%s %s",ServerName,params);
- while (go_again)
- {
- go_again = false;
- for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- if (!strcasecmp(u->second->server,params))
- {
- kill_link(u->second,reason);
- go_again = true;
- break;
- }
- }
- }
- has_been_netsplit = true;
-}
-
-// removes a server. Will NOT remove its users!
-
-void RemoveServer(const char* name)
-{
- bool go_again = true;
- while (go_again)
- {
- go_again = false;
- for (int i = 0; i < 32; i++)
- {
- if (me[i] != NULL)
- {
- for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
- {
- if (!strcasecmp(j->GetServerName().c_str(),name))
- {
- j->routes.clear();
- j->CloseConnection();
- me[i]->connectors.erase(j);
- go_again = true;
- break;
- }
- }
- }
- }
- }
-}
-
-
char MODERR[MAXBUF];
char* ModuleError()
snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)");
return false;
}
+ /* Give the module a chance to tidy out all its metadata */
+ for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++)
+ {
+ modules[j]->OnCleanup(TYPE_CHANNEL,c->second);
+ }
+ for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+ {
+ modules[j]->OnCleanup(TYPE_USER,u->second);
+ }
FOREACH_MOD OnUnloadModule(modules[j],module_names[j]);
// found the module
log(DEBUG,"Deleting module...");
}
if (factory[MODCOUNT+1]->factory)
{
- Module* m = factory[MODCOUNT+1]->factory->CreateModule();
+ Module* m = factory[MODCOUNT+1]->factory->CreateModule(MyServer);
modules[MODCOUNT+1] = m;
- FOREACH_MOD OnLoadModule(m,filename_str);
/* save the module and the module's classfactory, if
* this isnt done, random crashes can occur :/ */
module_names.push_back(filename);
}
#endif
MODCOUNT++;
+ FOREACH_MOD OnLoadModule(modules[MODCOUNT],filename_str);
return true;
}
-bool GotServer(std::string name)
-{
- for (int j = 0; j < 32; j++)
- {
- if (me[j] != NULL)
- {
- for (unsigned int k = 0; k < me[j]->connectors.size(); k++)
- {
- if (name == me[j]->connectors[k].GetServerName())
- {
- return true;
- }
- }
- }
- }
- return false;
-}
-
-
int InspIRCd(char** argv, int argc)
{
struct sockaddr_in client,server;
AddServerName(ServerName);
- int clientportcount = 0, serverportcount = 0;
+ int clientportcount = 0;
for (count = 0; count < ConfValueEnum("bind",&config_f); count++)
{
ConfValue("bind","type",count,Type,&config_f);
if (!strcmp(Type,"servers"))
{
- char Default[MAXBUF];
- strcpy(Default,"no");
- ConfValue("bind","default",count,Default,&config_f);
- if (strchr(Default,'y'))
- {
- defaultRoute = serverportcount;
- log(DEBUG,"InspIRCd: startup: binding '%s:%s' is default server route",Addr,configToken);
- }
- me[serverportcount] = new serverrec(ServerName,100L,false);
- if (!me[serverportcount]->CreateListener(Addr,atoi(configToken)))
- {
- log(DEFAULT,"Warning: Failed to bind port %lu",(unsigned long)atoi(configToken));
- printf("Warning: Failed to bind port %lu\n",(unsigned long)atoi(configToken));
- }
- else
- {
- serverportcount++;
- }
+ // modules handle this bind type now.
}
else
{
log(DEBUG,"InspIRCd: startup: read binding %s:%s [%s] from config",Addr,configToken, Type);
}
portCount = clientportcount;
- SERVERportCount = serverportcount;
- log(DEBUG,"InspIRCd: startup: read %lu total client ports and %lu total server ports",(unsigned long)portCount,(unsigned long)SERVERportCount);
+ log(DEBUG,"InspIRCd: startup: read %lu total client ports",(unsigned long)portCount);
log(DEBUG,"InspIRCd: startup: InspIRCd is now starting!");
printf("\n");
}
}
- // BUGFIX: We cannot initialize this before forking, as the kqueue data is not inherited by child processes!
-#ifdef USE_KQUEUE
- kq = kqueue();
- lkq = kqueue();
- skq = kqueue();
- if ((kq == -1) || (lkq == -1) || (skq == -1))
- {
- log(DEFAULT,"main: kqueue() failed!");
- printf("ERROR: could not initialise kqueue event system. Shutting down.\n");
- Exit(ERROR);
- }
-#endif
-
-#ifdef USE_EPOLL
- ep = epoll_create(MAXCLIENTS);
- lep = epoll_create(32);
- sep = epoll_create(128);
- if ((ep == -1) || (lep == -1) || (sep == -1))
- {
- log(DEFAULT,"main: epoll_create() failed!");
- printf("ERROR: could not initialise epoll event system. Shutting down.\n");
- Exit(ERROR);
- }
-#endif
-
-#ifdef USE_EPOLL
- log(DEFAULT,"epoll socket engine is enabled. Filling listen list. boundPortcount=%d",boundPortCount);
- for (count = 0; count < boundPortCount; count++)
- {
- struct epoll_event ev;
- log(DEBUG,"epoll: Add listening socket to events, ep=%d socket=%d",lep,openSockfd[count]);
- ev.events = EPOLLIN | EPOLLET;
- ev.data.fd = openSockfd[count];
- int i = epoll_ctl(lep, EPOLL_CTL_ADD, openSockfd[count], &ev);
- if (i < 0)
- {
- log(DEFAULT,"main: add listen ports, epoll_ctl failed!");
- printf("ERROR: could not initialise listening sockets in epoll list. Shutting down.\n");
- Exit(ERROR);
- }
-
- }
- for (int t = 0; t != SERVERportCount; t++)
- {
- struct epoll_event ev;
- log(DEBUG,"epoll: Add listening server socket to events, ep=%d socket=%d",sep,me[t]->fd);
- ev.events = EPOLLIN | EPOLLET;
- ev.data.fd = me[t]->fd;
- int i = epoll_ctl(sep, EPOLL_CTL_ADD, me[t]->fd, &ev);
- if (i == -1)
- {
- log(DEFAULT,"main: add server listen ports, epoll_ctl failed!");
- printf("ERROR: could not initialise server listening sockets in epoll list. Shutting down.\n");
- Exit(ERROR);
- }
- }
-#else
-#ifdef USE_KQUEUE
- log(DEFAULT,"kqueue socket engine is enabled. Filling listen list.");
- for (count = 0; count < boundPortCount; count++)
- {
- struct kevent ke;
- log(DEBUG,"kqueue: Add listening socket to events, kq=%d socket=%d",lkq,openSockfd[count]);
- EV_SET(&ke, openSockfd[count], EVFILT_READ, EV_ADD, 0, MaxConn, NULL);
- int i = kevent(lkq, &ke, 1, 0, 0, NULL);
- if (i == -1)
- {
- log(DEFAULT,"main: add listen ports to kqueue failed!");
- printf("ERROR: could not initialise listening sockets in kqueue. Shutting down.\n");
- Exit(ERROR);
- }
- }
- for (int t = 0; t != SERVERportCount; t++)
- {
- struct kevent ke;
- if (me[t])
- {
- log(DEBUG,"kqueue: Add listening SERVER socket to events, kq=%d socket=%d",skq,me[t]->fd);
- EV_SET(&ke, me[t]->fd, EVFILT_READ, EV_ADD, 0, MaxConn, NULL);
- int i = kevent(skq, &ke, 1, 0, 0, NULL);
- if (i == -1)
- {
- log(DEFAULT,"main: add server listen ports to kqueue failed!");
- printf("ERROR: could not initialise listening server sockets in kqueue. Shutting down.\n");
- Exit(ERROR);
- }
- }
- }
-
-
-#else
- log(DEFAULT,"Using standard select socket engine.");
-#endif
-#endif
+ engine_init;
+ engine_server_fill;
WritePID(PID);
length = sizeof (client);
- char tcp_msg[MAXBUF],tcp_host[MAXBUF],tcp_sum[MAXBUF];
-
-#ifdef USE_KQUEUE
- struct kevent ke;
- struct kevent ke_list[33];
- struct timespec ts;
-#endif
-#ifdef USE_EPOLL
- struct epoll_event event[33];
-#endif
-#ifdef USE_SELECT
- fd_set serverfds;
- fd_set sfd;
-#endif
+ engine_structs;
timeval tvs;
tvs.tv_usec = 10000L;
tvs.tv_sec = 0;
int total_in_this_set = 0;
int i = 0, v = 0, j = 0, cycle_iter = 0;
bool expire_run = false;
+
+ cycle_iter = i = j = 0; // stop the compiler whining - these may be marked unused in certain socket engine types
/* main loop, this never returns */
for (;;)
OLDTIME = TIME;
TIME = time(NULL);
+#ifndef THREADED_DNS
dns_poll();
+#endif
- // *FIX* Instead of closing sockets in kill_link when they receive the ERROR :blah line, we should queue
- // them in a list, then reap the list every second or so.
- if (((TIME % 5) == 0) && (!expire_run))
+ unsigned int numsockets = module_sockets.size();
+ for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
{
- for (int i = 0; i < ConfValueEnum("link",&config_f); i++)
+ InspSocket* s = (InspSocket*)*a;
+ if ((s) && (!s->Poll()))
{
- char Link_ServerName[MAXBUF],Link_AConn[MAXBUF];
- ConfValue("link","name",i,Link_ServerName,&config_f);
- ConfValue("link","autoconnect",i,Link_AConn,&config_f);
- if ((Link_AConn[0]) && (!GotServer(Link_ServerName)))
- {
- autoconnects::iterator a = autoconns.find(std::string(Link_ServerName));
- if (a != autoconns.end())
- {
- if (TIME > a->second)
- {
- ConnectServer(Link_ServerName,NULL);
- a->second = TIME + atoi(Link_AConn);
- }
- }
- }
+ log(DEBUG,"Socket poll returned false, close and bail");
+ s->Close();
+ module_sockets.erase(a);
+ delete s;
+ break;
}
+ // we gained a socket, sarper
+ if (module_sockets.size() != numsockets) break;
+ }
+ // *FIX* Instead of closing sockets in kill_link when they receive the ERROR :blah line, we should queue
+ // them in a list, then reap the list every second or so.
+ if (((TIME % 5) == 0) && (!expire_run))
+ {
expire_lines();
FOREACH_MOD OnBackgroundTimer(TIME);
expire_run = true;
// fix by brain - this must be below any manipulation of the hashmap by modules
user_hash::iterator count2 = clientlist.begin();
-#ifdef USE_EPOLL
- i = epoll_wait(sep, event, 1, EP_DELAY);
- if (i > 0)
- {
- log(DEBUG,"epoll: Listening server socket event, i=%d, event.data.fd=%d",i,event[0].data.fd);
- for (int x = 0; x != SERVERportCount; x++)
- {
- if ((me[x]) && ((unsigned)event[0].data.fd == (unsigned)me[x]->fd))
- {
-#endif
-#ifdef USE_KQUEUE
- ts.tv_sec = 0;
- ts.tv_nsec = 30000L;
- i = kevent(skq, NULL, 0, &ke, 1, &ts);
- if (i > 0)
+
+ while (count2 != clientlist.end())
{
- log(DEBUG,"kqueue: Listening server socket event, i=%d, ke.ident=%d",i,ke.ident);
- for (int x = 0; x != SERVERportCount; x++)
- {
- if ((me[x]) && ((unsigned)ke.ident == (unsigned)me[x]->fd))
- {
-
-#endif
#ifdef USE_SELECT
- FD_ZERO(&serverfds);
- for (int x = 0; x != SERVERportCount; x++)
- {
- if (me[x])
- FD_SET(me[x]->fd, &serverfds);
- }
- tvs.tv_usec = 30000L;
- tvs.tv_sec = 0;
- int servresult = select(FD_SETSIZE, &serverfds, NULL, NULL, &tvs);
- if (servresult > 0)
- {
- for (int x = 0; x != SERVERportCount; x++)
- {
- if ((me[x]) && (FD_ISSET (me[x]->fd, &serverfds)))
- {
+ FD_ZERO(&sfd);
#endif
- char remotehost[MAXBUF],resolved[MAXBUF];
- length = sizeof (client);
- incomingSockfd = accept (me[x]->fd, (sockaddr *) &client, &length);
- if (incomingSockfd != -1)
- {
- strlcpy(remotehost,(char *)inet_ntoa(client.sin_addr),MAXBUF);
- if(CleanAndResolve(resolved, remotehost) != TRUE)
- {
- strlcpy(resolved,remotehost,MAXBUF);
- }
- // add to this connections ircd_connector vector
- // *FIX* - we need the LOCAL port not the remote port in &client!
- me[x]->AddIncoming(incomingSockfd,resolved,me[x]->port);
- }
- }
- }
- }
-
- std::deque<std::string> msgs;
- std::deque<std::string> sums;
- for (int x = 0; x < SERVERportCount; x++)
- {
- if (me[x])
- me[x]->FlushWriteBuffers();
- sums.clear();
- msgs.clear();
- while ((me[x]) && (me[x]->RecvPacket(msgs, tcp_host, sums))) // returns 0 or more lines (can be multiple lines!)
- {
- has_been_netsplit = false;
- for (unsigned int ctr = 0; ctr < msgs.size(); ctr++)
- {
- strlcpy(tcp_msg,msgs[ctr].c_str(),MAXBUF);
- strlcpy(tcp_sum,sums[ctr].c_str(),MAXBUF);
- log(DEBUG,"Processing: %s",tcp_msg);
- if (!tcp_msg[0])
- {
- log(DEBUG,"Invalid string from %s [route%lu]",tcp_host,(unsigned long)x);
- break;
- }
- // during a netburst, send all data to all other linked servers
- if ((((nb_start>0) && (tcp_msg[0] != 'Y') && (tcp_msg[0] != 'X') && (tcp_msg[0] != 'F'))) || (is_uline(tcp_host)))
- {
- if (is_uline(tcp_host))
- {
- if ((tcp_msg[0] != 'Y') && (tcp_msg[0] != 'X') && (tcp_msg[0] != 'F'))
- {
- NetSendToAllExcept_WithSum(tcp_host,tcp_msg,tcp_sum);
- }
- }
- else
- NetSendToAllExcept_WithSum(tcp_host,tcp_msg,tcp_sum);
- }
- std::string msg = tcp_msg;
- FOREACH_MOD OnPacketReceive(msg,tcp_host);
- strlcpy(tcp_msg,msg.c_str(),MAXBUF);
- if (me[x])
- handle_link_packet(tcp_msg, tcp_host, me[x], tcp_sum);
- if (!me[x]->FindHost(tcp_host))
- {
- log(DEBUG,"Connector gone, bailing!");
- goto label;
- }
- }
- goto label;
- }
- }
- while (count2 != clientlist.end())
- {
-#ifdef USE_SELECT
- FD_ZERO(&sfd);
-#endif
-
- total_in_this_set = 0;
+ total_in_this_set = 0;
- user_hash::iterator xcount = count2;
- user_hash::iterator endingiter = count2;
+ user_hash::iterator xcount = count2;
+ user_hash::iterator endingiter = count2;
- if (count2 == clientlist.end()) break;
+ if (count2 == clientlist.end()) break;
- userrec* curr = NULL;
+ userrec* curr = NULL;
- if (count2->second)
- curr = count2->second;
+ if (count2->second)
+ curr = count2->second;
- if ((long)curr == -1)
- goto label;
+ if ((long)curr == -1)
+ goto label;
- if ((curr) && (curr->fd != 0))
- {
+ if ((curr) && (curr->fd != 0))
+ {
#ifdef _POSIX_PRIORITY_SCHEDULING
- sched_yield();
+ sched_yield();
#endif
- // assemble up to 64 sockets into an fd_set
- // to implement a pooling mechanism.
- //
- // This should be up to 64x faster than the
- // old implementation.
+ // assemble up to 64 sockets into an fd_set
+ // to implement a pooling mechanism.
+ //
+ // This should be up to 64x faster than the
+ // old implementation.
#ifdef USE_SELECT
- while (total_in_this_set < 1024)
- {
- if (count2 != clientlist.end())
+ while (total_in_this_set < 1024)
{
- curr = count2->second;
- if ((long)curr == -1)
- goto label;
- int currfd = curr->fd;
- // we don't check the state of remote users.
- if ((currfd != -1) && (currfd != FD_MAGIC_NUMBER))
+ if (count2 != clientlist.end())
{
- curr->FlushWriteBuf();
- if (curr->GetWriteError() != "")
- {
- log(DEBUG,"InspIRCd: write error: %s",curr->GetWriteError().c_str());
- kill_link(curr,curr->GetWriteError().c_str());
+ curr = count2->second;
+ if ((long)curr == -1)
goto label;
- }
-
- FD_SET (curr->fd, &sfd);
-
- // registration timeout -- didnt send USER/NICK/HOST in the time specified in
- // their connection class.
- if ((TIME > curr->timeout) && (curr->registered != 7))
- {
- log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick);
- kill_link(curr,"Registration timeout");
- goto label;
- }
- if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr)))
+ int currfd = curr->fd;
+ // we don't check the state of remote users.
+ if ((currfd != -1) && (currfd != FD_MAGIC_NUMBER))
{
- log(DEBUG,"signon exceed, registered=3, and modules ready, OK");
- curr->dns_done = true;
- statsDnsBad++;
- FullConnectUser(curr);
- if (fd_ref_table[currfd] != curr) // something changed, bail pronto
- goto label;
- }
- if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) // both NICK and USER... and DNS
- {
- log(DEBUG,"dns done, registered=3, and modules ready, OK");
- FullConnectUser(curr);
- if (fd_ref_table[currfd] != curr) // something changed, bail pronto
- goto label;
- }
- if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7))
- {
- if ((!curr->lastping) && (curr->registered == 7))
+ curr->FlushWriteBuf();
+ if (curr->GetWriteError() != "")
{
- log(DEBUG,"InspIRCd: ping timeout: %s",curr->nick);
- kill_link(curr,"Ping timeout");
+ log(DEBUG,"InspIRCd: write error: %s",curr->GetWriteError().c_str());
+ kill_link(curr,curr->GetWriteError().c_str());
goto label;
}
- Write(curr->fd,"PING :%s",ServerName);
- log(DEBUG,"InspIRCd: pinging: %s",curr->nick);
- curr->lastping = 0;
- curr->nping = TIME+curr->pingmax; // was hard coded to 120
+
+ FD_SET (curr->fd, &sfd);
+
+ // 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");
+ goto label;
+ }
+ if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr)))
+ {
+ log(DEBUG,"signon exceed, registered=3, and modules ready, OK");
+ curr->dns_done = true;
+ statsDnsBad++;
+ FullConnectUser(curr);
+ if (fd_ref_table[currfd] != curr) // something changed, bail pronto
+ goto label;
+ }
+ if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) // both NICK and USER... and DNS
+ {
+ log(DEBUG,"dns done, registered=3, and modules ready, OK");
+ FullConnectUser(curr);
+ if (fd_ref_table[currfd] != curr) // something changed, bail pronto
+ goto label;
+ }
+ 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");
+ goto label;
+ }
+ Write(curr->fd,"PING :%s",ServerName);
+ log(DEBUG,"InspIRCd: pinging: %s",curr->nick);
+ curr->lastping = 0;
+ curr->nping = TIME+curr->pingmax; // was hard coded to 120
+ }
}
+ count2++;
+ total_in_this_set++;
}
- count2++;
- total_in_this_set++;
+ else break;
}
- else break;
- }
- endingiter = count2;
- count2 = xcount; // roll back to where we were
+ endingiter = count2;
+ count2 = xcount; // roll back to where we were
#else
- // KQUEUE and EPOLL: We don't go through a loop to fill the fd_set so instead we must manually do this loop every now and again.
- // TODO: We dont need to do all this EVERY loop iteration, tone down the visits to this if we're using kqueue.
- cycle_iter++;
- if (cycle_iter > 20) while (count2 != clientlist.end())
- {
- cycle_iter = 0;
- if (count2 != clientlist.end())
+ // KQUEUE and EPOLL: We don't go through a loop to fill the fd_set so instead we must manually do this loop every now and again.
+ // TODO: We dont need to do all this EVERY loop iteration, tone down the visits to this if we're using kqueue.
+ cycle_iter++;
+ if (cycle_iter > 20) while (count2 != clientlist.end())
{
- curr = count2->second;
- if ((long)curr == -1)
- goto label;
- int currfd = curr->fd;
- // we don't check the state of remote users.
- if ((currfd != -1) && (currfd != FD_MAGIC_NUMBER))
+ cycle_iter = 0;
+ if (count2 != clientlist.end())
{
-
- curr->FlushWriteBuf();
- if (curr->GetWriteError() != "")
- {
- log(DEBUG,"InspIRCd: write error: %s",curr->GetWriteError().c_str());
- kill_link(curr,curr->GetWriteError().c_str());
- goto label;
- }
-
- // 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");
- goto label;
-
- }
- 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;
- statsDnsBad++;
- FullConnectUser(curr);
- if (fd_ref_table[currfd] != curr) // something changed, bail pronto
- goto label;
- }
- 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
- goto label;
- }
- if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7))
+ curr = count2->second;
+ if ((long)curr == -1)
+ goto label;
+ int currfd = curr->fd;
+ // we don't check the state of remote users.
+ if ((currfd != -1) && (currfd != FD_MAGIC_NUMBER))
{
- if ((!curr->lastping) && (curr->registered == 7))
- {
- log(DEBUG,"InspIRCd: ping timeout: %s",curr->nick);
- kill_link(curr,"Ping timeout");
- goto label;
- }
- Write(curr->fd,"PING :%s",ServerName);
- log(DEBUG,"InspIRCd: pinging: %s",curr->nick);
- curr->lastping = 0;
- curr->nping = TIME+curr->pingmax; // was hard coded to 120
+ curr->FlushWriteBuf();
+ if (curr->GetWriteError() != "")
+ {
+ log(DEBUG,"InspIRCd: write error: %s",curr->GetWriteError().c_str());
+ kill_link(curr,curr->GetWriteError().c_str());
+ goto label;
+ }
+
+ // 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");
+ goto label;
+
+ }
+ 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;
+ statsDnsBad++;
+ FullConnectUser(curr);
+ if (fd_ref_table[currfd] != curr) // something changed, bail pronto
+ goto label;
+ }
+ 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
+ goto label;
+ }
+ 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");
+ goto label;
+ }
+ Write(curr->fd,"PING :%s",ServerName);
+ log(DEBUG,"InspIRCd: pinging: %s",curr->nick);
+ curr->lastping = 0;
+ curr->nping = TIME+curr->pingmax; // was hard coded to 120
+ }
}
}
+ else break;
+ count2++;
}
- else break;
- count2++;
- }
- // increment the counter right to the end of the list, as kqueue processes everything in one go
+ // increment the counter right to the end of the list, as kqueue processes everything in one go
#endif
- v = 0;
-#ifdef USE_EPOLL
- int i = epoll_wait(ep, event, 1, 5);
- if (i > 0)
- {
- log(DEBUG,"epoll_wait call: ep=%d, i=%d",ep,i);
- // EPOLL: we asked epoll_wait for ONE fd which is ready. Do something.
- userrec* cu = fd_ref_table[event[0].data.fd];
-#endif
-#ifdef USE_KQUEUE
- ts.tv_sec = 0;
- ts.tv_nsec = 1000L;
- // for now, we only read 1 event. We could read soooo many more :)
- int i = kevent(kq, NULL, 0, &ke, 1, &ts);
- if (i > 0)
- {
- log(DEBUG,"kevent call: kq=%d, i=%d",kq,i);
- // KQUEUE: kevent gives us ONE fd which is ready to have something done to it. Do something to it.
- userrec* cu = fd_ref_table[ke.ident];
-#endif
-#ifdef USE_SELECT
- tval.tv_sec = 0;
- tval.tv_usec = 1000L;
- selectResult2 = select(FD_SETSIZE, &sfd, NULL, NULL, &tval);
- // now loop through all of the items in this pool if any are waiting
- if ((selectResult2 > 0) && (xcount != clientlist.end()))
- for (user_hash::iterator count2a = xcount; count2a != endingiter; count2a++)
- {
- // SELECT: we have to iterate...
- if (count2a == clientlist.end())
- break;
- userrec* cu = count2a->second;
-#endif
+ v = 0;
+ engine_fill;
#ifdef _POSIX_PRIORITY_SCHEDULING
- sched_yield();
-#endif
- result = EAGAIN;
-#ifdef USE_EPOLL
- // EPOLL: We already know we have a valid FD. No checks needed.
- if ((cu->fd != FD_MAGIC_NUMBER) && (cu->fd != -1))
-#endif
-#ifdef USE_KQUEUE
- // KQUEUE: We already know we have a valid FD. No checks needed.
- if ((cu->fd != FD_MAGIC_NUMBER) && (cu->fd != -1))
+ sched_yield();
#endif
-#ifdef USE_SELECT
- // SELECT: We don't know if our FD is valid.
- if ((cu->fd != FD_MAGIC_NUMBER) && (cu->fd != -1) && (FD_ISSET (cu->fd, &sfd)))
-#endif
- {
- log(DEBUG,"Data waiting on socket %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 result = result2;
- log(DEBUG,"Read result: %d",result);
- if (result)
+ result = EAGAIN;
+ if (engine_check)
{
- 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: *"
- for (int checker = 0; checker < result; checker++)
- {
- if ((data[checker] == 0) || (data[checker] == 7))
- data[checker] = ' ';
- }
- if (result > 0)
- data[result] = '\0';
- userrec* current = cu;
- int currfd = current->fd;
- int floodlines = 0;
- // add the data to the users buffer
- if (result > 0)
- if (!current->AddBuffer(data))
+ log(DEBUG,"Data waiting on socket %d",cu->fd);
+ int MOD_RESULT = 0;
+ int result2 = 0;
+ FOREACH_RESULT(OnRawSocketRead(cu->fd,data,65535,result2));
+ if (!MOD_RESULT)
{
- // 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");
- }
- else
- {
- WriteOpers("*** Excess flood from %s",current->ip);
- log(DEFAULT,"Excess flood from: %s",current->ip);
- add_zline(120,ServerName,"Flood from unregistered connection",current->ip);
- apply_lines();
- }
- goto label;
+ result = cu->ReadData(data, 65535);
}
- if (current->recvq.length() > (unsigned)NetBufferSize)
+ else
{
- if (current->registered == 7)
- {
- kill_link(current,"RecvQ exceeded");
- }
- else
- {
- WriteOpers("*** Excess flood from %s",current->ip);
- log(DEFAULT,"Excess flood from: %s",current->ip);
- add_zline(120,ServerName,"Flood from unregistered connection",current->ip);
- apply_lines();
- }
- goto label;
+ log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
+ result = result2;
}
- // while there are complete lines to process...
- while (current->BufferIsReady())
+ log(DEBUG,"Read result: %d",result);
+ if (result)
{
- floodlines++;
- if (TIME > current->reset_due)
+ 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: *"
+ for (int checker = 0; checker < result; checker++)
{
- current->reset_due = TIME + current->threshold;
- current->lines_in = 0;
+ if ((data[checker] == 0) || (data[checker] == 7))
+ data[checker] = ' ';
}
- 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");
- goto label;
- }
- if ((floodlines > current->flood) && (current->flood != 0))
+ if (result > 0)
+ data[result] = '\0';
+ userrec* current = cu;
+ int currfd = current->fd;
+ int floodlines = 0;
+ // add the data to the users buffer
+ if (result > 0)
+ if (!current->AddBuffer(data))
{
+ // AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good.
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");
+ kill_link(current,"RecvQ exceeded");
}
else
{
+ WriteOpers("*** Excess flood from %s",current->ip);
+ log(DEFAULT,"Excess flood from: %s",current->ip);
add_zline(120,ServerName,"Flood from unregistered connection",current->ip);
- apply_lines();
- }
- goto label;
+ apply_lines();
+ }
+ goto label;
}
- char sanitized[MAXBUF];
- // use GetBuffer to copy single lines into the sanitized string
- std::string single_line = current->GetBuffer();
- current->bytes_in += single_line.length();
- current->cmds_in++;
- if (single_line.length()>512)
+ if (current->recvq.length() > (unsigned)NetBufferSize)
{
- 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");
+ if (current->registered == 7)
+ {
+ kill_link(current,"RecvQ exceeded");
+ }
+ else
+ {
+ WriteOpers("*** Excess flood from %s",current->ip);
+ log(DEFAULT,"Excess flood from: %s",current->ip);
+ add_zline(120,ServerName,"Flood from unregistered connection",current->ip);
+ apply_lines();
+ }
goto label;
}
- strlcpy(sanitized,single_line.c_str(),MAXBUF);
- if (*sanitized)
+ // while there are complete lines to process...
+ while (current->BufferIsReady())
{
- 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);
- // 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))
+ 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)
+ {
+ 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;
-
+ }
+ 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");
+ }
+ else
+ {
+ add_zline(120,ServerName,"Flood from unregistered connection",current->ip);
+ apply_lines();
+ }
+ goto label;
+ }
+ char sanitized[MAXBUF];
+ // use GetBuffer to copy single lines into the sanitized string
+ std::string single_line = current->GetBuffer();
+ current->bytes_in += single_line.length();
+ current->cmds_in++;
+ if (single_line.length()>512)
+ {
+ 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;
+ }
+ strlcpy(sanitized,single_line.c_str(),MAXBUF);
+ if (*sanitized)
+ {
+ 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);
+ // 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))
+ goto label;
+
+ }
}
+ goto label;
}
- goto label;
- }
- if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
+ if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
+ {
+ log(DEBUG,"killing: %s",cu->nick);
+ kill_link(cu,strerror(errno));
+ goto label;
+ }
+ }
+ // result EAGAIN means nothing read
+ if (result == EAGAIN)
{
- log(DEBUG,"killing: %s",cu->nick);
- kill_link(cu,strerror(errno));
- goto label;
}
- }
- // result EAGAIN means nothing read
- if (result == EAGAIN)
- {
- }
- else
- if (result == 0)
- {
-#ifdef USE_SELECT
- if (count2->second)
- {
-#endif
- log(DEBUG,"InspIRCd: Exited: %s",cu->nick);
- kill_link(cu,"Client exited");
- // must bail here? kill_link removes the hash, corrupting the iterator
- log(DEBUG,"Bailing from client exit");
- goto label;
-#ifdef USE_SELECT
+ else
+ if (result == 0)
+ {
+ engine_cleanup;
+ }
+ else if (result > 0)
+ {
}
-#endif
- }
- else if (result > 0)
- {
}
}
+ for (int q = 0; q < total_in_this_set; q++)
+ {
+ count2++;
+ }
}
- for (int q = 0; q < total_in_this_set; q++)
- {
- count2++;
- }
- }
-
+
#ifdef _POSIX_PRIORITY_SCHEDULING
- sched_yield();
+ sched_yield();
#endif
-#ifdef USE_SELECT
- // set up select call
- for (count = 0; count < boundPortCount; count++)
- {
- FD_SET (openSockfd[count], &selectFds);
- }
- tv.tv_usec = 30000L;
- selectResult = select(MAXSOCKS, &selectFds, NULL, NULL, &tv);
-
- /* select is reporting a waiting socket. Poll them all to find out which */
- if (selectResult > 0)
- {
- for (count = 0; count < boundPortCount; count++)
- {
- if (FD_ISSET (openSockfd[count], &selectFds))
- {
-#endif
-#ifdef USE_KQUEUE
- ts.tv_sec = 0;
- ts.tv_nsec = 30000L;
- i = kevent(lkq, NULL, 0, ke_list, 32, &ts);
- if (i > 0) for (j = 0; j < i; j++)
- {
- log(DEBUG,"kqueue: Listening socket event, i=%d, ke.ident=%d",i,ke_list[j].ident);
- // this isnt as efficient as it could be, we could create a reference table
- // to reference bound ports by fd, but this isnt a big bottleneck as the actual
- // number of listening ports on the average ircd is a small number (less than 20)
- // compared to the number of clients (possibly over 2000)
- for (count = 0; count < boundPortCount; count++)
- {
- if ((unsigned)ke_list[j].ident == (unsigned)openSockfd[count])
- {
-#endif
-#ifdef USE_EPOLL
- i = epoll_wait(lep, event, 32, EP_DELAY);
- if (i > 0) for (j = 0; j < i; j++)
- {
- log(DEBUG,"epoll: Listening socket event, i=%d,events[j].data.fd=%d",i,event[j].data.fd);
- for (count = 0; count < boundPortCount; count++)
- {
- if ((unsigned)event[j].data.fd == (unsigned)openSockfd[count])
- {
-#endif
+ engine_scanset;
char target[MAXBUF], resolved[MAXBUF];
length = sizeof (client);
incomingSockfd = accept (openSockfd[count], (struct sockaddr *) &client, &length);
+ log(DEBUG,"Accepted socket %d",incomingSockfd);
strlcpy (target, (char *) inet_ntoa (client.sin_addr), MAXBUF);
strlcpy (resolved, target, MAXBUF);
projects / user / henk / code / inspircd.git / blobdiff