extern std::vector<Module*> modules;
extern std::vector<ircd_module*> factory;
extern time_t TIME;
-extern ServerConfig* Config;
-
-/* return 0 or 1 depending if users u and u2 share one or more common channels
- * (used by QUIT, NICK etc which arent channel specific notices)
- *
- * The old algorithm in 1.0 for this was relatively inefficient, iterating over
- * the first users channels then the second users channels within the outer loop,
- * therefore it was a maximum of x*y iterations (upon returning 0 and checking
- * all possible iterations). However this new function instead checks against the
- * channel's userlist in the inner loop which is a std::map<userrec*,userrec*>
- * and saves us time as we already know what pointer value we are after.
- * Don't quote me on the maths as i am not a mathematician or computer scientist,
- * but i believe this algorithm is now x+(log y) maximum iterations instead.
- */
-int common_channels(userrec *u, userrec *u2)
-{
- if ((!u) || (!u2) || (u->registered != REG_ALL) || (u2->registered != REG_ALL))
- return 0;
-
- /* Outer loop */
- for (std::vector<ucrec*>::const_iterator i = u->chans.begin(); i != u->chans.end(); i++)
- {
- /* Fetch the channel from the user */
- ucrec* user_channel = (ucrec*)(*i);
-
- if (user_channel->channel)
- {
- /* Eliminate the inner loop (which used to be ~equal in size to the outer loop)
- * by replacing it with a map::find which *should* be more efficient
- */
- CUList* channel_user_map = user_channel->channel->GetUsers();
- if (channel_user_map->find(u2) != channel_user_map->end())
- return 1;
- }
- }
- return 0;
-}
-
-void Blocking(int s)
-{
- int flags = fcntl(s, F_GETFL, 0);
- fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
-}
-
-void NonBlocking(int s)
-{
- int flags = fcntl(s, F_GETFL, 0);
- fcntl(s, F_SETFL, flags | O_NONBLOCK);
-}
-
-int CleanAndResolve (char *resolvedHost, const char *unresolvedHost, bool forward)
-{
- bool ok;
- std::string ipaddr;
-
- DNS d(Config->DNSServer);
- if (forward)
- ok = d.ForwardLookup(unresolvedHost, false);
- else
- ok = d.ReverseLookup(unresolvedHost, false);
- if (!ok)
- return 0;
- time_t T = time(NULL)+1;
- while ((!d.HasResult()) && (time(NULL)<T));
- if (forward)
- ipaddr = d.GetResultIP();
- else
- ipaddr = d.GetResult();
- strlcpy(resolvedHost,ipaddr.c_str(),MAXBUF);
- return (ipaddr != "");
-}
-
-int c_count(userrec* u)
-{
- int z = 0;
- for (std::vector<ucrec*>::const_iterator i = u->chans.begin(); i != u->chans.end(); i++)
- if (((ucrec*)(*i))->channel)
- z++;
- return z;
-
-}
-
-void ChangeName(userrec* user, const char* gecos)
-{
- if (user->fd > -1)
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnChangeLocalUserGECOS,OnChangeLocalUserGECOS(user,gecos));
- if (MOD_RESULT)
- return;
- FOREACH_MOD(I_OnChangeName,OnChangeName(user,gecos));
- }
- strlcpy(user->fullname,gecos,MAXGECOS+1);
-}
-
-void ChangeDisplayedHost(userrec* user, const char* host)
-{
- if (user->fd > -1)
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(user,host));
- if (MOD_RESULT)
- return;
- FOREACH_MOD(I_OnChangeHost,OnChangeHost(user,host));
- }
- strlcpy(user->dhost,host,63);
- WriteServ(user->fd,"396 %s %s :is now your hidden host",user->nick,user->dhost);
-}
+extern InspIRCd* ServerInstance;
/* verify that a user's ident and nickname is valid */
{
continue;
}
- if (strchr(".-0123456789",*i))
+ if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.'))
{
continue;
}
int p = 0;
for (char* i = (char*)n; *i; i++, p++)
{
- /* can occur anywhere in a nickname */
+ /* "A"-"}" can occur anywhere in a nickname */
if ((*i >= 'A') && (*i <= '}'))
{
continue;
}
- /* can occur anywhere BUT the first char of a nickname */
- if ((strchr("-0123456789",*i)) && (i > n))
+ /* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */
+ if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n))
{
continue;
}
for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
{
- if (((ucrec*)(*i))->channel == chan)
+ if ((*i)->channel == chan)
{
- if ((((ucrec*)(*i))->uc_modes & UCMODE_OP) > 0)
+ if (((*i)->uc_modes & UCMODE_OP) > 0)
{
return "@";
}
- if ((((ucrec*)(*i))->uc_modes & UCMODE_HOP) > 0)
+ if (((*i)->uc_modes & UCMODE_HOP) > 0)
{
return "%";
}
- if ((((ucrec*)(*i))->uc_modes & UCMODE_VOICE) > 0)
+ if (((*i)->uc_modes & UCMODE_VOICE) > 0)
{
return "+";
}
for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
{
- if (((ucrec*)(*i))->channel == chan)
+ if ((*i)->channel == chan)
{
- return ((ucrec*)(*i))->uc_modes;
+ return (*i)->uc_modes;
}
}
return 0;
for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
{
- if (((ucrec*)(*i))->channel == chan)
+ if ((*i)->channel == chan)
{
- if ((((ucrec*)(*i))->uc_modes & UCMODE_OP) > 0)
+ if (((*i)->uc_modes & UCMODE_OP) > 0)
{
return STATUS_OP;
}
- if ((((ucrec*)(*i))->uc_modes & UCMODE_HOP) > 0)
+ if (((*i)->uc_modes & UCMODE_HOP) > 0)
{
return STATUS_HOP;
}
- if ((((ucrec*)(*i))->uc_modes & UCMODE_VOICE) > 0)
+ if (((*i)->uc_modes & UCMODE_VOICE) > 0)
{
return STATUS_VOICE;
}
return STATUS_NORMAL;
}
-void TidyBan(char *ban)
-{
- if (!ban) {
- log(DEFAULT,"*** BUG *** TidyBan was given an invalid parameter");
- return;
- }
-
- char temp[MAXBUF],NICK[MAXBUF],IDENT[MAXBUF],HOST[MAXBUF];
-
- strlcpy(temp,ban,MAXBUF);
-
- char* pos_of_pling = strchr(temp,'!');
- char* pos_of_at = strchr(temp,'@');
-
- pos_of_pling[0] = '\0';
- pos_of_at[0] = '\0';
- pos_of_pling++;
- pos_of_at++;
-
- strlcpy(NICK,temp,NICKMAX-1);
- strlcpy(IDENT,pos_of_pling,IDENTMAX+1);
- strlcpy(HOST,pos_of_at,63);
-
- snprintf(ban,MAXBUF,"%s!%s@%s",NICK,IDENT,HOST);
-}
-
-char lst[MAXBUF];
-
-std::string chlist(userrec *user,userrec* source)
-{
- std::string list;
-
- if (!user || !source)
- return "";
-
- for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
- {
- ucrec* rec = *i;
-
- if(rec->channel && rec->channel->name)
- {
- /* XXX - Why does this check need to be here at all? :< */
- /* Commenting this out until someone finds a case where we need it */
- //if (lst.find(rec->channel->name) == std::string::npos)
- //{
-
- /*
- * If the target is the same as the sender, let them see all their channels.
- * If the channel is NOT private/secret AND the user is not invisible.
- * If the user is an oper, and the <options:operspywhois> option is set.
- */
- if ((source == user) || (*source->oper && Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET]) && !(user->modes[UM_INVISIBLE])) || (rec->channel->HasUser(source))))
- {
- list.append(cmode(user, rec->channel)).append(rec->channel->name).append(" ");
- }
- //}
- }
- }
-
- return list;
-}