extern std::vector<Module*> modules;
std::vector<std::string> module_names;
extern std::vector<ircd_module*> factory;
-std::vector<int> fd_reap;
extern int MODCOUNT;
int openSockfd[MAXSOCKS];
char a[MAXBUF],b[MAXBUF];
strlcpy(a,s1.c_str(),MAXBUF);
strlcpy(b,s2.c_str(),MAXBUF);
+ strlower(a);
+ strlower(b);
return (strcasecmp(a,b) == 0);
}
std::vector<long> auth_cookies;
std::stringstream config_f(stringstream::in | stringstream::out);
+std::vector<userrec*> all_opers;
+void AddOper(userrec* user)
+{
+ log(DEBUG,"Oper added to optimization list");
+ all_opers.push_back(user);
+}
+
+void DeleteOper(userrec* user)
+{
+ for (std::vector<userrec*>::iterator a = all_opers.begin(); a < all_opers.end(); a++)
+ {
+ if (*a == user)
+ {
+ log(DEBUG,"Oper removed from optimization list");
+ all_opers.erase(a);
+ return;
+ }
+ }
+}
long GetRevision()
{
char Revision[] = "$Revision$";
char *s1 = Revision;
char *savept;
- char *v1 = strtok_r(s1," ",&savept);
- s1 = savept;
char *v2 = strtok_r(s1," ",&savept);
s1 = savept;
+ v2 = strtok_r(s1," ",&savept);
+ s1 = savept;
return (long)(atof(v2)*10000);
}
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
strlcpy(b,asctime(timeinfo),MAXBUF);
- b[strlen(b)-1] = ':';
+ b[24] = ':'; // we know this is the end of the time string
fprintf(log_file,"%s %s\n",b,textbuffer);
if (nofork)
{
{
fgets(linebuf,sizeof(linebuf),file);
linebuf[strlen(linebuf)-1]='\0';
- if (!strcmp(linebuf,""))
+ if (linebuf[0] == 0)
{
strcpy(linebuf," ");
}
{
log(DEBUG,"readfile: failed to load file: %s",fname);
}
- log(DEBUG,"readfile: loaded %s, %d lines",fname,F.size());
+ log(DEBUG,"readfile: loaded %s, %lu lines",fname,(unsigned long)F.size());
}
void ReadConfig(bool bail, userrec* user)
dns_timeout = atoi(DNT);
if (!dns_timeout)
dns_timeout = 5;
- if (!strcmp(DNSServer,""))
+ if (!DNSServer[0])
strlcpy(DNSServer,"127.0.0.1",MAXBUF);
- if (!strcmp(ModPath,""))
+ if (!ModPath[0])
strlcpy(ModPath,MOD_PATH,MAXBUF);
AllowHalfop = ((!strcasecmp(AH,"true")) || (!strcasecmp(AH,"1")) || (!strcasecmp(AH,"yes")));
AllowProtect = ((!strcasecmp(AP,"true")) || (!strcasecmp(AP,"1")) || (!strcasecmp(AP,"yes")));
ConfValue("connect","timeout",i,timeout,&config_f);
ConfValue("connect","flood",i,flood,&config_f);
ConfValue("connect","pingfreq",i,pfreq,&config_f);
- if (strcmp(Value,""))
+ if (Value[0])
{
strlcpy(c.host,Value,MAXBUF);
c.type = CC_ALLOW;
c.pingtime = atoi(pfreq);
}
Classes.push_back(c);
- log(DEBUG,"Read connect class type ALLOW, host=%s password=%s timeout=%d flood=%d",c.host,c.pass,c.registration_timeout,c.flood);
+ log(DEBUG,"Read connect class type ALLOW, host=%s password=%s timeout=%lu flood=%lu",c.host,c.pass,(unsigned long)c.registration_timeout,(unsigned long)c.flood);
}
else
{
read_xline_defaults();
log(DEFAULT,"Applying K lines, Q lines and Z lines...");
apply_lines();
- log(DEFAULT,"Done reading configuration file, InspIRCd is now running.");
+ log(DEFAULT,"Done reading configuration file, InspIRCd is now starting.");
if (!bail)
{
log(DEFAULT,"Adding and removing modules due to rehash...");
WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ModuleError());
}
}
- log(DEFAULT,"Successfully unloaded %d of %d modules and loaded %d of %d modules.",rem,removed_modules.size(),add,added_modules.size());
+ log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
}
}
va_start (argsPtr, text);
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- snprintf(tb,MAXBUF,"%s\r\n",textbuffer);
+ int bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer);
chop(tb);
if (sock != -1)
{
- write(sock,tb,strlen(tb));
+ write(sock,tb,bytes > 514 ? 514 : bytes);
}
}
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- snprintf(tb,MAXBUF,":%s %s\r\n",ServerName,textbuffer);
+ int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",ServerName,textbuffer);
chop(tb);
if (sock != -1)
{
- write(sock,tb,strlen(tb));
+ write(sock,tb,bytes > 514 ? 514 : bytes);
}
}
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer);
+ int bytes = snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer);
chop(tb);
if (sock != -1)
{
- write(sock,tb,strlen(tb));
+ write(sock,tb,bytes > 514 ? 514 : bytes);
}
}
va_start (argsPtr, text);
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+
+ std::vector<char*> *ulist = Ptr->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
{
- if (has_channel(i->second,Ptr))
- {
- if (i->second->fd != FD_MAGIC_NUMBER)
- WriteTo(user,i->second,"%s",textbuffer);
- }
+ char* o = (*ulist)[j];
+ userrec* otheruser = (userrec*)o;
+ if (otheruser->fd != FD_MAGIC_NUMBER)
+ WriteTo(user,otheruser,"%s",textbuffer);
}
}
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))
+
+ std::vector<char*> *ulist = Ptr->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* otheruser = (userrec*)o;
+ if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser->fd != -1) && (otheruser != user))
{
- if ((i->second->fd != -1) && (i->second->fd != FD_MAGIC_NUMBER))
+ if (!user)
{
- if (!user)
- {
- WriteServ(i->second->fd,"%s",textbuffer);
- }
- else
- {
- WriteTo(user,i->second,"%s",textbuffer);
- }
- }
+ WriteServ(otheruser->fd,"%s",textbuffer);
+ }
+ else
+ {
+ WriteTo(user,otheruser,"%s",textbuffer);
+ }
}
- }
+ }
}
-void WriteChannelWithServ(char* ServerName, chanrec* Ptr, userrec* user, char* text, ...)
+void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
{
- if ((!Ptr) || (!user) || (!text))
+ if ((!Ptr) || (!text))
{
log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
return;
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 (i->second)
- {
- if ((has_channel(i->second,Ptr)) && (i->second->fd != FD_MAGIC_NUMBER))
- {
- WriteServ(i->second->fd,"%s",textbuffer);
- }
- }
- }
+
+
+ std::vector<char*> *ulist = Ptr->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* otheruser = (userrec*)o;
+ if (otheruser->fd != FD_MAGIC_NUMBER)
+ WriteServ(otheruser->fd,"%s",textbuffer);
+ }
}
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if (i->second)
- {
- if ((has_channel(i->second,Ptr)) && (user != i->second) && (i->second->fd != FD_MAGIC_NUMBER))
- {
- WriteTo(user,i->second,"%s",textbuffer);
- }
- }
- }
+ std::vector<char*> *ulist = Ptr->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* otheruser = (userrec*)o;
+ if ((otheruser->fd != FD_MAGIC_NUMBER) && (user != otheruser))
+ WriteFrom(otheruser->fd,user,"%s",textbuffer);
+ }
}
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- WriteFrom(u->fd,u,"%s",textbuffer);
+ // FIX: Stops a message going to the same person more than once
+ std::vector<int> already_sent;
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ for (int i = 0; i < MAXCHANS; i++)
+ {
+ if (u->chans[i].channel)
+ {
+ std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* otheruser = (userrec*)o;
+ bool do_send = true;
+ for (int t = 0; t < already_sent.size(); t++)
+ {
+ if (already_sent[t] == otheruser->fd)
+ {
+ do_send = false;
+ break;
+ }
+ }
+ if (do_send)
+ {
+ already_sent.push_back(otheruser->fd);
+ WriteFrom(otheruser->fd,u,"%s",textbuffer);
+ }
+ }
+ }
+ }
+ // if the user was not in any channels, no users will receive the text. Make sure the user
+ // receives their OWN message for WriteCommon
+ if (!already_sent.size())
{
- if (i->second)
- {
- if ((common_channels(u,i->second) && (i->second != u)) && (i->second->fd != FD_MAGIC_NUMBER))
- {
- WriteFrom(i->second->fd,u,"%s",textbuffer);
- }
- }
+ WriteFrom(u->fd,u,"%s",textbuffer);
}
}
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if (i->second)
- {
- if ((common_channels(u,i->second)) && (u != i->second))
- {
- WriteFrom(i->second->fd,u,"%s",textbuffer);
- }
- }
- }
+ std::vector<int> already_sent;
+
+ for (int i = 0; i < MAXCHANS; i++)
+ {
+ if (u->chans[i].channel)
+ {
+ std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* otheruser = (userrec*)o;
+ if (u != otheruser)
+ {
+ bool do_send = true;
+ for (int t = 0; t < already_sent.size(); t++)
+ {
+ if (already_sent[t] == otheruser->fd)
+ {
+ do_send = false;
+ break;
+ }
+ }
+ if (do_send)
+ {
+ already_sent.push_back(otheruser->fd);
+ WriteFrom(otheruser->fd,u,"%s",textbuffer);
+ }
+ }
+ }
+ }
+ }
}
void WriteOpers(char* text, ...)
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
{
- if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
+ userrec* a = *i;
+ if ((a) && (a->fd != FD_MAGIC_NUMBER))
{
- if (strchr(i->second->modes,'o'))
+ if (strchr(a->modes,'s'))
{
- if (strchr(i->second->modes,'s'))
- {
- // send server notices to all with +s
- // (TODO: needs SNOMASKs)
- WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,textbuffer);
- }
+ // send server notices to all with +s
+ WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer);
}
}
}
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;
- }
- }
- }
+
+ std::vector<char*> *ulist = c->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* user = (userrec*)o;
+ if (!strcasecmp(user->server,servername))
+ return true;
+ }
return false;
}
bool CommonOnThisServer(userrec* u,const 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))
- {
- log(DEBUG,"%s is common to %s sharing with %s",i->second->nick,servername,u->nick);
- return true;
- }
- }
- }
+
+ for (int i = 0; i < MAXCHANS; i++)
+ {
+ if (u->chans[i].channel)
+ {
+ std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* user = (userrec*)o;
+ if (!strcasecmp(user->server,servername))
+ return true;
+ }
+ }
+ }
return false;
}
va_start (argsPtr, text);
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
+ int modelen = strlen(modes);
for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
{
if (flags == WM_AND)
{
send_to_user = true;
- for (int n = 0; n < strlen(modes); n++)
+ for (int n = 0; n < modelen; n++)
{
if (!hasumode(i->second,modes[n]))
{
else if (flags == WM_OR)
{
send_to_user = false;
- for (int n = 0; n < strlen(modes); n++)
+ for (int n = 0; n < modelen; n++)
{
if (hasumode(i->second,modes[n]))
{
return;
}
- int i = 0;
char textbuffer[MAXBUF];
va_list argsPtr;
va_start (argsPtr, text);
{
return;
}
- for (int i = 0; i != strlen(n); i++)
+ for (int i = 0; n[i] != 0; i++)
{
n[i] = tolower(n[i]);
if (n[i] == '[')
}
-void purge_empty_chans(void)
+void purge_empty_chans(userrec* u)
{
+
int go_again = 1, purge = 0;
-
- while (go_again)
+
+ // firstly decrement the count on each channel
+ for (int f = 0; f < MAXCHANS; f++)
{
- go_again = 0;
- for (chan_hash::iterator i = chanlist.begin(); i != chanlist.end(); i++)
+ if (u->chans[f].channel)
{
- if (i->second) {
- if (!usercount(i->second))
- {
- /* kill the record */
- if (i != chanlist.end())
- {
- log(DEBUG,"del_channel: destroyed: %s",i->second->name);
- if (i->second)
- delete i->second;
- chanlist.erase(i);
- go_again = 1;
- purge++;
- break;
- }
- }
- else
+ u->chans[f].channel->DecUserCounter();
+ u->chans[f].channel->DelUser((char*)u);
+ }
+ }
+
+ for (int i = 0; i < MAXCHANS; i++)
+ {
+ if (u->chans[i].channel)
+ {
+ if (!usercount(u->chans[i].channel))
+ {
+ chan_hash::iterator i2 = chanlist.find(u->chans[i].channel->name);
+ /* kill the record */
+ if (i2 != chanlist.end())
{
- log(DEBUG,"skipped purge for %s",i->second->name);
+ log(DEBUG,"del_channel: destroyed: %s",i2->second->name);
+ if (i2->second)
+ delete i2->second;
+ chanlist.erase(i2);
+ go_again = 1;
+ purge++;
+ u->chans[i].channel = NULL;
}
}
+ else
+ {
+ log(DEBUG,"skipped purge for %s",u->chans[i].channel->name);
+ }
}
}
- log(DEBUG,"completed channel purge, killed %d",purge);
+ log(DEBUG,"completed channel purge, killed %lu",(unsigned long)purge);
+
+ DeleteOper(u);
}
{
strlcat(scratch,"t",MAXMODES);
}
- if (strcmp(chan->key,""))
+ if (chan->key[0])
{
strlcat(scratch,"k",MAXMODES);
}
{
strlcat(scratch,"p",MAXMODES);
}
- if (strcmp(chan->key,""))
+ if (chan->key[0])
{
strlcat(sparam," ",MAXBUF);
strlcat(sparam,chan->key,MAXBUF);
if (chan->limit)
{
char foo[24];
- sprintf(foo," %d",chan->limit);
+ sprintf(foo," %lu",(unsigned long)chan->limit);
strlcat(sparam,foo,MAXBUF);
}
- if (strlen(chan->custom_modes))
+ if (*chan->custom_modes)
{
strlcat(scratch,chan->custom_modes,MAXMODES);
- for (int z = 0; z < strlen(chan->custom_modes); z++)
+ for (int z = 0; chan->custom_modes[z] != 0; z++)
{
std::string extparam = chan->GetModeParameter(chan->custom_modes[z]);
if (extparam != "")
int usercount_i(chanrec *c)
{
- int i = 0;
int count = 0;
if (!c)
}
}
}
- log(DEBUG,"usercount_i: %s %d",c->name,count);
+ log(DEBUG,"usercount_i: %s %lu",c->name,(unsigned long)count);
return count;
}
int usercount(chanrec *c)
{
- int i = 0;
- int count = 0;
-
if (!c)
{
log(DEFAULT,"*** BUG *** usercount was given an invalid parameter");
return 0;
}
-
- strcpy(list,"");
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if (i->second)
- {
- if (has_channel(i->second,c))
- {
- if ((isnick(i->second->nick)) && (i->second->registered == 7))
- {
- count++;
- }
- }
- }
- }
- log(DEBUG,"usercount: %s %d",c->name,count);
+ int count = c->GetUserCounter();
+ log(DEBUG,"usercount: %s %lu",c->name,(unsigned long)count);
return count;
}
return 0;
}
- int i = 0;
chanrec* Ptr;
int created = 0;
char cname[MAXBUF];
if (!FindChan(cname))
{
- int MOD_RESULT = 0;
+ MOD_RESULT = 0;
FOREACH_RESULT(OnUserPreJoin(user,NULL,cname));
if (MOD_RESULT == 1) {
return NULL;
if ((!override) || (!strcasecmp(user->server,ServerName)))
{
log(DEBUG,"Not overriding...");
- int MOD_RESULT = 0;
+ MOD_RESULT = 0;
FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
if (MOD_RESULT == 1) {
return NULL;
if (!MOD_RESULT)
{
log(DEBUG,"add_channel: checking key, invite, etc");
- if (strcmp(Ptr->key,""))
+ MOD_RESULT = 0;
+ FOREACH_RESULT(OnCheckKey(user, Ptr, key ? key : ""));
+ if (MOD_RESULT == 0)
{
- 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);
- return NULL;
- }
- else
+ if (Ptr->key[0])
{
- 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
+ {
+ 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");
}
- log(DEBUG,"add_channel: no key");
-
- if (Ptr->inviteonly)
+ MOD_RESULT = 0;
+ FOREACH_RESULT(OnCheckInvite(user, Ptr));
+ if (MOD_RESULT == 0)
{
- log(DEBUG,"add_channel: channel is +i");
- if (user->IsInvited(Ptr->name))
+ if (Ptr->inviteonly)
{
- /* 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 +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");
}
- log(DEBUG,"add_channel: channel is not +i");
-
- if (Ptr->limit)
+ MOD_RESULT = 0;
+ FOREACH_RESULT(OnCheckLimit(user, Ptr));
+ if (MOD_RESULT == 0)
{
- if (usercount(Ptr) == Ptr->limit)
+ if (Ptr->limit)
{
- WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
- return NULL;
+ if (usercount(Ptr) >= Ptr->limit)
+ {
+ WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
+ return NULL;
+ }
}
}
-
log(DEBUG,"add_channel: about to walk banlist");
-
- /* check user against the channel banlist */
- if (Ptr)
+ MOD_RESULT = 0;
+ FOREACH_RESULT(OnCheckBan(user, Ptr));
+ if (MOD_RESULT == 0)
{
- if (Ptr->bans.size())
+ /* check user against the channel banlist */
+ if (Ptr)
{
- for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+ if (Ptr->bans.size())
{
- if (match(user->GetFullHost(),i->data))
+ for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
{
- WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
- return NULL;
+ 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: bans checked");
}
-
- log(DEBUG,"add_channel: bans checked");
}
log(DEBUG,"Passed channel checks");
- for (int i =0; i != MAXCHANS; i++)
+ for (int index =0; index != MAXCHANS; index++)
{
- log(DEBUG,"Check location %d",i);
- if (user->chans[i].channel == NULL)
+ log(DEBUG,"Check location %d",index);
+ if (user->chans[index].channel == NULL)
{
- log(DEBUG,"Adding into their channel list at location %d",i);
+ log(DEBUG,"Adding into their channel list at location %d",index);
if (created == 2)
{
/* first user in is given ops */
- user->chans[i].uc_modes = UCMODE_OP;
+ user->chans[index].uc_modes = UCMODE_OP;
}
else
{
- user->chans[i].uc_modes = 0;
+ user->chans[index].uc_modes = 0;
}
- user->chans[i].channel = Ptr;
+ user->chans[index].channel = Ptr;
+ Ptr->IncUserCounter();
+ 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.
if (Ptr->topicset)
{
WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
- WriteServ(user->fd,"333 %s %s %s %d", user->nick, Ptr->name, Ptr->setby, Ptr->topicset);
+ WriteServ(user->fd,"333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
}
userlist(user,Ptr);
WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
- WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name,chanmodes(Ptr));
- WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
+ //WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name,chanmodes(Ptr));
+ //WriteServ(user->fd,"329 %s %s %lu", user->nick, Ptr->name, (unsigned long)Ptr->created);
FOREACH_MOD OnUserJoin(user,Ptr);
return Ptr;
}
}
chanrec* Ptr;
- int created = 0;
if ((!cname) || (!user))
{
break;
}
}
+
+ Ptr->DecUserCounter();
+ Ptr->DelUser((char*)user);
/* if there are no users left on the channel */
if (!usercount(Ptr))
return;
}
- int i = 0;
- int created = 0;
-
if ((!Ptr) || (!user) || (!src))
{
return;
int MOD_RESULT = 0;
FOREACH_RESULT(OnAccessCheck(src,user,Ptr,AC_KICK));
-
if (MOD_RESULT == ACR_DENY)
return;
return;
}
}
-
+
+ MOD_RESULT = 0;
+ FOREACH_RESULT(OnUserPreKick(src,user,Ptr,reason));
+ if (MOD_RESULT)
+ return;
+
+ FOREACH_MOD OnUserKick(src,user,Ptr,reason);
+
for (int i =0; i != MAXCHANS; i++)
{
/* zap it from the channel list of the user */
break;
}
}
-
+
+ Ptr->DecUserCounter();
+ Ptr->DelUser((char*)user);
+
/* if there are no users left on the channel */
if (!usercount(Ptr))
{
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;
+ int j = 0, q = 0, total = 0, t = 0, t2 = 0, total2 = 0;
char keystr[MAXBUF];
char moo[MAXBUF];
log(DEBUG,"kill_link: %s '%s'",user->nick,reason);
Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
- log(DEBUG,"closing fd %d",user->fd);
+ log(DEBUG,"closing fd %lu",(unsigned long)user->fd);
/* bugfix, cant close() a nonblocking socket (sux!) */
if (user->registered == 7) {
NetSendToAll(buffer);
}
- /* push the socket on a stack of sockets due to be closed at the next opportunity
- * 'Client exited' is an exception to this as it means the client side has already
- * closed the socket, we don't need to do it.
- */
- fd_reap.push_back(user->fd);
-
- bool do_purge = false;
+ FOREACH_MOD OnUserDisconnect(user);
+
+ if (user->fd > -1)
+ {
+ shutdown(user->fd,2);
+ close(user->fd);
+ }
if (user->registered == 7) {
WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason);
AddWhoWas(user);
}
+ if (user->registered == 7) {
+ purge_empty_chans(user);
+ }
+
if (iter != clientlist.end())
{
- log(DEBUG,"deleting user hash value %d",iter->second);
+ log(DEBUG,"deleting user hash value %lu",(unsigned long)iter->second);
if ((iter->second) && (user->registered == 7)) {
if (iter->second) delete iter->second;
}
clientlist.erase(iter);
}
-
- if (user->registered == 7) {
- purge_empty_chans();
- }
- //user = NULL;
}
void kill_link_silent(userrec *user,const char* r)
log(DEBUG,"kill_link: %s '%s'",user->nick,reason);
Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
- log(DEBUG,"closing fd %d",user->fd);
+ log(DEBUG,"closing fd %lu",(unsigned long)user->fd);
/* bugfix, cant close() a nonblocking socket (sux!) */
if (user->registered == 7) {
NetSendToAll(buffer);
}
- /* push the socket on a stack of sockets due to be closed at the next opportunity
- * 'Client exited' is an exception to this as it means the client side has already
- * closed the socket, we don't need to do it.
- */
- fd_reap.push_back(user->fd);
-
- bool do_purge = false;
+ FOREACH_MOD OnUserDisconnect(user);
+
+ if (user->fd > -1)
+ {
+ shutdown(user->fd,2);
+ close(user->fd);
+ }
+
+ if (user->registered == 7) {
+ purge_empty_chans(user);
+ }
if (iter != clientlist.end())
{
- log(DEBUG,"deleting user hash value %d",iter->second);
+ log(DEBUG,"deleting user hash value %lu",(unsigned long)iter->second);
if ((iter->second) && (user->registered == 7)) {
if (iter->second) delete iter->second;
}
clientlist.erase(iter);
}
-
- if (user->registered == 7) {
- purge_empty_chans();
- }
}
userrec* ReHashNick(char* Old, char* New)
{
- user_hash::iterator newnick;
+ //user_hash::iterator newnick;
user_hash::iterator oldnick = clientlist.find(Old);
log(DEBUG,"ReHashNick: %s %s",Old,New);
/* add a client connection to the sockets list */
void AddClient(int socket, char* host, int port, bool iscached, char* ip)
{
- int i;
- int blocking = 1;
- char resolved[MAXBUF];
string tempnick;
char tn2[MAXBUF];
user_hash::iterator iter;
tempnick = ConvToStr(socket) + "-unknown";
- sprintf(tn2,"%d-unknown",socket);
+ sprintf(tn2,"%lu-unknown",(unsigned long)socket);
iter = clientlist.find(tempnick);
clientlist[tempnick] = new userrec();
NonBlocking(socket);
- log(DEBUG,"AddClient: %d %s %d %s",socket,host,port,ip);
+ log(DEBUG,"AddClient: %lu %s %d %s",(unsigned long)socket,host,port,ip);
clientlist[tempnick]->fd = socket;
strncpy(clientlist[tempnick]->nick, tn2,NICKMAX);
strncpy(clientlist[tempnick]->host, host,160);
strncpy(clientlist[tempnick]->dhost, host,160);
strncpy(clientlist[tempnick]->server, ServerName,256);
- strncpy(clientlist[tempnick]->ident, "unknown",9);
+ strncpy(clientlist[tempnick]->ident, "unknown",12);
clientlist[tempnick]->registered = 0;
clientlist[tempnick]->signon = TIME+dns_timeout;
clientlist[tempnick]->lastping = 1;
long count_servs(void)
{
int c = 0;
- //for (int j = 0; j < 255; j++)
- //{
- // if (servers[j] != NULL)
- // c++;
- //}
+ 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))
+ {
+ c++;
+ }
+ }
+ }
+ }
return c;
}
user->idle_lastmsg = TIME;
log(DEBUG,"ConnectUser: %s",user->nick);
- if (strcmp(Passwd(user),"") && (!user->haspassed))
+ if ((strcmp(Passwd(user),"")) && (!user->haspassed))
{
kill_link(user,"Invalid password");
return;
}
ShowMOTD(user);
FOREACH_MOD OnUserConnect(user);
- WriteOpers("*** Client connecting on port %d: %s!%s@%s [%s]",user->port,user->nick,user->ident,user->host,user->ip);
+ WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,user->ip);
char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"N %d %s %s %s %s +%s %s %s :%s",user->age,user->nick,user->host,user->dhost,user->ident,user->modes,user->ip,ServerName,user->fullname);
+ 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);
}
+
+// this returns 1 when all modules are satisfied that the user should be allowed onto the irc server
+// (until this returns true, a user will block in the waiting state, waiting to connect up to the
+// registration timeout maximum seconds)
+bool AllModulesReportReady(userrec* user)
+{
+ for (int i = 0; i <= MODCOUNT; i++)
+ {
+ int res = modules[i]->OnCheckReady(user);
+ if (!res)
+ return false;
+ }
+ return true;
+}
+
/* shows the message of the day, and any other on-logon stuff */
void ConnectUser(userrec *user)
{
// dns is already done, things are fast. no need to wait for dns to complete just pass them straight on
- if ((user->dns_done) && (user->registered >= 3))
+ if ((user->dns_done) && (user->registered >= 3) && (AllModulesReportReady(user)))
{
FullConnectUser(user);
}
}
-void handle_version(char **parameters, int pcnt, userrec *user)
+std::string GetVersionString()
{
- char Revision[] = "$Revision$";
+ char Revision[] = "$Revision$";
+ char versiondata[MAXBUF];
+ char *s1 = Revision;
+ char *savept;
+ char *v2 = strtok_r(s1," ",&savept);
+ s1 = savept;
+ v2 = strtok_r(s1," ",&savept);
+ s1 = savept;
+ snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s (O=%lu)",VERSION,v2,ServerName,SYSTEM,(unsigned long)OPTIMISATION);
+ return versiondata;
+}
- char *s1 = Revision;
- char *savept;
- char *v1 = strtok_r(s1," ",&savept);
- s1 = savept;
- char *v2 = strtok_r(s1," ",&savept);
- s1 = savept;
-
- WriteServ(user->fd,"351 %s :%s Rev. %s %s :%s (O=%d)",user->nick,VERSION,v2,ServerName,SYSTEM,OPTIMISATION);
+void handle_version(char **parameters, int pcnt, userrec *user)
+{
+ if (!pcnt)
+ {
+ WriteServ(user->fd,"351 %s :%s",user->nick,GetVersionString().c_str());
+ }
+ else
+ {
+ for (int j = 0; j < 32; j++)
+ {
+ if (me[j] != NULL)
+ {
+ for (int x = 0; x < me[j]->connectors.size(); x++)
+ {
+ if (match(me[j]->connectors[x].GetServerName().c_str(),parameters[0]))
+ {
+ WriteServ(user->fd,"351 %s :%s",user->nick,me[j]->connectors[x].GetVersionString().c_str());
+ return;
+ }
+ }
+ }
+ }
+ WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]);
+ }
+ return;
}
int process_parameters(char **command_p,char *parameters)
{
- int i = 0;
int j = 0;
- int q = 0;
- q = strlen(parameters);
+ int q = strlen(parameters);
if (!q)
{
/* no parameters, command_p invalid! */
char *command;
char *command_p[127];
char p[MAXBUF], temp[MAXBUF];
- int i, j, items, cmd_found;
+ int j, items, cmd_found;
for (int i = 0; i < 127; i++)
command_p[i] = NULL;
{
return;
}
- if (!strcmp(cmd,""))
+ if (!cmd[0])
{
return;
}
{
cmd[i] = toupper(cmd[i]);
}
- log(DEBUG,"Preprocess done length=%d",strlen(cmd));
command = cmd;
}
else
for (int i = 0; i != cmdlist.size(); i++)
{
- if (strcmp(cmdlist[i].command,""))
+ if (cmdlist[i].command[0])
{
if (strlen(command)>=(strlen(cmdlist[i].command))) if (!strncmp(command, cmdlist[i].command,MAXCOMMAND))
{
- log(DEBUG,"Found matching command");
-
if (parameters)
{
- if (strcmp(parameters,""))
+ if (parameters[0])
{
items = process_parameters(command_p,parameters);
}
if (user)
{
- log(DEBUG,"Processing command");
-
/* activity resets the ping pending timer */
user->nping = TIME + user->pingmax;
if ((items) < cmdlist[i].min_params)
}
- if ((user->registered == 7) || (!strcmp(command,"USER")) || (!strcmp(command,"NICK")) || (!strcmp(command,"PASS")))
+ if ((user->registered == 7) || (!strncmp(command,"USER",4)) || (!strncmp(command,"NICK",4)) || (!strncmp(command,"PASS",4)))
{
- log(DEBUG,"process_command: handler: %s %s %d",user->nick,command,items);
if (cmdlist[i].handler_function)
{
}
else
{
- log(DEBUG,"process_command: not registered: %s %s",user->nick,command);
WriteServ(user->fd,"451 %s :You have not registered",command);
return;
}
}
if ((!cmd_found) && (user))
{
- log(DEBUG,"process_command: not in table: %s %s",user->nick,command);
WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command);
}
}
comm.use_count = 0;
comm.total_bytes = 0;
cmdlist.push_back(comm);
- log(DEBUG,"Added command %s (%d parameters)",cmd,minparams);
+ log(DEBUG,"Added command %s (%lu parameters)",cmd,(unsigned long)minparams);
}
bool removecommands(const char* source)
return;
}
char cmd[MAXBUF];
- int i;
if (!cmdbuf)
{
log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter");
return;
}
- if (!strcmp(cmdbuf,""))
+ if (!cmdbuf[0])
{
return;
}
- while ((cmdbuf[0] == ' ') && (strlen(cmdbuf)>0)) cmdbuf++; // strip leading spaces
+ while (*cmdbuf == ' ') cmdbuf++; // strip leading spaces
strlcpy(cmd,cmdbuf,MAXBUF);
- if (!strcmp(cmd,""))
+ if (!cmd[0])
{
return;
}
- if ((cmd[strlen(cmd)-1] == 13) || (cmd[strlen(cmd)-1] == 10))
+ int sl = strlen(cmd)-1;
+ if ((cmd[sl] == 13) || (cmd[sl] == 10))
{
- cmd[strlen(cmd)-1] = '\0';
+ cmd[sl] = '\0';
}
- if ((cmd[strlen(cmd)-1] == 13) || (cmd[strlen(cmd)-1] == 10))
+ sl = strlen(cmd)-1;
+ if ((cmd[sl] == 13) || (cmd[sl] == 10))
{
- cmd[strlen(cmd)-1] = '\0';
+ cmd[sl] = '\0';
}
-
- while ((cmd[strlen(cmd)-1] == ' ') && (strlen(cmd)>0)) // strip trailing spaces
+ sl = strlen(cmd)-1;
+ while (cmd[sl] == ' ') // strip trailing spaces
{
- cmd[strlen(cmd)-1] = '\0';
+ cmd[sl] = '\0';
+ sl = strlen(cmd)-1;
}
- if (!strcmp(cmd,""))
+ if (!cmd[0])
{
return;
}
- log(DEBUG,"InspIRCd: processing: %s %s",user->nick,cmd);
+ log(DEBUG,"CMDIN: %s %s",user->nick,cmd);
tidystring(cmd);
if ((user) && (cmd))
{
// 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);
+ snprintf(data,MAXBUF,"Y %lu",(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 (int k = 0; k < me[j]->connectors.size(); k++)
+ {
+ if (is_uline(me[j]->connectors[k].GetServerName().c_str()))
+ {
+ snprintf(data,MAXBUF,"H %s",me[j]->connectors[k].GetServerName().c_str());
+ serv->SendPacket(data,tcp_host);
+ }
+ }
+ }
+ }
+
+ // send our version for the remote side to cache
+ snprintf(data,MAXBUF,"v %s %s",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,"N %d %s %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->ip,u->second->server,u->second->fullname);
+ snprintf(data,MAXBUF,"N %lu %s %s %s %s +%s %s %s :%s",(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'))
{
serv->SendPacket(data,tcp_host);
}
}
- if (strcmp(chlist(u->second),""))
+ char* chl = chlist(u->second);
+ if (strcmp(chl,""))
{
- snprintf(data,MAXBUF,"J %s %s",u->second->nick,chlist(u->second));
+ snprintf(data,MAXBUF,"J %s %s",u->second->nick,chl);
serv->SendPacket(data,tcp_host);
}
}
serv->SendPacket(data,tcp_host);
}
}
- if (strcmp(c->second->topic,""))
+ if (c->second->topic[0])
{
- snprintf(data,MAXBUF,"T %d %s %s :%s",c->second->topicset,c->second->setby,c->second->name,c->second->topic);
+ snprintf(data,MAXBUF,"T %lu %s %s :%s",(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,"M %s +b %s",b->set_time,c->second->name,b->data);
+ snprintf(data,MAXBUF,"M %s +b %s",c->second->name,b->data);
serv->SendPacket(data,tcp_host);
}
}
// sync global zlines, glines, etc
sync_xlines(serv,tcp_host);
- for (int j = 0; j < 32; j++)
- {
- if (me[j] != NULL)
- {
- for (int k = 0; k < me[j]->connectors.size(); k++)
- {
- if (is_uline(me[j]->connectors[k].GetServerName().c_str()))
- {
- snprintf(data,MAXBUF,"H %s",me[j]->connectors[k].GetServerName().c_str());
- serv->SendPacket(data,tcp_host);
- NetSendMyRoutingTable();
- }
- }
- }
- }
-
- snprintf(data,MAXBUF,"F %d",TIME);
+ snprintf(data,MAXBUF,"F %lu",(unsigned long)TIME);
serv->SendPacket(data,tcp_host);
log(DEBUG,"Sent sync");
// ircd sends its serverlist after the end of sync here
}
-int reap_counter = 0;
char MODERR[MAXBUF];
char* ModuleError()
void erase_module(int j)
{
- int v = 0;
+ int v1 = 0;
for (std::vector<Module*>::iterator m = modules.begin(); m!= modules.end(); m++)
{
- if (v == j)
+ if (v1 == j)
{
delete *m;
modules.erase(m);
modules.push_back(NULL);
break;
}
- v++;
+ v1++;
}
int v2 = 0;
for (std::vector<std::string>::iterator v = module_names.begin(); v != module_names.end(); v++)
}
work[p--] = '\0';
}
- log(DEBUG,"Dir valid: %s",work);
char buffer[MAXBUF], otherdir[MAXBUF];
// Get the current working directory
if( getcwd( buffer, MAXBUF ) == NULL )
if( getcwd( otherdir, MAXBUF ) == NULL )
return false;
chdir(buffer);
- log(DEBUG,"Dir is really: %s",otherdir);
if (strlen(otherdir) >= strlen(work))
{
otherdir[strlen(work)] = '\0';
- log(DEBUG,"Compare: '%s' -> '%s'",otherdir,work);
if (!strcmp(otherdir,work))
{
- log(DEBUG,"Match ok");
return true;
}
- log(DEBUG,"No match");
return false;
}
else return false;
socklen_t length;
int count = 0;
int selectResult = 0, selectResult2 = 0;
- char *temp, configToken[MAXBUF], stuff[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
- char resolvedHost[MAXBUF];
+ char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
fd_set selectFds;
timeval tv;
Exit(ERROR);
}
- log(DEBUG,"InspIRCd: startup: begin");
- log(DEBUG,"$Id$");
+ log(DEFAULT,"$Id$");
if (geteuid() == 0)
{
printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
log(DEBUG,"InspIRCd: startup: default command table set up");
ReadConfig(true,NULL);
- if (strcmp(DieValue,""))
+ if (DieValue[0])
{
printf("WARNING: %s\n\n",DieValue);
log(DEFAULT,"Ut-Oh, somebody didn't read their config file: '%s'",DieValue);
exit(0);
}
log(DEBUG,"InspIRCd: startup: read config");
-
- int count2 = 0, count3 = 0;
+
+ int clientportcount = 0, serverportcount = 0;
for (count = 0; count < ConfValueEnum("bind",&config_f); count++)
{
ConfValue("bind","default",count,Default,&config_f);
if (strchr(Default,'y'))
{
- defaultRoute = count3;
+ defaultRoute = serverportcount;
log(DEBUG,"InspIRCd: startup: binding '%s:%s' is default server route",Addr,configToken);
}
- me[count3] = new serverrec(ServerName,100L,false);
- if (!me[count3]->CreateListener(Addr,atoi(configToken)))
+ me[serverportcount] = new serverrec(ServerName,100L,false);
+ if (!me[serverportcount]->CreateListener(Addr,atoi(configToken)))
{
- log(DEFAULT,"Error! Failed to bind port %d",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
{
- count3++;
+ serverportcount++;
}
}
else
{
- ports[count2] = atoi(configToken);
- strlcpy(addrs[count2],Addr,256);
- count2++;
+ ports[clientportcount] = atoi(configToken);
+ strlcpy(addrs[clientportcount],Addr,256);
+ clientportcount++;
}
log(DEBUG,"InspIRCd: startup: read binding %s:%s [%s] from config",Addr,configToken, Type);
}
- portCount = count2;
- UDPportCount = count3;
+ portCount = clientportcount;
+ UDPportCount = serverportcount;
- log(DEBUG,"InspIRCd: startup: read %d total client ports and %d total server ports",portCount,UDPportCount);
-
- log(DEBUG,"InspIRCd: startup: InspIRCd is now running!");
+ log(DEBUG,"InspIRCd: startup: read %lu total client ports and %lu total server ports",(unsigned long)portCount,(unsigned long)UDPportCount);
+ log(DEBUG,"InspIRCd: startup: InspIRCd is now starting!");
printf("\n");
/* BugFix By Craig! :p */
MODCOUNT = -1;
- for (count2 = 0; count2 < ConfValueEnum("module",&config_f); count2++)
+ for (count = 0; count < ConfValueEnum("module",&config_f); count++)
{
- ConfValue("module","name",count2,configToken,&config_f);
- printf("Loading module... \033[1;37m%s\033[0;37m\n",configToken);
+ ConfValue("module","name",count,configToken,&config_f);
+ printf("Loading module... \033[1;32m%s\033[0m\n",configToken);
if (!LoadModule(configToken))
{
- log(DEBUG,"Exiting due to a module loader error.");
- printf("There was an error loading a module: %s\n",ModuleError());
+ log(DEFAULT,"Exiting due to a module loader error.");
+ printf("\nThere was an error loading a module: %s\n\nYou might want to do './inspircd start' instead of 'bin/inspircd'\n\n",ModuleError());
Exit(0);
}
}
- log(DEBUG,"Total loaded modules: %d",MODCOUNT+1);
-
- printf("\nInspIRCd is now running!\n");
+ log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1);
startup_time = time(NULL);
- if (nofork)
- {
- log(VERBOSE,"Not forking as -nofork was specified");
- }
- else
- {
- if (DaemonSeed() == ERROR)
- {
- log(DEFAULT,"InspIRCd: startup: can't daemonise");
- printf("ERROR: could not go into daemon mode. Shutting down.\n");
- Exit(ERROR);
- }
- }
-
char PID[MAXBUF];
ConfValue("pid","file",0,PID,&config_f);
+ // write once here, to try it out and make sure its ok
WritePID(PID);
-
/* setup select call */
FD_ZERO(&selectFds);
log(DEBUG,"InspIRCd: startup: zero selects");
- log(VERBOSE,"InspIRCd: startup: portCount = %d", portCount);
+ log(VERBOSE,"InspIRCd: startup: portCount = %lu", (unsigned long)portCount);
for (count = 0; count < portCount; count++)
{
if ((openSockfd[boundPortCount] = OpenTCPSocket()) == ERROR)
{
- log(DEBUG,"InspIRCd: startup: bad fd %d",openSockfd[boundPortCount]);
+ log(DEBUG,"InspIRCd: startup: bad fd %lu",(unsigned long)openSockfd[boundPortCount]);
return(ERROR);
}
if (BindSocket(openSockfd[boundPortCount],client,server,ports[count],addrs[count]) == ERROR)
{
- log(DEFAULT,"InspIRCd: startup: failed to bind port %d",ports[count]);
+ log(DEFAULT,"InspIRCd: startup: failed to bind port %lu",(unsigned long)ports[count]);
}
else /* well we at least bound to one socket so we'll continue */
{
}
}
- log(DEBUG,"InspIRCd: startup: total bound ports %d",boundPortCount);
+ log(DEBUG,"InspIRCd: startup: total bound ports %lu",(unsigned long)boundPortCount);
/* if we didn't bind to anything then abort */
if (boundPortCount == 0)
{
log(DEFAULT,"InspIRCd: startup: no ports bound, bailing!");
+ printf("\nERROR: Was not able to bind any of %lu ports! Please check your configuration.\n\n", (unsigned long)portCount);
return (ERROR);
}
+ printf("\nInspIRCd is now running!\n");
+
+ if (nofork)
+ {
+ log(VERBOSE,"Not forking as -nofork was specified");
+ }
+ else
+ {
+ if (DaemonSeed() == ERROR)
+ {
+ log(DEFAULT,"InspIRCd: startup: can't daemonise");
+ printf("ERROR: could not go into daemon mode. Shutting down.\n");
+ Exit(ERROR);
+ }
+ }
+
+ WritePID(PID);
+
length = sizeof (client);
- char udp_msg[MAXBUF], tcp_host[MAXBUF];
+ char udp_msg[MAXBUF],tcp_host[MAXBUF];
fd_set serverfds;
timeval tvs;
- tvs.tv_usec = 7000L;
+ tvs.tv_usec = 10000L;
tvs.tv_sec = 0;
tv.tv_sec = 0;
- tv.tv_usec = 7000L;
- char data[10240];
+ tv.tv_usec = 10000L;
+ char data[65535];
timeval tval;
fd_set sfd;
- tval.tv_usec = 7000L;
+ tval.tv_usec = 10000L;
tval.tv_sec = 0;
int total_in_this_set = 0;
int v = 0;
}
if ((TIME % 5) == 1)
expire_run = false;
- if (reap_counter>300)
- {
- if (fd_reap.size() > 0)
- {
- for( int n = 0; n < fd_reap.size(); n++)
- {
- if ((fd_reap[n] > -1))
- {
- close(fd_reap[n]);
- shutdown (fd_reap[n],2);
- }
- }
- }
- fd_reap.clear();
- reap_counter=0;
- }
- reap_counter++;
// fix by brain - this must be below any manipulation of the hashmap by modules
user_hash::iterator count2 = clientlist.begin();
// serverFds timevals went here
- tvs.tv_usec = 7000L;
+ tvs.tv_usec = 30000L;
tvs.tv_sec = 0;
int servresult = select(32767, &serverfds, NULL, NULL, &tvs);
if (servresult > 0)
{
for (int ctr = 0; ctr < msgs.size(); ctr++)
{
- char udp_msg[MAXBUF];
strlcpy(udp_msg,msgs[ctr].c_str(),MAXBUF);
log(DEBUG,"Processing: %s",udp_msg);
- if (strlen(udp_msg)<1)
+ if (!udp_msg[0])
{
- log(DEBUG,"Invalid string from %s [route%d]",tcp_host,x);
+ 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
kill_link(count2->second,"Registration timeout");
goto label;
}
- if ((TIME > count2->second->signon) && (count2->second->registered == 3))
+ if ((TIME > count2->second->signon) && (count2->second->registered == 3) && (AllModulesReportReady(count2->second)))
{
+ log(DEBUG,"signon exceed, registered=3, and modules ready, OK");
count2->second->dns_done = true;
FullConnectUser(count2->second);
goto label;
}
- if ((count2->second->dns_done) && (count2->second->registered == 3)) // both NICK and USER... and DNS
+ if ((count2->second->dns_done) && (count2->second->registered == 3) && (AllModulesReportReady(count2->second))) // both NICK and USER... and DNS
{
+ log(DEBUG,"dns done, registered=3, and modules ready, OK");
FullConnectUser(count2->second);
goto label;
}
// tvals defined here
- tval.tv_usec = 7000L;
+ tval.tv_usec = 1000L;
selectResult2 = select(65535, &sfd, NULL, NULL, &tval);
// now loop through all of the items in this pool if any are waiting
result = EAGAIN;
if ((count2a->second->fd != FD_MAGIC_NUMBER) && (count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd)))
{
- memset(data, 0, 10240);
- result = read(count2a->second->fd, data, 10240);
-
+ result = read(count2a->second->fd, data, 65535);
if (result)
{
// perform a check on the raw buffer as an array (not a string!) to remove
if ((data[checker] == 0) || (data[checker] == 7))
data[checker] = ' ';
}
+ if (result > 0)
+ data[result] = '\0';
userrec* current = count2a->second;
int currfd = current->fd;
- char* l = strtok(data,"\n");
int floodlines = 0;
- while (l)
+ current->AddBuffer(data);
+ if (current->recvq.length() > NetBufferSize)
{
- floodlines++;
- 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");
- goto label;
+ 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();
}
- char sanitized[NetBufferSize];
- memset(sanitized, 0, NetBufferSize);
- int ptt = 0;
- for (int pt = 0; pt < strlen(l); pt++)
+ goto label;
+ }
+ // while there are complete lines to process...
+ while (current->BufferIsReady())
+ {
+ floodlines++;
+ if ((floodlines > current->flood) && (current->flood != 0))
{
- if (l[pt] != '\r')
+ 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
{
- sanitized[ptt++] = l[pt];
+ add_zline(120,ServerName,"Flood from unregistered connection",current->ip);
+ apply_lines();
}
+ goto label;
}
- sanitized[ptt] = '\0';
- if (strlen(sanitized))
+ char sanitized[MAXBUF];
+ // use GetBuffer to copy single lines into the sanitized string
+ strlcpy(sanitized,current->GetBuffer().c_str(),MAXBUF);
+ if (*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++)
{
goto label;
}
- l = strtok(NULL,"\n");
}
goto label;
}
}
for (int q = 0; q < total_in_this_set; q++)
{
- // there is no iterator += operator :(
- //if (count2 != clientlist.end())
- //{
- count2++;
- //}
+ count2++;
}
}
+
+#ifdef _POSIX_PRIORITY_SCHEDULING
+ sched_yield();
+#endif
// set up select call
for (count = 0; count < boundPortCount; count++)
FD_SET (openSockfd[count], &selectFds);
}
- tv.tv_usec = 7000L;
+ 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 (incomingSockfd < 0)
{
- WriteOpers("*** WARNING: Accept failed on port %d (%s)", ports[count],target);
- log(DEBUG,"InspIRCd: accept failed: %d",ports[count]);
+ WriteOpers("*** WARNING: Accept failed on port %lu (%s)",(unsigned long)ports[count],target);
+ log(DEBUG,"InspIRCd: accept failed: %lu",(unsigned long)ports[count]);
}
else
{
AddClient(incomingSockfd, resolved, ports[count], false, inet_ntoa (client.sin_addr));
- log(DEBUG,"InspIRCd: adding client on port %d fd=%d",ports[count],incomingSockfd);
+ log(DEBUG,"InspIRCd: adding client on port %lu fd=%lu",(unsigned long)ports[count],(unsigned long)incomingSockfd);
}
goto label;
}
}
label:
if (0) {};
+#ifdef _POSIX_PRIORITY_SCHEDULING
+ sched_yield();
+#endif
}
/* not reached */
close (incomingSockfd);
projects / user / henk / code / inspircd.git / blobdiff