#include <vector>
#include <errno.h>
#include <deque>
+#include <errno.h>
#include "connection.h"
#include "users.h"
#include "servers.h"
int WHOWAS_MAX = 100; // default 100 people maximum in the WHOWAS list
int DieDelay = 5;
time_t startup_time = time(NULL);
+int NetBufferSize = 10240; // NetBufferSize used as the buffer size for all read() ops
+time_t nb_start = time(NULL);
extern vector<Module*> modules;
-vector<string> module_names;
+std::vector<std::string> module_names;
extern vector<ircd_module*> factory;
-vector<int> fd_reap;
+std::vector<int> fd_reap;
extern int MODCOUNT;
log(DEBUG,"deleting %s %s %s %s",p->nick,p->ident,p->dhost,p->fullname);
log(DEBUG,"safedelete(userrec*): pointer is safe to delete");
delete p;
+ p = NULL;
}
else
{
if (p)
{
delete p;
+ p = NULL;
log(DEBUG,"safedelete(chanrec*): pointer is safe to delete");
}
else
void ReadConfig(void)
{
- char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF];
+ char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF];
ConnectClass c;
LoadConf(CONFIG_FILE,&config_f);
ConfValue("options","prefixquit",0,PrefixQuit,&config_f);
ConfValue("die","value",0,DieValue,&config_f);
ConfValue("options","loglevel",0,dbg,&config_f);
+ ConfValue("options","netbuffersize",0,NB,&config_f);
+ NetBufferSize = atoi(NB);
+ if ((!NetBufferSize) || (NetBufferSize > 65535) || (NetBufferSize < 1024))
+ {
+ log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240.");
+ NetBufferSize = 10240;
+ }
if (!strcmp(dbg,"debug"))
LogLevel = DEBUG;
if (!strcmp(dbg,"verbose"))
strcpy(Value,"");
ConfValue("connect","allow",i,Value,&config_f);
ConfValue("connect","timeout",i,timeout,&config_f);
+ ConfValue("connect","flood",i,flood,&config_f);
if (strcmp(Value,""))
{
strcpy(c.host,Value);
ConfValue("connect","password",i,Value,&config_f);
strcpy(c.pass,Value);
c.registration_timeout = 90; // default is 2 minutes
+ c.flood = atoi(flood);
if (atoi(timeout)>0)
{
c.registration_timeout = atoi(timeout);
}
Classes.push_back(c);
- log(DEBUG,"Read connect class type ALLOW, host=%s password=%s",c.host,c.pass);
+ log(DEBUG,"Read connect class type ALLOW, host=%s password=%s timeout=%d flood=%d",c.host,c.pass,c.registration_timeout,c.flood);
}
else
{
int flags;
log(DEBUG,"NonBlocking: %d",s);
flags = fcntl(s, F_GETFL, 0);
+ //fcntl(s, F_SETFL, O_NONBLOCK);
fcntl(s, F_SETFL, flags | O_NONBLOCK);
}
va_end(argsPtr);
sprintf(tb,"%s\r\n",textbuffer);
chop(tb);
- write(sock,tb,strlen(tb));
- update_stats_l(sock,strlen(tb)); /* add one line-out to stats L for this fd */
+ if (sock != -1)
+ {
+ write(sock,tb,strlen(tb));
+ update_stats_l(sock,strlen(tb)); /* add one line-out to stats L for this fd */
+ }
}
/* write a server formatted numeric response to a single socket */
va_end(argsPtr);
sprintf(tb,":%s %s\r\n",ServerName,textbuffer);
chop(tb);
- write(sock,tb,strlen(tb));
- update_stats_l(sock,strlen(tb)); /* add one line-out to stats L for this fd */
+ if (sock != -1)
+ {
+ write(sock,tb,strlen(tb));
+ update_stats_l(sock,strlen(tb)); /* add one line-out to stats L for this fd */
+ }
}
/* write text from an originating user to originating user */
va_end(argsPtr);
sprintf(tb,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer);
chop(tb);
- write(sock,tb,strlen(tb));
- update_stats_l(sock,strlen(tb)); /* add one line-out to stats L for this fd */
+ if (sock != -1)
+ {
+ write(sock,tb,strlen(tb));
+ update_stats_l(sock,strlen(tb)); /* add one line-out to stats L for this fd */
+ }
}
/* write text to an destination user from a source user (e.g. user privmsg) */
void WriteTo(userrec *source, userrec *dest,char *data, ...)
{
- if ((!source) || (!dest) || (!data))
+ if ((!dest) || (!data))
{
log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter");
return;
vsnprintf(textbuffer, MAXBUF, data, argsPtr);
va_end(argsPtr);
chop(tb);
- WriteFrom(dest->fd,source,"%s",textbuffer);
+
+ // if no source given send it from the server.
+ if (!source)
+ {
+ WriteServ(dest->fd,":%s %s",ServerName,textbuffer);
+ }
+ else
+ {
+ WriteFrom(dest->fd,source,"%s",textbuffer);
+ }
}
/* write formatted text from a source user to all users on a channel
}
}
+/* write formatted text from a source user to all users on a channel
+ * including the sender (NOT for privmsg, notice etc!) doesnt send to
+ * users on remote servers */
+
+void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...)
+{
+ if ((!Ptr) || (!text))
+ {
+ log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
+ return;
+ }
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if (has_channel(i->second,Ptr))
+ {
+ if (i->second->fd != -1)
+ {
+ if (!user)
+ {
+ WriteServ(i->second->fd,"%s",textbuffer);
+ }
+ else
+ {
+ WriteTo(user,i->second,"%s",textbuffer);
+ }
+ }
+ }
+ }
+}
+
+
void WriteChannelWithServ(char* ServerName, chanrec* Ptr, userrec* user, char* text, ...)
{
if ((!Ptr) || (!user) || (!text))
log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter");
return 0;
}
- for (i = 0; i != MAXCHANS; i++)
+ for (int i = 0; i != MAXCHANS; i++)
{
for (z = 0; z != MAXCHANS; z++)
{
}
}
+// returns TRUE of any users on channel C occupy server 'servername'.
+
+bool ChanAnyOnThisServer(chanrec *c,char* servername)
+{
+ log(DEBUG,"ChanAnyOnThisServer");
+ for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if (has_channel(i->second,c))
+ {
+ if (!strcasecmp(i->second->server,servername))
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
+// returns true if user 'u' shares any common channels with any users on server 'servername'
+
+bool CommonOnThisServer(userrec* u,char* servername)
+{
+ log(DEBUG,"ChanAnyOnThisServer");
+ for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((common_channels(u,i->second)) && (u != i->second))
+ {
+ if (!strcasecmp(i->second->server,servername))
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
+
+
bool hasumode(userrec* user, char mode)
{
if (user)
int isident(const char* n)
{
- int i = 0;
char v[MAXBUF];
if (!n)
{
return 0;
}
- for (i = 0; i != strlen(n); i++)
+ for (int i = 0; i != strlen(n); i++)
{
if ((n[i] < 33) || (n[i] > 125))
{
{
return 0;
}
- for (i = 0; i != strlen(n); i++)
+ for (int i = 0; i != strlen(n); i++)
{
if ((n[i] < 33) || (n[i] > 125))
{
}
int i;
- for (i = 0; i != MAXCHANS; i++)
+ for (int i = 0; i != MAXCHANS; i++)
{
if ((user->chans[i].channel == chan) && (chan != NULL))
{
return 0;
}
- int i;
- for (i = 0; i != MAXCHANS; i++)
+ for (int i = 0; i != MAXCHANS; i++)
{
if ((user->chans[i].channel == chan) && (chan != NULL))
{
/* add a channel to a user, creating the record for it if needed and linking
* it to the user record */
-chanrec* add_channel(userrec *user, const char* cn, const char* key)
+chanrec* add_channel(userrec *user, const char* cn, const char* key, bool override)
{
if ((!user) || (!cn))
{
// we MUST declare this wherever we use FOREACH_RESULT
int MOD_RESULT = 0;
- if ((!cname) || (!user))
- {
- return NULL;
- }
if (strlen(cname) > CHANMAX-1)
{
cname[CHANMAX-1] = '\0';
Ptr = FindChan(cname);
if (Ptr)
{
- FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
- if (MOD_RESULT) {
- return NULL;
- }
-
log(DEBUG,"add_channel: joining to: %s",Ptr->name);
- if (strcmp(Ptr->key,""))
+
+ // the override flag allows us to bypass channel modes
+ // and bans (used by servers)
+ if (!override)
{
- log(DEBUG,"add_channel: %s has key %s",Ptr->name,Ptr->key);
- if (!key)
- {
- log(DEBUG,"add_channel: no key given in JOIN");
- WriteServ(user->fd,"475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name);
+ FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
+ if (MOD_RESULT) {
return NULL;
}
- else
+
+ if (strcmp(Ptr->key,""))
{
- log(DEBUG,"key at %p is %s",key,key);
- if (strcasecmp(key,Ptr->key))
+ log(DEBUG,"add_channel: %s has key %s",Ptr->name,Ptr->key);
+ if (!key)
{
- log(DEBUG,"add_channel: bad key given in JOIN");
- WriteServ(user->fd,"475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name);
+ log(DEBUG,"add_channel: no key given in JOIN");
+ WriteServ(user->fd,"475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name);
return NULL;
}
+ else
+ {
+ log(DEBUG,"key at %p is %s",key,key);
+ if (strcasecmp(key,Ptr->key))
+ {
+ log(DEBUG,"add_channel: bad key given in JOIN");
+ WriteServ(user->fd,"475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name);
+ return NULL;
+ }
+ }
}
- }
- log(DEBUG,"add_channel: no key");
-
- if (Ptr->inviteonly)
- {
- log(DEBUG,"add_channel: channel is +i");
- if (user->IsInvited(Ptr->name))
+ log(DEBUG,"add_channel: no key");
+
+ if (Ptr->inviteonly)
+ {
+ log(DEBUG,"add_channel: channel is +i");
+ if (user->IsInvited(Ptr->name))
+ {
+ /* user was invited to channel */
+ /* there may be an optional channel NOTICE here */
+ }
+ else
+ {
+ WriteServ(user->fd,"473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
+ return NULL;
+ }
+ }
+ log(DEBUG,"add_channel: channel is not +i");
+
+ if (Ptr->limit)
{
- /* user was invited to channel */
- /* there may be an optional channel NOTICE here */
+ if (usercount(Ptr) == Ptr->limit)
+ {
+ WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
+ return NULL;
+ }
}
- else
+
+ log(DEBUG,"add_channel: about to walk banlist");
+
+ /* check user against the channel banlist */
+ if (Ptr)
{
- WriteServ(user->fd,"473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
- return NULL;
+ if (Ptr->bans.size())
+ {
+ for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+ {
+ if (match(user->GetFullHost(),i->data))
+ {
+ WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
+ return NULL;
+ }
+ }
+ }
}
- }
- log(DEBUG,"add_channel: channel is not +i");
+
+ log(DEBUG,"add_channel: bans checked");
+
- if (Ptr->limit)
- {
- if (usercount(Ptr) == Ptr->limit)
+ if ((Ptr) && (user))
{
- WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
- return NULL;
+ user->RemoveInvite(Ptr->name);
}
- }
-
- log(DEBUG,"add_channel: about to walk banlist");
+
+ log(DEBUG,"add_channel: invites removed");
- /* check user against the channel banlist */
- for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+ }
+ else
{
- if (match(user->GetFullHost(),i->data))
- {
- WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
- return NULL;
- }
+ log(DEBUG,"Overridden checks");
}
- log(DEBUG,"add_channel: bans checked");
-
- user->RemoveInvite(Ptr->name);
-
- log(DEBUG,"add_channel: invites removed");
}
created = 1;
log(DEBUG,"Passed channel checks");
- for (i =0; i != MAXCHANS; i++)
+ for (int i =0; i != MAXCHANS; i++)
{
+ log(DEBUG,"Check location %d",i);
if (user->chans[i].channel == NULL)
{
- log(DEBUG,"Adding into their channel list");
+ log(DEBUG,"Adding into their channel list at location %d",i);
if (created == 2)
{
}
user->chans[i].channel = Ptr;
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];
+ snprintf(buffer,MAXBUF,"J %s :%s",user->nick,Ptr->name);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent J token");
+ }
+ }
+ }
log(DEBUG,"Sent JOIN to client");
/* remove a channel from a users record, and remove the record from memory
* if the channel has become empty */
-chanrec* del_channel(userrec *user, const char* cname, const char* reason)
+chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool local)
{
if ((!user) || (!cname))
{
return NULL;
}
- int i = 0;
chanrec* Ptr;
int created = 0;
FOREACH_MOD OnUserPart(user,Ptr);
log(DEBUG,"del_channel: removing: %s %s",user->nick,Ptr->name);
- for (i =0; i != MAXCHANS; i++)
+ for (int i =0; i != MAXCHANS; i++)
{
/* zap it from the channel list of the user */
if (user->chans[i].channel == Ptr)
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);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent L token (with reason)");
+ }
+ }
+ }
+
+
}
else
{
+ if (!local)
+ {
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"L %s %s :",user->nick,Ptr->name);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent L token (no reason)");
+ }
+ }
+ }
+
WriteChannel(Ptr,user,"PART :%s",Ptr->name);
}
user->chans[i].uc_modes = 0;
return;
}
- for (i =0; i != MAXCHANS; i++)
+ for (int i =0; i != MAXCHANS; i++)
{
/* zap it from the channel list of the user */
- if (user->chans[i].channel == Ptr)
+ if (user->chans[i].channel)
+ if (!strcasecmp(user->chans[i].channel->name,Ptr->name))
{
WriteChannel(Ptr,src,"KICK %s %s :%s",Ptr->name, user->nick, reason);
user->chans[i].uc_modes = 0;
int has_channel(userrec *u, chanrec *c)
{
- int i = 0;
-
if ((!u) || (!c))
{
log(DEFAULT,"*** BUG *** has_channel was given an invalid parameter");
return 0;
}
- for (i =0; i != MAXCHANS; i++)
+ for (int i =0; i != MAXCHANS; i++)
{
if (u->chans[i].channel == c)
{
log(DEFAULT,"*** BUG *** give_ops was given an invalid parameter");
return 0;
}
- if (status != STATUS_OP)
+ if (status < STATUS_OP)
{
+ log(DEBUG,"%s cant give ops to %s because they nave status %d and needs %d",user->nick,dest,status,STATUS_OP);
WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
return 0;
}
{
if (!isnick(dest))
{
+ log(DEFAULT,"the target nickname given to give_ops was invalid");
WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
return 0;
}
d = Find(dest);
if (!d)
{
+ log(DEFAULT,"the target nickname given to give_ops couldnt be found");
WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
return 0;
}
else
{
- for (i = 0; i != MAXCHANS; i++)
+ for (int i = 0; i != MAXCHANS; i++)
{
- if ((d->chans[i].channel == chan) && (chan != NULL))
+ if ((d->chans[i].channel != NULL) && (chan != NULL))
+ if (!strcasecmp(d->chans[i].channel->name,chan->name))
{
if (d->chans[i].uc_modes & UCMODE_OP)
{
/* mode already set on user, dont allow multiple */
+ log(DEFAULT,"The target user given to give_ops was already opped on the channel");
return 0;
}
d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_OP;
log(DEBUG,"gave ops: %s %s",d->chans[i].channel->name,d->nick);
+ return 1;
}
}
+ log(DEFAULT,"The target channel given to give_ops was not in the users mode list");
}
}
return 1;
}
else
{
- for (i = 0; i != MAXCHANS; i++)
+ for (int i = 0; i != MAXCHANS; i++)
{
- if ((d->chans[i].channel == chan) && (chan != NULL))
+ if ((d->chans[i].channel != NULL) && (chan != NULL))
+ if (!strcasecmp(d->chans[i].channel->name,chan->name))
{
if (d->chans[i].uc_modes & UCMODE_HOP)
{
}
d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_HOP;
log(DEBUG,"gave h-ops: %s %s",d->chans[i].channel->name,d->nick);
+ return 1;
}
}
}
}
else
{
- for (i = 0; i != MAXCHANS; i++)
+ for (int i = 0; i != MAXCHANS; i++)
{
- if ((d->chans[i].channel == chan) && (chan != NULL))
+ if ((d->chans[i].channel != NULL) && (chan != NULL))
+ if (!strcasecmp(d->chans[i].channel->name,chan->name))
{
if (d->chans[i].uc_modes & UCMODE_VOICE)
{
}
d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_VOICE;
log(DEBUG,"gave voice: %s %s",d->chans[i].channel->name,d->nick);
+ return 1;
}
}
}
log(DEFAULT,"*** BUG *** take_ops was given an invalid parameter");
return 0;
}
- if (status != STATUS_OP)
+ if (status < STATUS_OP)
{
+ log(DEBUG,"%s cant give ops to %s because they have status %d and needs %d",user->nick,dest,status,STATUS_OP);
WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
return 0;
}
d = Find(dest);
if (!isnick(dest))
{
+ log(DEBUG,"take_ops was given an invalid target nickname of %s",dest);
WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
return 0;
}
if (!d)
{
+ log(DEBUG,"take_ops couldnt resolve the target nickname: %s",dest);
WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
return 0;
}
else
{
- for (i = 0; i != MAXCHANS; i++)
+ for (int i = 0; i != MAXCHANS; i++)
{
- if ((d->chans[i].channel == chan) && (chan != NULL))
+ if ((d->chans[i].channel != NULL) && (chan != NULL))
+ if (!strcasecmp(d->chans[i].channel->name,chan->name))
{
if ((d->chans[i].uc_modes & UCMODE_OP) == 0)
{
}
d->chans[i].uc_modes ^= UCMODE_OP;
log(DEBUG,"took ops: %s %s",d->chans[i].channel->name,d->nick);
+ return 1;
}
}
+ log(DEBUG,"take_ops couldnt locate the target channel in the target users list");
}
}
return 1;
}
else
{
- for (i = 0; i != MAXCHANS; i++)
+ for (int i = 0; i != MAXCHANS; i++)
{
- if ((d->chans[i].channel == chan) && (chan != NULL))
+ if ((d->chans[i].channel != NULL) && (chan != NULL))
+ if (!strcasecmp(d->chans[i].channel->name,chan->name))
{
if ((d->chans[i].uc_modes & UCMODE_HOP) == 0)
{
}
d->chans[i].uc_modes ^= UCMODE_HOP;
log(DEBUG,"took h-ops: %s %s",d->chans[i].channel->name,d->nick);
+ return 1;
}
}
}
}
else
{
- for (i = 0; i != MAXCHANS; i++)
+ for (int i = 0; i != MAXCHANS; i++)
{
- if ((d->chans[i].channel == chan) && (chan != NULL))
+ if ((d->chans[i].channel != NULL) && (chan != NULL))
+ if (!strcasecmp(d->chans[i].channel->name,chan->name))
{
if ((d->chans[i].uc_modes & UCMODE_VOICE) == 0)
{
}
d->chans[i].uc_modes ^= UCMODE_VOICE;
log(DEBUG,"took voice: %s %s",d->chans[i].channel->name,d->nick);
+ return 1;
}
}
}
return 0;
}
-void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode)
+void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
{
- if ((!parameters) || (!user)) {
+ if (!parameters) {
log(DEFAULT,"*** BUG *** process_modes was given an invalid parameter");
return;
}
-
char modelist[MAXBUF];
char outlist[MAXBUF];
char outstr[MAXBUF];
return;
}
- log(DEBUG,"process_modes: start");
+ log(DEBUG,"process_modes: start: parameters=%d",pcnt);
strcpy(modelist,parameters[1]); /* mode list, e.g. +oo-o */
/* parameters[2] onwards are parameters for
break;
case 'o':
+ log(DEBUG,"Ops");
if ((param >= pcnt)) break;
+ log(DEBUG,"Enough parameters left");
if (mdir == 1)
{
+ log(DEBUG,"calling give_ops");
r = give_ops(user,parameters[param++],chan,status);
}
else
{
+ log(DEBUG,"calling take_ops");
r = take_ops(user,parameters[param++],chan,status);
}
if (r)
strcat(outstr," ");
strcat(outstr,outpars[ptr]);
}
- if (servermode)
+ if (local)
{
- WriteChannelWithServ(ServerName,chan,user,"MODE %s %s",chan->name,outstr);
+ log(DEBUG,"Local mode change");
+ WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outstr);
}
else
{
- WriteChannel(chan,user,"MODE %s %s",chan->name,outstr);
+ if (servermode)
+ {
+ if (!silent)
+ {
+ WriteChannelWithServ(ServerName,chan,user,"MODE %s %s",chan->name,outstr);
+ // M token for a usermode must go to all servers
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"M %s %s",chan->name, outstr);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (strcmp(servers[j]->name,ServerName))
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent M token");
+ }
+ }
+ }
+ }
+
+ }
+ else
+ {
+ if (!silent)
+ {
+ WriteChannel(chan,user,"MODE %s %s",chan->name,outstr);
+ // M token for a usermode must go to all servers
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"m %s %s %s",user->nick,chan->name, outstr);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (strcmp(servers[j]->name,ServerName))
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent m token");
+ }
+ }
+ }
+ }
+ }
}
}
}
bool process_module_umode(char umode, userrec* source, void* dest, bool adding)
{
+ userrec* s2;
+ bool faked = false;
+ if (!source)
+ {
+ s2 = new userrec;
+ strncpy(s2->nick,ServerName,NICKMAX);
+ strcpy(s2->modes,"o");
+ s2->fd = -1;
+ source = s2;
+ faked = true;
+ }
string_list p;
p.clear();
if (ModeDefined(umode,MT_CLIENT))
}
}
log(DEBUG,"No module claims umode %c",umode);
+ if (faked)
+ {
+ delete s2;
+ source = NULL;
+ }
return false;
}
else
{
log(DEBUG,"*** BUG *** Non-module umode passed to process_module_umode!");
+ if (faked)
+ {
+ delete s2;
+ source = NULL;
+ }
return false;
}
}
dest = Find(parameters[0]);
+ if (!user)
+ {
+ return;
+ }
+
if ((dest) && (pcnt == 1))
{
WriteServ(user->fd,"221 %s :+%s",user->nick,user->modes);
if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
return;
- for (i = 0; i < strlen(parameters[1]); i++)
+ for (int i = 0; i < strlen(parameters[1]); i++)
{
if (parameters[1][i] == '+')
{
WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
+ // M token for a usermode must go to all servers
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (strcmp(servers[j]->name,ServerName))
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent m token");
+ }
+ }
+ }
+
if (strlen(dmodes)>MAXMODES)
{
dmodes[MAXMODES-1] = '\0';
WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, Ptr->name, i->data, i->set_by, i->set_time);
}
WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, Ptr->name);
+ return;
}
}
return;
}
- process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false);
+ process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
}
else
{
if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
return;
- for (i = 0; i < strlen(parameters[1]); i++)
+ for (int i = 0; i < strlen(parameters[1]); i++)
{
if (parameters[1][i] == '+')
{
WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
+ // M token for a usermode must go to all servers
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (strcmp(servers[j]->name,ServerName))
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent m token");
+ }
+ }
+ }
+
if (strlen(dmodes)>MAXMODES)
{
dmodes[MAXMODES-1] = '\0';
Ptr = FindChan(parameters[0]);
if (Ptr)
{
- process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true);
+ process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
}
else
{
}
-/* This function pokes and hacks at a parameter list like the following:
- *
- * PART #winbot, #darkgalaxy :m00!
- *
- * to turn it into a series of individual calls like this:
- *
- * PART #winbot :m00!
- * PART #darkgalaxy :m00!
- *
- * The seperate calls are sent to a callback function provided by the caller
- * (the caller will usually call itself recursively). The callback function
- * must be a command handler. Calling this function on a line with no list causes
- * no action to be taken. You must provide a starting and ending parameter number
- * where the range of the list can be found, useful if you have a terminating
- * parameter as above which is actually not part of the list, or parameters
- * before the actual list as well. This code is used by many functions which
- * can function as "one to list" (see the RFC) */
-int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins)
+void merge_mode(char **parameters, int pcnt)
{
- char plist[MAXBUF];
- char *param;
- char *pars[32];
- char blog[32][MAXBUF];
- char blog2[32][MAXBUF];
- int i = 0, j = 0, q = 0, total = 0, t = 0, t2 = 0, total2 = 0;
- char keystr[MAXBUF];
- char moo[MAXBUF];
-
- for (i = 0; i <32; i++)
- strcpy(blog[i],"");
-
- for (i = 0; i <32; i++)
- strcpy(blog2[i],"");
+ chanrec* Ptr;
+ userrec* dest;
+ int can_change,i;
+ int direction = 1;
+ char outpars[MAXBUF];
- strcpy(moo,"");
- for (i = 0; i <10; i++)
+ dest = Find(parameters[0]);
+
+ // fix: ChroNiCk found this - we cant use this as debug if its null!
+ if (dest)
{
- if (!parameters[i])
- {
- parameters[i] = moo;
- }
+ log(DEBUG,"merge_mode on %s",dest->nick);
}
- if (joins)
- {
+
+ if ((dest) && (pcnt > 1))
+ {
+ log(DEBUG,"params > 1");
+
+ char dmodes[MAXBUF];
+ strncpy(dmodes,dest->modes,MAXBUF);
+
+ strcpy(outpars,"+");
+ direction = 1;
+
+ if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
+ return;
+
+ for (int i = 0; i < strlen(parameters[1]); i++)
+ {
+ if (parameters[1][i] == '+')
+ {
+ if (direction != 1)
+ {
+ if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
+ {
+ outpars[strlen(outpars)-1] = '+';
+ }
+ else
+ {
+ strcat(outpars,"+");
+ }
+ }
+ direction = 1;
+ }
+ else
+ if (parameters[1][i] == '-')
+ {
+ if (direction != 0)
+ {
+ if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
+ {
+ outpars[strlen(outpars)-1] = '-';
+ }
+ else
+ {
+ strcat(outpars,"-");
+ }
+ }
+ direction = 0;
+ }
+ else
+ {
+ log(DEBUG,"begin mode processing entry");
+ can_change = 1;
+ if (can_change)
+ {
+ if (direction == 1)
+ {
+ log(DEBUG,"umode %c being added",parameters[1][i]);
+ if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],"o",true)))
+ {
+ char umode = parameters[1][i];
+ log(DEBUG,"umode %c is an allowed umode",umode);
+ if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+ {
+ dmodes[strlen(dmodes)+1]='\0';
+ dmodes[strlen(dmodes)] = parameters[1][i];
+ outpars[strlen(outpars)+1]='\0';
+ outpars[strlen(outpars)] = parameters[1][i];
+ }
+ }
+ }
+ else
+ {
+ // can only remove a mode they already have
+ log(DEBUG,"umode %c being removed",parameters[1][i]);
+ if ((allowed_umode(parameters[1][i],"o",false)) && (strchr(dmodes,parameters[1][i])))
+ {
+ char umode = parameters[1][i];
+ log(DEBUG,"umode %c is an allowed umode",umode);
+ if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+ {
+ int q = 0;
+ char temp[MAXBUF];
+ char moo[MAXBUF];
+
+ outpars[strlen(outpars)+1]='\0';
+ outpars[strlen(outpars)] = parameters[1][i];
+
+ strcpy(temp,"");
+ for (q = 0; q < strlen(dmodes); q++)
+ {
+ if (dmodes[q] != parameters[1][i])
+ {
+ moo[0] = dmodes[q];
+ moo[1] = '\0';
+ strcat(temp,moo);
+ }
+ }
+ strcpy(dmodes,temp);
+ }
+ }
+ }
+ }
+ }
+ }
+ if (strlen(outpars))
+ {
+ char b[MAXBUF];
+ strcpy(b,"");
+ int z = 0;
+ int i = 0;
+ while (i < strlen (outpars))
+ {
+ b[z++] = outpars[i++];
+ b[z] = '\0';
+ if (i<strlen(outpars)-1)
+ {
+ if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
+ {
+ // someones playing silly buggers and trying
+ // to put a +- or -+ into the line...
+ i++;
+ }
+ }
+ if (i == strlen(outpars)-1)
+ {
+ if ((outpars[i] == '-') || (outpars[i] == '+'))
+ {
+ i++;
+ }
+ }
+ }
+
+ z = strlen(b)-1;
+ if ((b[z] == '-') || (b[z] == '+'))
+ b[z] == '\0';
+
+ if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
+ return;
+
+ if (strlen(dmodes)>MAXMODES)
+ {
+ dmodes[MAXMODES-1] = '\0';
+ }
+ log(DEBUG,"Stripped mode line");
+ log(DEBUG,"Line dest is now %s",dmodes);
+ strncpy(dest->modes,dmodes,MAXMODES);
+
+ }
+
+ return;
+ }
+
+ Ptr = FindChan(parameters[0]);
+ if (Ptr)
+ {
+ userrec s2;
+ strncpy(s2.nick,ServerName,NICKMAX);
+ strcpy(s2.modes,"o");
+ s2.fd = -1;
+ process_modes(parameters,&s2,Ptr,STATUS_OP,pcnt,true,true,false);
+ }
+}
+
+
+void merge_mode2(char **parameters, int pcnt, userrec* user)
+{
+ chanrec* Ptr;
+ userrec* dest;
+ int can_change,i;
+ int direction = 1;
+ char outpars[MAXBUF];
+
+ dest = Find(parameters[0]);
+
+ // fix: ChroNiCk found this - we cant use this as debug if its null!
+ if (dest)
+ {
+ log(DEBUG,"merge_mode on %s",dest->nick);
+ }
+
+ if ((dest) && (pcnt > 1))
+ {
+ log(DEBUG,"params > 1");
+
+ char dmodes[MAXBUF];
+ strncpy(dmodes,dest->modes,MAXBUF);
+
+ strcpy(outpars,"+");
+ direction = 1;
+
+ if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
+ return;
+
+ for (int i = 0; i < strlen(parameters[1]); i++)
+ {
+ if (parameters[1][i] == '+')
+ {
+ if (direction != 1)
+ {
+ if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
+ {
+ outpars[strlen(outpars)-1] = '+';
+ }
+ else
+ {
+ strcat(outpars,"+");
+ }
+ }
+ direction = 1;
+ }
+ else
+ if (parameters[1][i] == '-')
+ {
+ if (direction != 0)
+ {
+ if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
+ {
+ outpars[strlen(outpars)-1] = '-';
+ }
+ else
+ {
+ strcat(outpars,"-");
+ }
+ }
+ direction = 0;
+ }
+ else
+ {
+ log(DEBUG,"begin mode processing entry");
+ can_change = 1;
+ if (can_change)
+ {
+ if (direction == 1)
+ {
+ log(DEBUG,"umode %c being added",parameters[1][i]);
+ if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
+ {
+ char umode = parameters[1][i];
+ log(DEBUG,"umode %c is an allowed umode",umode);
+ if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+ {
+ dmodes[strlen(dmodes)+1]='\0';
+ dmodes[strlen(dmodes)] = parameters[1][i];
+ outpars[strlen(outpars)+1]='\0';
+ outpars[strlen(outpars)] = parameters[1][i];
+ }
+ }
+ }
+ else
+ {
+ // can only remove a mode they already have
+ log(DEBUG,"umode %c being removed",parameters[1][i]);
+ if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
+ {
+ char umode = parameters[1][i];
+ log(DEBUG,"umode %c is an allowed umode",umode);
+ if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+ {
+ int q = 0;
+ char temp[MAXBUF];
+ char moo[MAXBUF];
+
+ outpars[strlen(outpars)+1]='\0';
+ outpars[strlen(outpars)] = parameters[1][i];
+
+ strcpy(temp,"");
+ for (q = 0; q < strlen(dmodes); q++)
+ {
+ if (dmodes[q] != parameters[1][i])
+ {
+ moo[0] = dmodes[q];
+ moo[1] = '\0';
+ strcat(temp,moo);
+ }
+ }
+ strcpy(dmodes,temp);
+ }
+ }
+ }
+ }
+ }
+ }
+ if (strlen(outpars))
+ {
+ char b[MAXBUF];
+ strcpy(b,"");
+ int z = 0;
+ int i = 0;
+ while (i < strlen (outpars))
+ {
+ b[z++] = outpars[i++];
+ b[z] = '\0';
+ if (i<strlen(outpars)-1)
+ {
+ if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
+ {
+ // someones playing silly buggers and trying
+ // to put a +- or -+ into the line...
+ i++;
+ }
+ }
+ if (i == strlen(outpars)-1)
+ {
+ if ((outpars[i] == '-') || (outpars[i] == '+'))
+ {
+ i++;
+ }
+ }
+ }
+
+ z = strlen(b)-1;
+ if ((b[z] == '-') || (b[z] == '+'))
+ b[z] == '\0';
+
+ if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
+ return;
+
+ WriteTo(user,dest,"MODE :%s",b);
+
+ if (strlen(dmodes)>MAXMODES)
+ {
+ dmodes[MAXMODES-1] = '\0';
+ }
+ log(DEBUG,"Stripped mode line");
+ log(DEBUG,"Line dest is now %s",dmodes);
+ strncpy(dest->modes,dmodes,MAXMODES);
+
+ }
+
+ return;
+ }
+
+ Ptr = FindChan(parameters[0]);
+ if (Ptr)
+ {
+ if ((cstatus(user,Ptr) < STATUS_HOP) && (Ptr))
+ {
+ return;
+ }
+
+ process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,true);
+ }
+}
+
+
+
+/* This function pokes and hacks at a parameter list like the following:
+ *
+ * PART #winbot, #darkgalaxy :m00!
+ *
+ * to turn it into a series of individual calls like this:
+ *
+ * PART #winbot :m00!
+ * PART #darkgalaxy :m00!
+ *
+ * The seperate calls are sent to a callback function provided by the caller
+ * (the caller will usually call itself recursively). The callback function
+ * must be a command handler. Calling this function on a line with no list causes
+ * no action to be taken. You must provide a starting and ending parameter number
+ * where the range of the list can be found, useful if you have a terminating
+ * parameter as above which is actually not part of the list, or parameters
+ * before the actual list as well. This code is used by many functions which
+ * can function as "one to list" (see the RFC) */
+
+int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins)
+{
+ char plist[MAXBUF];
+ char *param;
+ char *pars[32];
+ char blog[32][MAXBUF];
+ char blog2[32][MAXBUF];
+ int i = 0, j = 0, q = 0, total = 0, t = 0, t2 = 0, total2 = 0;
+ char keystr[MAXBUF];
+ char moo[MAXBUF];
+
+ for (int i = 0; i <32; i++)
+ strcpy(blog[i],"");
+
+ for (int i = 0; i <32; i++)
+ strcpy(blog2[i],"");
+
+ strcpy(moo,"");
+ for (int i = 0; i <10; i++)
+ {
+ if (!parameters[i])
+ {
+ parameters[i] = moo;
+ }
+ }
+ if (joins)
+ {
if (pcnt > 1) /* we have a key to copy */
{
strcpy(keystr,parameters[1]);
return 0;
}
strcpy(plist,"");
- for (i = start; i <= end; i++)
+ for (int i = start; i <= end; i++)
{
if (parameters[i])
{
param = plist;
t = strlen(plist);
- for (i = 0; i < t; i++)
+ for (int i = 0; i < t; i++)
{
if (plist[i] == ',')
{
j = 0;
param = keystr;
t2 = strlen(keystr);
- for (i = 0; i < t2; i++)
+ for (int i = 0; i < t2; i++)
{
if (keystr[i] == ',')
{
}
}
- if (total > 10)
- {
- // limit the total items in a comma seperated list
- // a phidjit bug... go figure.
- total = 10;
- }
-
for (j = 0; j < total; j++)
{
if (blog[j])
return;
if (parameters[0][0] == '#')
{
- Ptr = add_channel(user,parameters[0],parameters[1]);
+ Ptr = add_channel(user,parameters[0],parameters[1],false);
}
}
{
if (loop_call(handle_part,parameters,pcnt,user,0,pcnt-2,0))
return;
- del_channel(user,parameters[0],parameters[1]);
+ del_channel(user,parameters[0],parameters[1],false);
}
else
{
if (loop_call(handle_part,parameters,pcnt,user,0,pcnt-1,0))
return;
- del_channel(user,parameters[0],NULL);
+ del_channel(user,parameters[0],NULL,false);
}
}
WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, parameters[0]);
return;
}
+
+ char reason[MAXBUF];
if (pcnt > 2)
{
- char reason[MAXBUF];
strncpy(reason,parameters[2],MAXBUF);
if (strlen(reason)>MAXKICK)
{
}
else
{
- kick_channel(user,u,Ptr,user->nick);
+ strcpy(reason,user->nick);
+ kick_channel(user,u,Ptr,reason);
+ }
+
+ // this must be propogated so that channel membership is kept in step network-wide
+
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"k %s %s %s :%s",user->nick,u->nick,Ptr->name,reason);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent k token");
+ }
}
+
}
if (user->registered == 7) {
FOREACH_MOD OnUserQuit(user);
WriteCommonExcept(user,"QUIT :%s",reason);
+
+ // Q token must go to ALL servers!!!
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"Q %s :%s",user->nick,reason);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (strcmp(servers[j]->name,ServerName))
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent Q token");
+ }
+ }
+ }
}
/* push the socket on a stack of sockets due to be closed at the next opportunity
u->InviteTo(c->name);
WriteFrom(u->fd,user,"INVITE %s :%s",u->nick,c->name);
WriteServ(user->fd,"341 %s %s %s",user->nick,u->nick,c->name);
+
+ // i token must go to ALL servers!!!
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"i %s %s %s",u->nick,user->nick,c->name);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (strcmp(servers[j]->name,ServerName))
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent i token");
+ }
+ }
+ }
}
void handle_topic(char **parameters, int pcnt, userrec *user)
strcpy(Ptr->setby,user->nick);
Ptr->topicset = time(NULL);
WriteChannel(Ptr,user,"TOPIC %s :%s",Ptr->name, Ptr->topic);
+
+ // t token must go to ALL servers!!!
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"t %s %s :%s",user->nick,Ptr->name,topic);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (strcmp(servers[j]->name,ServerName))
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent t token");
+ }
+ }
+ }
}
else
{
break;
}
}
- log(DEBUG,"Client has a connection timeout value of %d",class_regtimeout);
+
+ int class_flood = 0;
+ for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
+ {
+ if (match(clientlist[tempnick]->host,i->host) && (i->type == CC_ALLOW))
+ {
+ class_flood = i->flood;
+ break;
+ }
+ }
+
clientlist[tempnick]->timeout = time(NULL)+class_regtimeout;
+ clientlist[tempnick]->flood = class_flood;
+
+ for (int i = 0; i < MAXCHANS; i++)
+ {
+ clientlist[tempnick]->chans[i].channel = NULL;
+ clientlist[tempnick]->chans[i].uc_modes = 0;
+ }
if (clientlist.size() == MAXCLIENTS)
kill_link(clientlist[tempnick],"No more connections allowed in this class");
}
}
-
void handle_privmsg(char **parameters, int pcnt, userrec *user)
{
userrec *dest;
}
ChanExceptSender(chan, user, "PRIVMSG %s :%s", chan->name, parameters[1]);
+
+ // if any users of this channel are on remote servers, broadcast the packet
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"P %s %s :%s",user->nick,chan->name,parameters[1]);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (ChanAnyOnThisServer(chan,servers[j]->name))
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ }
+ }
+ }
}
else
{
if (MOD_RESULT) {
return;
}
-
- WriteTo(user, dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
+
+
+
+ if (!strcmp(dest->server,user->server))
+ {
+ // direct write, same server
+ WriteTo(user, dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
+ }
+ else
+ {
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (!strcasecmp(servers[j]->name,dest->server))
+ {
+ // direct write, same server
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"P %s %s :%s",user->nick,dest->nick,parameters[1]);
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ }
+ }
+ }
+ }
}
else
{
return;
}
- WriteChannel(chan, user, "NOTICE %s :%s", chan->name, parameters[1]);
+ ChanExceptSender(chan, user, "NOTICE %s :%s", chan->name, parameters[1]);
+
+ // if any users of this channel are on remote servers, broadcast the packet
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,chan->name,parameters[1]);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (ChanAnyOnThisServer(chan,servers[j]->name))
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ }
+ }
+ }
}
else
{
return;
}
- WriteTo(user, dest, "NOTICE %s :%s", dest->nick, parameters[1]);
+ if (!strcmp(dest->server,user->server))
+ {
+ // direct write, same server
+ WriteTo(user, dest, "NOTICE %s :%s", dest->nick, parameters[1]);
+ }
+ else
+ {
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (!strcasecmp(servers[j]->name,dest->server))
+ {
+ // direct write, same server
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,dest->nick,parameters[1]);
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ }
+ }
+ }
+ }
}
else
{
{
return lst;
}
- for (i = 0; i != MAXCHANS; i++)
+ for (int i = 0; i != MAXCHANS; i++)
{
if (user->chans[i].channel != NULL)
{
}
}
}
+ if (strlen(lst))
+ {
+ lst[strlen(lst)-1] = '\0'; // chop trailing space
+ }
return lst;
}
}
}
+void send_network_quit(const char* nick, const char* reason)
+{
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"Q %s :%s",nick,reason);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent Q token");
+ }
+ }
+}
+
void handle_quit(char **parameters, int pcnt, userrec *user)
{
user_hash::iterator iter = clientlist.find(user->nick);
Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,parameters[0]);
WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,parameters[0]);
WriteCommonExcept(user,"QUIT :%s%s",PrefixQuit,parameters[0]);
+
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"Q %s :%s%s",user->nick,PrefixQuit,parameters[0]);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent Q token");
+ }
+ }
}
else
{
Write(user->fd,"ERROR :Closing link (%s@%s) [QUIT]",user->ident,user->host);
WriteOpers("*** Client exiting: %s!%s@%s [Client exited]",user->nick,user->ident,user->host);
WriteCommonExcept(user,"QUIT :Client exited");
+
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"Q %s :Client exited",user->nick);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent Q token");
+ }
+ }
}
FOREACH_MOD OnUserQuit(user);
AddWhoWas(user);
if (iter != clientlist.end())
{
- log(DEBUG,"deleting user hash value %d",iter->second);
- if ((iter->second) && (user->registered == 7)) {
- delete iter->second;
- }
clientlist.erase(iter);
+ log(DEBUG,"deleting user hash value %d",iter->second);
+ //if ((user) && (user->registered == 7)) {
+ //delete user;
+ //}
}
if (user->registered == 7) {
{
if ((common_channels(user,i->second)) && (isnick(i->second->nick)))
{
- WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, ServerName, i->second->nick, i->second->fullname);
+ WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, i->second->server, i->second->nick, i->second->fullname);
}
}
}
}
return;
}
- if (parameters[0][0] = '#')
+ if (parameters[0][0] == '#')
{
Ptr = FindChan(parameters[0]);
if (Ptr)
{
if ((has_channel(i->second,Ptr)) && (isnick(i->second->nick)))
{
- WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, ServerName, i->second->nick, i->second->fullname);
+ WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, i->second->server, i->second->nick, i->second->fullname);
}
}
WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, Ptr->name);
WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
}
}
+ else
+ {
+ userrec* u = Find(parameters[0]);
+ WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, u->nick, u->ident, u->dhost, u->server, u->nick, u->fullname);
+ }
}
if (pcnt == 2)
{
{
if (strchr(i->second->modes,'o'))
{
- WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, ServerName, i->second->nick, i->second->fullname);
+ WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, i->second->server, i->second->nick, i->second->fullname);
}
}
}
void handle_rehash(char **parameters, int pcnt, userrec *user)
{
- WriteServ(user->fd,"382 %s %s :Rehashing",user->nick,CONFIG_FILE);
+ WriteServ(user->fd,"382 %s %s :Rehashing",user->nick,CleanFilename(CONFIG_FILE));
ReadConfig();
FOREACH_MOD OnRehash();
- WriteOpers("%s is rehashing config file %s",user->nick,CONFIG_FILE);
+ WriteOpers("%s is rehashing config file %s",user->nick,CleanFilename(CONFIG_FILE));
}
return clientlist.size();
}
+
int usercount_invisible(void)
{
int c = 0;
return c;
}
-int chancount(void)
+long chancount(void)
{
return chanlist.size();
}
-int servercount(void)
+long count_servs(void)
{
- return 1;
+ int c = 0;
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ c++;
+ }
+ return c;
+}
+
+long servercount(void)
+{
+ return count_servs()+1;
+}
+
+long local_count()
+{
+ int c = 0;
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,ServerName))) c++;
+ }
+ return c;
}
+
void handle_lusers(char **parameters, int pcnt, userrec *user)
{
WriteServ(user->fd,"251 %s :There are %d users and %d invisible on %d servers",user->nick,usercnt()-usercount_invisible(),usercount_invisible(),servercount());
WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers());
WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown());
WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount());
- WriteServ(user->fd,"254 %s :I have %d clients and 0 servers",user->nick,usercnt());
+ WriteServ(user->fd,"254 %s :I have %d clients and %d servers",user->nick,local_count(),count_servs());
}
void handle_admin(char **parameters, int pcnt, userrec *user)
ShowMOTD(user);
FOREACH_MOD OnUserConnect(user);
WriteOpers("*** Client connecting on port %d: %s!%s@%s",user->port,user->nick,user->ident,user->host);
+
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"N %d %s %s %s %s +%s %s :%s",user->age,user->nick,user->host,user->dhost,user->ident,user->modes,ServerName,user->fullname);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (strcmp(servers[j]->name,ServerName))
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent N token");
+ }
+ }
+ }
+
}
void handle_version(char **parameters, int pcnt, userrec *user)
{
- WriteServ(user->fd,"351 %s :%s %s %s :%s",user->nick,VERSION,"$Id$",ServerName,SYSTEM);
+ WriteServ(user->fd,"351 %s :%s %s %s :%s",user->nick,VERSION,"$Revision$ $Date$",ServerName,SYSTEM);
}
void handle_ping(char **parameters, int pcnt, userrec *user)
void handle_trace(char **parameters, int pcnt, userrec *user)
{
- for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
{
if (i->second)
{
for (int i = 0; i < module_names.size(); i++)
{
Version V = modules[i]->GetVersion();
- WriteServ(user->fd,"900 %s :0x%08lx %d.%d.%d.%d %s",user->nick,modules[i],V.Major,V.Minor,V.Revision,V.Build,module_names[i].c_str());
+ char modulename[MAXBUF];
+ strncpy(modulename,module_names[i].c_str(),256);
+ WriteServ(user->fd,"900 %s :0x%08lx %d.%d.%d.%d %s",user->nick,modules[i],V.Major,V.Minor,V.Revision,V.Build,CleanFilename(modulename));
}
}
+// calls a handler function for a command
+
+void call_handler(const char* commandname,char **parameters, int pcnt, userrec *user)
+{
+ for (int i = 0; i < cmdlist.size(); i++)
+ {
+ if (!strcasecmp(cmdlist[i].command,commandname))
+ {
+ if (cmdlist[i].handler_function)
+ {
+ if (pcnt>=cmdlist[i].min_params)
+ {
+ if (strchr(user->modes,cmdlist[i].flags_needed))
+ {
+ cmdlist[i].handler_function(parameters,pcnt,user);
+ }
+ }
+ }
+ }
+ }
+}
+
void handle_stats(char **parameters, int pcnt, userrec *user)
{
if (pcnt != 1)
for (int j = 0; j < 255; j++) {
if (servers[j] == NULL) {
servers[j] = new serverrec;
+ //servers[j]->initiator = true;
strcpy(servers[j]->internal_addr,Link_IPAddr);
+ servers[j]->internal_port = LinkPort;
strcpy(servers[j]->name,Link_ServerName);
log(DEBUG,"Allocated new serverrec");
if (!me[defaultRoute]->BeginLink(Link_IPAddr,LinkPort,Link_Pass))
// send out an squit across the mesh and then clear the server list (for local squit)
}
+char islast(serverrec* s)
+{
+ char c = '`';
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ c = '|';
+ }
+ if (servers[j] == s)
+ {
+ c = '`';
+ }
+ }
+ return c;
+}
+
+long map_count(serverrec* s)
+{
+ int c = 0;
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,s->name))) c++;
+ }
+ return c;
+}
+
+void handle_links(char **parameters, int pcnt, userrec *user)
+{
+ WriteServ(user->fd,"364 %s %s %s :0 %s",user->nick,ServerName,ServerName,ServerDesc);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ WriteServ(user->fd,"364 %s %s %s :1 %s",user->nick,servers[j]->name,ServerName,servers[j]->description);
+ }
+ }
+ WriteServ(user->fd,"365 %s * :End of /LINKS list.",user->nick);
+}
+
+void handle_map(char **parameters, int pcnt, userrec *user)
+{
+ char line[MAXBUF];
+ snprintf(line,MAXBUF,"006 %s :%s",user->nick,ServerName);
+ while (strlen(line) < 50)
+ strcat(line," ");
+ WriteServ(user->fd,"%s%d (%.2f%%)",line,local_count(),(float)(((float)local_count()/(float)usercnt())*100));
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ snprintf(line,MAXBUF,"006 %s :%c-%s",user->nick,islast(servers[j]),servers[j]->name);
+ while (strlen(line) < 50)
+ strcat(line," ");
+ WriteServ(user->fd,"%s%d (%.2f%%)",line,map_count(servers[j]),(float)(((float)map_count(servers[j])/(float)usercnt())*100));
+ }
+ }
+ WriteServ(user->fd,"007 %s :End of /MAP",user->nick);
+}
+
+
void handle_oper(char **parameters, int pcnt, userrec *user)
{
char LoginName[MAXBUF];
char Hostname[MAXBUF];
int i,j;
- for (i = 0; i < ConfValueEnum("oper",&config_f); i++)
+ for (int i = 0; i < ConfValueEnum("oper",&config_f); i++)
{
ConfValue("oper","name",i,LoginName,&config_f);
ConfValue("oper","password",i,Password,&config_f);
if (user->registered == 7)
{
WriteCommon(user,"NICK %s",parameters[0]);
+
+ // Q token must go to ALL servers!!!
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"n %s %s",user->nick,parameters[0]);
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j] != NULL)
+ {
+ if (strcmp(servers[j]->name,ServerName))
+ {
+ me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ log(DEBUG,"Sent n token");
+ }
+ }
+ }
+
}
/* change the nick of the user in the users_hash */
}
}
command_p[j++] = parameters;
- for (i = 0; i <= q; i++)
+ for (int i = 0; i <= q; i++)
{
if (parameters[i] == ' ')
{
// another phidjit bug...
if (total_params > 126)
{
- kill_link(user,"Protocol violation");
+ kill_link(user,"Protocol violation (1)");
return;
}
{
cmd[i] = toupper(cmd[i]);
}
- log(DEBUG,"Preprocess done");
+ log(DEBUG,"Preprocess done length=%d",strlen(cmd));
+ command = cmd;
}
else
{
strcpy(cmd,"");
j = 0;
/* strip out extraneous linefeeds through mirc's crappy pasting (thanks Craig) */
- for (i = 0; i < strlen(temp); i++)
+ for (int i = 0; i < strlen(temp); i++)
{
if ((temp[i] != 10) && (temp[i] != 13) && (temp[i] != 0) && (temp[i] != 7))
{
command = cmd;
if (strchr(cmd,' '))
{
- for (i = 0; i <= strlen(cmd); i++)
+ for (int i = 0; i <= strlen(cmd); i++)
{
/* capitalise the command ONLY, leave params intact */
cmd[i] = toupper(cmd[i]);
}
else
{
- for (i = 0; i <= strlen(cmd); i++)
+ for (int i = 0; i <= strlen(cmd); i++)
{
cmd[i] = toupper(cmd[i]);
}
}
}
-
cmd_found = 0;
if (strlen(command)>MAXCOMMAND)
{
- kill_link(user,"Protocol violation");
+ kill_link(user,"Protocol violation (2)");
return;
}
{
if (((command[x] < '0') || (command[x]> '9')) && (command[x] != '-'))
{
- if (!strchr("@!\"$%^&*(){}[]_-=+;:'#~,.<>/?\\|`",command[x]))
+ if (strchr("@!\"$%^&*(){}[]_-=+;:'#~,.<>/?\\|`",command[x]))
{
- kill_link(user,"Protocol violation");
+ kill_link(user,"Protocol violation (3)");
return;
}
}
}
}
- for (i = 0; i != cmdlist.size(); i++)
+ for (int i = 0; i != cmdlist.size(); i++)
{
if (strcmp(cmdlist[i].command,""))
{
createcommand("CONNECT",handle_connect,'o',1);
createcommand("SQUIT",handle_squit,'o',1);
createcommand("MODULES",handle_modules,'o',0);
+ createcommand("LINKS",handle_links,0,0);
+ createcommand("MAP",handle_map,0,0);
}
-void process_buffer(userrec *user)
+void process_buffer(const char* cmdbuf,userrec *user)
{
if (!user)
{
}
char cmd[MAXBUF];
int i;
- if (!user->inbuf)
+ if (!cmdbuf)
{
log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter");
return;
}
- if (!strcmp(user->inbuf,""))
+ if (!strcmp(cmdbuf,""))
{
return;
}
- strncpy(cmd,user->inbuf,MAXBUF);
+ strncpy(cmd,cmdbuf,MAXBUF);
if (!strcmp(cmd,""))
{
return;
{
cmd[strlen(cmd)-1] = '\0';
}
- strcpy(user->inbuf,"");
if (!strcmp(cmd,""))
{
return;
}
}
+void DoSync(serverrec* serv, char* udp_host,int udp_port, long MyKey)
+{
+ char data[MAXBUF];
+ // 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,"Y %d",time(NULL));
+ serv->SendPacket(data,udp_host,udp_port,MyKey);
+ // send users and channels
+ for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+ {
+ snprintf(data,MAXBUF,"N %d %s %s %s %s +%s %s :%s",u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->server,u->second->fullname);
+ serv->SendPacket(data,udp_host,udp_port,MyKey);
+ if (strcmp(chlist(u->second),""))
+ {
+ snprintf(data,MAXBUF,"J %s %s",u->second->nick,chlist(u->second));
+ serv->SendPacket(data,udp_host,udp_port,MyKey);
+ }
+ }
+ // 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,udp_host,udp_port,MyKey);
+ if (strcmp(c->second->topic,""))
+ {
+ snprintf(data,MAXBUF,"T %d %s %s :%s",c->second->topicset,c->second->setby,c->second->name,c->second->topic);
+ serv->SendPacket(data,udp_host,udp_port,MyKey);
+ }
+ // send current banlist
+
+ for (BanList::iterator b = c->second->bans.begin(); b != c->second->bans.end(); b++)
+ {
+ snprintf(data,MAXBUF,"M %s +b %s",b->set_time,c->second->name,b->data);
+ serv->SendPacket(data,udp_host,udp_port,MyKey);
+ }
+ }
+ // send end of sync marker: E <timestamp>
+ snprintf(data,MAXBUF,"F %d",time(NULL));
+ serv->SendPacket(data,udp_host,udp_port,MyKey);
+ // ircd sends its serverlist after the end of sync here
+}
+
+
+void handle_V(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ char* src = strtok(params," ");
+ char* dest = strtok(NULL," :");
+ char* text = strtok(NULL,"\r\n");
+ text++;
+
+ userrec* user = Find(src);
+ if (user)
+ {
+ userrec* dst = Find(dest);
+
+ if (dst)
+ {
+ WriteTo(user, dst, "NOTICE %s :%s", dst->nick, text);
+ }
+ else
+ {
+ chanrec* d = FindChan(dest);
+ if (d)
+ {
+ ChanExceptSender(d, user, "NOTICE %s :%s", d->name, text);
+ }
+ }
+ }
+
+}
+
+
+void handle_P(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ char* src = strtok(params," ");
+ char* dest = strtok(NULL," :");
+ char* text = strtok(NULL,"\r\n");
+ text++;
+
+ userrec* user = Find(src);
+ if (user)
+ {
+ userrec* dst = Find(dest);
+
+ if (dst)
+ {
+ WriteTo(user, dst, "PRIVMSG %s :%s", dst->nick, text);
+ }
+ else
+ {
+ chanrec* d = FindChan(dest);
+ if (d)
+ {
+ ChanExceptSender(d, user, "PRIVMSG %s :%s", d->name, text);
+ }
+ }
+ }
+
+}
+
+void handle_i(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ char* nick = strtok(params," ");
+ char* from = strtok(NULL," ");
+ char* channel = strtok(NULL," ");
+ userrec* u = Find(nick);
+ userrec* user = Find(from);
+ chanrec* c = FindChan(channel);
+ if ((c) && (u) && (user))
+ {
+ u->InviteTo(c->name);
+ WriteFrom(u->fd,user,"INVITE %s :%s",u->nick,c->name);
+ }
+}
+
+void handle_t(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ char* setby = strtok(params," ");
+ char* channel = strtok(NULL," :");
+ char* topic = strtok(NULL,"\r\n");
+ topic++;
+ userrec* u = Find(setby);
+ chanrec* c = FindChan(channel);
+ if ((c) && (u))
+ {
+ WriteChannelLocal(c,u,"TOPIC %s :%s",c->name,topic);
+ strncpy(c->topic,topic,MAXTOPIC);
+ strncpy(c->setby,u->nick,NICKMAX);
+ }
+}
+
+
+void handle_T(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ char* tm = strtok(params," ");
+ char* setby = strtok(NULL," ");
+ char* channel = strtok(NULL," :");
+ char* topic = strtok(NULL,"\r\n");
+ topic++;
+ time_t TS = atoi(tm);
+ chanrec* c = FindChan(channel);
+ if (c)
+ {
+ // in the case of topics and TS, the *NEWER*
+ if (TS <= c->topicset)
+ {
+ WriteChannelLocal(c,NULL,"TOPIC %s :%s",c->name,topic);
+ strncpy(c->topic,topic,MAXTOPIC);
+ strncpy(c->setby,setby,NICKMAX);
+ }
+ }
+}
+
+void handle_M(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ char* pars[128];
+ char original[MAXBUF],target[MAXBUF];
+ strncpy(original,params,MAXBUF);
+ int index = 0;
+ char* parameter = strtok(params," ");
+ strncpy(target,parameter,MAXBUF);
+ while (parameter)
+ {
+ pars[index++] = parameter;
+ parameter = strtok(NULL," ");
+ }
+ merge_mode(pars,index);
+ if (FindChan(target))
+ {
+ WriteChannelLocal(FindChan(target), NULL, "MODE %s",original);
+ }
+ if (Find(target))
+ {
+ WriteTo(NULL,Find(target),"MODE %s",original);
+ }
+}
+
+// m is modes set by users only (not servers) valid targets are channels or users.
+
+void handle_m(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ // m blah #chatspike +b *!test@*4
+ char* pars[128];
+ char original[MAXBUF];
+ strncpy(original,params,MAXBUF);
+
+ if (!strchr(params,' '))
+ {
+ WriteOpers("WARNING! 'm' token in data stream without any parameters! Something fishy is going on!");
+ return;
+ }
+
+ int index = 0;
+
+ char* src = strtok(params," ");
+ userrec* user = Find(src);
+
+ if (user)
+ {
+ log(DEBUG,"Found user: %s",user->nick);
+ char* parameter = strtok(NULL," ");
+ while (parameter)
+ {
+ pars[index++] = parameter;
+ parameter = strtok(NULL," ");
+ }
+
+ log(DEBUG,"Calling merge_mode2");
+ merge_mode2(pars,index,user);
+ }
+}
+
+
+void handle_L(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ char* nick = strtok(params," ");
+ char* channel = strtok(NULL," :");
+ char* reason = strtok(NULL,"\r\n");
+ userrec* user = Find(nick);
+ reason++;
+ if (user)
+ {
+ if (strcmp(reason,""))
+ {
+ del_channel(user,channel,reason,true);
+ }
+ else
+ {
+ del_channel(user,channel,NULL,true);
+ }
+ }
+}
+
+void handle_Q(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ char* nick = strtok(params," :");
+ char* reason = strtok(NULL,"\r\n");
+ reason++;
+
+ userrec* user = Find(nick);
+
+ if (user)
+ {
+ if (strlen(reason)>MAXQUIT)
+ {
+ reason[MAXQUIT-1] = '\0';
+ }
+
+
+ WriteCommonExcept(user,"QUIT :%s",reason);
+
+ user_hash::iterator iter = clientlist.find(user->nick);
+
+ if (iter != clientlist.end())
+ {
+ log(DEBUG,"deleting user hash value %d",iter->second);
+ if ((iter->second) && (user->registered == 7)) {
+ delete iter->second;
+ }
+ clientlist.erase(iter);
+ }
+
+ purge_empty_chans();
+ }
+}
+
+void handle_n(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ char* oldnick = strtok(params," ");
+ char* newnick = strtok(NULL," ");
+
+ userrec* user = Find(oldnick);
+
+ if (user)
+ {
+ WriteCommon(user,"NICK %s",newnick);
+ user = ReHashNick(user->nick, newnick);
+ if (!user) return;
+ if (!user->nick) return;
+ strncpy(user->nick, newnick,NICKMAX);
+ log(DEBUG,"new nick set: %s",user->nick);
+ }
+}
+
+// k <SOURCE> <DEST> <CHANNEL> :<REASON>
+void handle_k(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ char* src = strtok(params," ");
+ char* dest = strtok(NULL," ");
+ char* channel = strtok(NULL," :");
+ char* reason = strtok(NULL,"\r\n");
+ reason++;
+ userrec* s = Find(src);
+ userrec* d = Find(dest);
+ chanrec* c = FindChan(channel);
+ if ((s) && (d) && (c))
+ {
+ kick_channel(s,d,c,reason);
+ }
+}
+
+void handle_N(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ char* tm = strtok(params," ");
+ char* nick = strtok(NULL," ");
+ char* host = strtok(NULL," ");
+ char* dhost = strtok(NULL," ");
+ char* ident = strtok(NULL," ");
+ char* modes = strtok(NULL," ");
+ char* server = strtok(NULL," :");
+ char* gecos = strtok(NULL,"\r\n");
+ gecos++;
+ modes++;
+ time_t TS = atoi(tm);
+ user_hash::iterator iter = clientlist.find(nick);
+ if (iter != clientlist.end())
+ {
+ // nick collision
+ WriteOpers("Nickname collision: %s@%s != %s@%s",nick,server,iter->second->nick,iter->second->server);
+ if (TS >= iter->second->age)
+ {
+ char str[MAXBUF];
+ snprintf(str,MAXBUF,"Killed (Nick Collision (%s@%s < %s@%s))",nick,server,iter->second->nick,iter->second->server);
+ WriteServ(iter->second->fd, "KILL %s :%s",iter->second->nick,str);
+ // client on remote server is older than the local user, kill the local user
+ kill_link(iter->second,str);
+ }
+ }
+ clientlist[nick] = new userrec();
+ // remote users have an fd of -1. This is so that our Write abstraction
+ // routines know to route any messages to this record away to whatever server
+ // theyre on.
+ clientlist[nick]->fd = -1;
+ strncpy(clientlist[nick]->nick, nick,NICKMAX);
+ strncpy(clientlist[nick]->host, host,160);
+ strncpy(clientlist[nick]->dhost, dhost,160);
+ strncpy(clientlist[nick]->server, server,256);
+ strncpy(clientlist[nick]->ident, ident,10); // +1 char to compensate for '~'
+ strncpy(clientlist[nick]->fullname, gecos,128);
+ clientlist[nick]->signon = TS;
+ clientlist[nick]->nping = 0; // this is ignored for a remote user anyway.
+ clientlist[nick]->lastping = 1;
+ clientlist[nick]->port = 0; // so is this...
+ clientlist[nick]->registered = 7; // this however we need to set for them to receive messages and appear online
+ clientlist[nick]->idle_lastmsg = time(NULL); // this is unrealiable and wont actually be used locally
+ for (int i = 0; i < MAXCHANS; i++)
+ {
+ clientlist[nick]->chans[i].channel = NULL;
+ clientlist[nick]->chans[i].uc_modes = 0;
+ }
+}
+
+void handle_F(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ long tdiff = time(NULL) - atoi(params);
+ if (tdiff)
+ WriteOpers("TS split for %s -> %s: %d",source->name,reply->name,tdiff);
+}
+
+void handle_J(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+ // IMPORTANT NOTE
+ // The J token currently has no timestamp - this needs looking at
+ // because it will allow splitriding.
+ char* nick = strtok(params," ");
+ char* channel = strtok(NULL," ");
+ userrec* user = Find(nick);
+ while (channel)
+ {
+ if ((user != NULL) && (strcmp(channel,"")))
+ {
+ char privilage = '\0';
+ if (channel[0] != '#')
+ {
+ privilage = channel[0];
+ channel++;
+ }
+ add_channel(user,channel,"",true);
+
+ // now work out the privilages they should have on each channel
+ // and send the appropriate servermodes.
+ for (int i = 0; i != MAXCHANS; i++)
+ {
+ if (user->chans[i].channel)
+ {
+ if (!strcasecmp(user->chans[i].channel->name,channel))
+ {
+ if (privilage == '@')
+ {
+ user->chans[i].uc_modes = user->chans[i].uc_modes | UCMODE_OP;
+ WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +o %s",channel,user->nick);
+ }
+ if (privilage == '%')
+ {
+ user->chans[i].uc_modes = user->chans[i].uc_modes | UCMODE_HOP;
+ WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +h %s",channel,user->nick);
+ }
+ if (privilage == '+')
+ {
+ user->chans[i].uc_modes = user->chans[i].uc_modes | UCMODE_VOICE;
+ WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +v %s",channel,user->nick);
+ }
+ }
+ }
+ }
+
+ }
+ channel = strtok(NULL," ");
+ }
+}
+
void process_restricted_commands(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
{
- WriteOpers("Secure-UDP-Channel: Token='%c', Params='%s'",token,params);
+ switch(token)
+ {
+ // Y <TS>
+ // start netburst
+ case 'Y':
+ nb_start = time(NULL);
+ WriteOpers("Server %s is starting netburst.",source->name);
+ break;
+ // ?
+ // ping
+ case '?':
+ reply->SendPacket("!",udp_host,udp_port,MyKey);
+ break;
+ // ?
+ // pong
+ case '!':
+ break;
+ // *
+ // no operation
+ case '*':
+ break;
+ // N <TS> <NICK> <HOST> <DHOST> <IDENT> <MODES> <SERVER> :<GECOS>
+ // introduce remote client
+ case 'N':
+ handle_N(token,params,source,reply,udp_host,udp_port);
+ break;
+ // t <NICK> <CHANNEL> :<TOPIC>
+ // change a channel topic
+ case 't':
+ handle_t(token,params,source,reply,udp_host,udp_port);
+ break;
+ // i <NICK> <CHANNEL>
+ // invite a user to a channel
+ case 'i':
+ handle_i(token,params,source,reply,udp_host,udp_port);
+ break;
+ // k <SOURCE> <DEST> <CHANNEL> :<REASON>
+ // kick a user from a channel
+ case 'k':
+ handle_k(token,params,source,reply,udp_host,udp_port);
+ break;
+ // n <NICK> <NEWNICK>
+ // change nickname of client -- a server should only be able to
+ // change the nicknames of clients that reside on it unless
+ // they are ulined.
+ case 'n':
+ handle_n(token,params,source,reply,udp_host,udp_port);
+ break;
+ // J <NICK> <CHANLIST>
+ // Join user to channel list, merge channel permissions
+ case 'J':
+ handle_J(token,params,source,reply,udp_host,udp_port);
+ break;
+ // T <TS> <CHANNEL> <TOPICSETTER> :<TOPIC>
+ // change channel topic (netburst only)
+ case 'T':
+ handle_T(token,params,source,reply,udp_host,udp_port);
+ break;
+ // M <TARGET> <MODES> [MODE-PARAMETERS]
+ // Server setting modes on an object
+ case 'M':
+ handle_M(token,params,source,reply,udp_host,udp_port);
+ break;
+ // m <SOURCE> <TARGET> <MODES> [MODE-PARAMETERS]
+ // User setting modes on an object
+ case 'm':
+ handle_m(token,params,source,reply,udp_host,udp_port);
+ break;
+ // P <SOURCE> <TARGET> :<TEXT>
+ // Send a private/channel message
+ case 'P':
+ handle_P(token,params,source,reply,udp_host,udp_port);
+ break;
+ // V <SOURCE> <TARGET> :<TEXT>
+ // Send a private/channel notice
+ case 'V':
+ handle_V(token,params,source,reply,udp_host,udp_port);
+ break;
+ // L <SOURCE> <CHANNEL> :<REASON>
+ // User parting a channel
+ case 'L':
+ handle_L(token,params,source,reply,udp_host,udp_port);
+ break;
+ // Q <SOURCE> :<REASON>
+ // user quitting
+ case 'Q':
+ handle_Q(token,params,source,reply,udp_host,udp_port);
+ break;
+ // F <TS>
+ // end netburst
+ case 'F':
+ WriteOpers("Server %s has completed netburst. (%d secs)",source->name,time(NULL)-nb_start);
+ handle_F(token,params,source,reply,udp_host,udp_port);
+ break;
+ // anything else
+ default:
+ WriteOpers("WARNING! Unknown datagram type '%c'",token);
+ break;
+ }
}
char* servername = strtok(params," ");
char* password = strtok(NULL," ");
char* serverdesc = finalparam+2;
- WriteOpers("CONNECT from %s (%s)",servername,udp_host,password,serverdesc);
+ WriteOpers("CONNECT from %s (%s)",servername,udp_host);
char Link_ServerName[1024];
servers[j] = new serverrec;
strcpy(servers[j]->internal_addr,udp_host);
strcpy(servers[j]->name,servername);
+ strcpy(servers[j]->description,serverdesc);
+ servers[j]->internal_port = udp_port;
// create a server record for this server
+ WriteOpers("Server %s authenticated, exchanging server keys...",servername);
snprintf(response,10240,"O %d",MyKey);
serv->SendPacket(response,udp_host,udp_port,0);
return;
if (!strcasecmp(servers[i]->internal_addr,udp_host)) {
servers[i]->key = atoi(params);
log(DEBUG,"Key for this server is now %d",servers[i]->key);
- serv->SendPacket("Z blah blah",udp_host,udp_port,MyKey);
+ servers[i]->sync_soon = true;
return;
}
}
for (int j = 0; j < 255; j++) {
if (servers[j] != NULL) {
if (!strcasecmp(servers[j]->internal_addr,udp_host)) {
+ strcpy(servers[j]->description,serverdesc);
WriteOpers("Server %s authenticated, exchanging server keys...",servername);
snprintf(response,10240,"O %d",MyKey);
serv->SendPacket(response,udp_host,udp_port,0);
if (servers[j]->key == theirkey) {
// found a valid key for this server, can process restricted stuff here
process_restricted_commands(token,params,servers[j],serv,udp_host,udp_port);
-
return;
}
}
int openSockfd[MAXSOCKS], incomingSockfd, result = TRUE;
socklen_t length;
int count = 0, scanDetectTrigger = TRUE, showBanner = FALSE;
- int selectResult = 0;
+ int selectResult = 0, selectResult2 = 0;
char *temp, configToken[MAXBUF], stuff[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
char resolvedHost[MAXBUF];
fd_set selectFds;
int flip_flop = 0, udp_port = 0;
char udp_msg[MAXBUF], udp_host[MAXBUF];
- /* main loop for multiplexing/resetting */
+ /* main loop, this never returns */
for (;;)
{
- /* set up select call */
- for (count = 0; count < boundPortCount; count++)
- {
- FD_SET (openSockfd[count], &selectFds);
- }
-
- /* added timeout! select was waiting forever... wank... :/ */
- tv.tv_usec = 0;
-
- flip_flop++;
- reap_counter++;
- if (flip_flop > 20)
- {
- tv.tv_usec = 1;
- flip_flop = 0;
- }
-
- vector<int>::iterator niterator;
-
+
+ fd_set sfd;
+ timeval tval;
+ FD_ZERO(&sfd);
+
+ user_hash::iterator count2 = clientlist.begin();
// *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 (reap_counter>5000) {
- if (fd_reap.size() > 0) {
+ if (reap_counter>5000)
+ {
+ if (fd_reap.size() > 0)
+ {
for( int n = 0; n < fd_reap.size(); n++)
{
Blocking(fd_reap[n]);
}
fd_reap.clear();
reap_counter=0;
+ for (int j = 0; j < 255; j++)
+ {
+ if (servers[j])
+ {
+ if (servers[j]->sync_soon)
+ {
+ servers[j]->sync_soon = false;
+ DoSync(servers[j],servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+ }
+ }
+ }
}
-
- tv.tv_sec = 0;
- selectResult = select(MAXSOCKS, &selectFds, NULL, NULL, &tv);
-
+
for (int x = 0; x != UDPportCount; x++)
{
long theirkey = 0;
FOREACH_MOD OnPacketReceive(udp_msg);
// Packets must go back via the route they arrived on :)
handle_link_packet(theirkey, udp_msg, udp_host, udp_port, me[x]);
+ // link packets can manipulate the usertable so beware of
+ // any loops here watching the user or channels hash
+ log(DEBUG,"Sync: exit 3");
+ goto label;
}
}
}
+
- for (user_hash::iterator count2 = clientlist.begin(); count2 != clientlist.end(); count2++)
+ while (count2 != clientlist.end())
{
- char data[MAXBUF];
+ char data[10240];
+ tval.tv_usec = tval.tv_sec = 0;
+ FD_ZERO(&sfd);
+ int total_in_this_set = 0;
+
+ user_hash::iterator xcount = count2;
+ user_hash::iterator endingiter = count2;
if (!count2->second) break;
if (count2->second)
- if (count2->second->fd)
- {
- // registration timeout -- didnt send USER/NICK/HOST in the time specified in
- // their connection class.
- if ((time(NULL) > count2->second->timeout) && (count2->second->registered != 7))
+ if (count2->second->fd != 0)
+ {
+ // 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.
+ while (total_in_this_set < 64)
{
- log(DEBUG,"InspIRCd: registration timeout: %s",count2->second->nick);
- kill_link(count2->second,"Registration timeout");
- break;
- }
- if (((time(NULL)) > count2->second->nping) && (isnick(count2->second->nick)) && (count2->second->registered == 7))
- {
- if (!count2->second->lastping)
+ if (count2 != clientlist.end())
{
- log(DEBUG,"InspIRCd: ping timeout: %s",count2->second->nick);
- kill_link(count2->second,"Ping timeout");
- break;
+ // we don't check the state of remote users.
+ if (count2->second->fd > 0)
+ {
+ FD_SET (count2->second->fd, &sfd);
+
+ // registration timeout -- didnt send USER/NICK/HOST in the time specified in
+ // their connection class.
+ if ((time(NULL) > count2->second->timeout) && (count2->second->registered != 7))
+ {
+ log(DEBUG,"InspIRCd: registration timeout: %s",count2->second->nick);
+ kill_link(count2->second,"Registration timeout");
+ goto label;
+ }
+ if (((time(NULL)) > count2->second->nping) && (isnick(count2->second->nick)) && (count2->second->registered == 7))
+ {
+ if ((!count2->second->lastping) && (count2->second->registered == 7))
+ {
+ log(DEBUG,"InspIRCd: ping timeout: %s",count2->second->nick);
+ kill_link(count2->second,"Ping timeout");
+ goto label;
+ }
+ Write(count2->second->fd,"PING :%s",ServerName);
+ log(DEBUG,"InspIRCd: pinging: %s",count2->second->nick);
+ count2->second->lastping = 0;
+ count2->second->nping = time(NULL)+120;
+ }
+ }
+ count2++;
+ total_in_this_set++;
}
- Write(count2->second->fd,"PING :%s",ServerName);
- log(DEBUG,"InspIRCd: pinging: %s",count2->second->nick);
- count2->second->lastping = 0;
- count2->second->nping = time(NULL)+120;
+ else break;
}
+
+ endingiter = count2;
+ count2 = xcount; // roll back to where we were
+
+ int v = 0;
+
+ tval.tv_usec = 0;
+ tval.tv_sec = 0;
+ selectResult2 = select(65535, &sfd, NULL, NULL, &tval);
- result = read(count2->second->fd, data, 1);
- // result EAGAIN means nothing read
- if (result == EAGAIN)
- {
- }
- else
- if (result == 0)
- {
- if (count2->second)
- {
- log(DEBUG,"InspIRCd: Exited: %s",count2->second->nick);
- kill_link(count2->second,"Client exited");
- // must bail here? kill_link removes the hash, corrupting the iterator
- log(DEBUG,"Bailing from client exit");
- break;
- }
- }
- else if (result > 0)
+ // now loop through all of the items in this pool if any are waiting
+ //if (selectResult2 > 0)
+ for (user_hash::iterator count2a = xcount; count2a != endingiter; count2a++)
{
- if (count2->second)
+ result = EAGAIN;
+ if ((count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd)))
{
-
- // until the buffer is at 509 chars anything can be inserted into it.
- if ((strlen(count2->second->inbuf) < 509) && (data[0] != '\0')) {
- strncat(count2->second->inbuf, data, result);
- }
-
- // once you reach 509 chars, only a \r or \n can be inserted,
- // completing the line.
- if ((strlen(count2->second->inbuf) >= 509) && ((data[0] == '\r') || (data[0] == '\n'))) {
- count2->second->inbuf[509] = '\r';
- count2->second->inbuf[510] = '\n';
- count2->second->inbuf[511] = '\0';
- process_buffer(count2->second);
- break;
- }
-
- if (strchr(count2->second->inbuf, '\n') || strchr(count2->second->inbuf, '\r') || (strlen(count2->second->inbuf) > 509))
+ log(DEBUG,"Reading fd %d",count2a->second->fd);
+ memset(data, 0, 10240);
+ result = read(count2a->second->fd, data, 10240);
+
+ if (result)
{
- /* at least one complete line is waiting to be processed */
- if (!count2->second->fd)
- break;
- else
+ log(DEBUG,"Read %d characters from socket",result);
+ userrec* current = count2a->second;
+ int currfd = current->fd;
+ char* l = strtok(data,"\n");
+ int floodlines = 0;
+ while (l)
{
- if (strlen(count2->second->inbuf)<512)
+ floodlines++;
+ if ((floodlines > current->flood) && (current->flood != 0))
{
- // double check the length before processing!
- process_buffer(count2->second);
+ 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;
}
- else
+ char sanitized[NetBufferSize];
+ memset(sanitized, 0, NetBufferSize);
+ int ptt = 0;
+ for (int pt = 0; pt < strlen(l); pt++)
{
- strcpy(count2->second->inbuf,"");
+ if (l[pt] != '\r')
+ {
+ sanitized[ptt++] = l[pt];
+ }
}
- break;
+ sanitized[ptt] = '\0';
+ if (strlen(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++)
+ {
+ if (c2->second->fd == currfd)
+ {
+ // found again, update pointer
+ current == c2->second;
+ find_again = true;
+ break;
+ }
+ }
+ if (!find_again)
+ goto label;
+
+ }
+ l = strtok(NULL,"\n");
}
+ goto label;
+ }
+
+ if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
+ {
+ log(DEBUG,"killing: %s",count2a->second->nick);
+ kill_link(count2a->second,strerror(errno));
+ goto label;
+ }
+ }
+ // result EAGAIN means nothing read
+ if (result == EAGAIN)
+ {
+ }
+ else
+ if (result == 0)
+ {
+ if (count2->second)
+ {
+ log(DEBUG,"InspIRCd: Exited: %s",count2a->second->nick);
+ kill_link(count2a->second,"Client exited");
+ // must bail here? kill_link removes the hash, corrupting the iterator
+ log(DEBUG,"Bailing from client exit");
+ goto label;
}
}
+ else if (result > 0)
+ {
+ }
}
}
+ for (int q = 0; q < total_in_this_set; q++)
+ {
+ // there is no iterator += operator :(
+ //if (count2 != clientlist.end())
+ //{
+ count2++;
+ //}
+ }
+ }
+
+ // set up select call
+ for (count = 0; count < boundPortCount; count++)
+ {
+ FD_SET (openSockfd[count], &selectFds);
+ }
+
+ /* added timeout! select was waiting forever... wank... :/ */
+ tv.tv_usec = 0;
+
+ flip_flop++;
+ reap_counter++;
+ if (flip_flop > 20)
+ {
+ tv.tv_usec = 1;
+ flip_flop = 0;
}
+ tv.tv_sec = 0;
+ selectResult = select(MAXSOCKS, &selectFds, NULL, NULL, &tv);
+
/* select is reporting a waiting socket. Poll them all to find out which */
if (selectResult > 0)
{
{
WriteOpers("*** WARNING: Accept failed on port %d (%s)", ports[count],target);
log(DEBUG,"InspIRCd: accept failed: %d",ports[count]);
- break;
}
- AddClient(incomingSockfd, resolved, ports[count], iscached);
- log(DEBUG,"InspIRCd: adding client on port %d fd=%d",ports[count],incomingSockfd);
- break;
+ else
+ {
+ AddClient(incomingSockfd, resolved, ports[count], iscached);
+ log(DEBUG,"InspIRCd: adding client on port %d fd=%d",ports[count],incomingSockfd);
+ }
+ goto label;
}
}
}
+ label:
+ if(0) {}; // "Label must be followed by a statement"... so i gave it one.
}
/* not reached */
close (incomingSockfd);
projects / user / henk / code / inspircd.git / blobdiff