int common_channels(userrec *u, userrec *u2)
{
- if ((!u) || (!u2))
+ if ((!u) || (!u2) || (u->registered != 7) || (u2->registered != 7))
{
- log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter");
return 0;
}
- for (unsigned int i = 0; i < u->chans.size(); i++)
+ for (std::vector<ucrec*>::const_iterator i = u->chans.begin(); i != u->chans.end(); i++)
{
- for (unsigned int z = 0; z != u2->chans.size(); z++)
+ for (std::vector<ucrec*>::const_iterator z = u2->chans.begin(); z != u2->chans.end(); z++)
{
- if ((u->chans[i].channel != NULL) && (u2->chans[z].channel != NULL))
+ if ((((ucrec*)(*i))->channel != NULL) && (((ucrec*)(*z))->channel != NULL))
{
- if ((!strcasecmp(u->chans[i].channel->name,u2->chans[z].channel->name)) && (u->chans[i].channel) && (u2->chans[z].channel) && (u->registered == 7) && (u2->registered == 7))
+ if ((((ucrec*)(*i))->channel == ((ucrec*)(*z))->channel))
{
if ((c_count(u)) && (c_count(u2)))
{
void Blocking(int s)
{
- int flags;
- log(DEBUG,"Blocking: %d",s);
- flags = fcntl(s, F_GETFL, 0);
+ int flags = fcntl(s, F_GETFL, 0);
fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
}
void NonBlocking(int s)
{
- int flags;
- log(DEBUG,"NonBlocking: %d",s);
- flags = fcntl(s, F_GETFL, 0);
+ int flags = fcntl(s, F_GETFL, 0);
fcntl(s, F_SETFL, flags | O_NONBLOCK);
}
-int CleanAndResolve (char *resolvedHost, const char *unresolvedHost)
+int CleanAndResolve (char *resolvedHost, const char *unresolvedHost, bool forward)
{
+ int fd;
+ std::string ipaddr;
+
DNS d(Config->DNSServer);
- int fd = d.ReverseLookup(unresolvedHost);
+ if (forward)
+ fd = d.ForwardLookup(unresolvedHost);
+ else
+ fd = d.ReverseLookup(unresolvedHost);
if (fd < 0)
return 0;
time_t T = time(NULL)+1;
while ((!d.HasResult()) && (time(NULL)<T));
- std::string ipaddr = d.GetResult();
+ 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 (unsigned int i =0; i < u->chans.size(); i++)
- if (u->chans[i].channel != NULL)
+ for (std::vector<ucrec*>::const_iterator i = u->chans.begin(); i != u->chans.end(); i++)
+ if (((ucrec*)(*i))->channel)
z++;
return z;
return;
FOREACH_MOD(I_OnChangeHost,OnChangeHost(user,host));
}
- strlcpy(user->dhost,host,160);
+ strlcpy(user->dhost,host,63);
WriteServ(user->fd,"396 %s %s :is now your hidden host",user->nick,user->dhost);
}
* % for halfop etc. If the user has several modes set, the highest mode
* the user has must be returned. */
-char* cmode(userrec *user, chanrec *chan)
+const char* cmode(userrec *user, chanrec *chan)
{
if ((!user) || (!chan))
{
return "";
}
- for (unsigned int i = 0; i < user->chans.size(); i++)
+ for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
{
- if (user->chans[i].channel)
+ if (((ucrec*)(*i))->channel == chan)
{
- if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL))
+ if ((((ucrec*)(*i))->uc_modes & UCMODE_OP) > 0)
{
- if ((user->chans[i].uc_modes & UCMODE_OP) > 0)
- {
- return "@";
- }
- if ((user->chans[i].uc_modes & UCMODE_HOP) > 0)
- {
- return "%";
- }
- if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0)
- {
- return "+";
- }
- return "";
+ return "@";
}
+ if ((((ucrec*)(*i))->uc_modes & UCMODE_HOP) > 0)
+ {
+ return "%";
+ }
+ if ((((ucrec*)(*i))->uc_modes & UCMODE_VOICE) > 0)
+ {
+ return "+";
+ }
+ return "";
}
}
return "";
if ((!chan) || (!user))
return 0;
- for (unsigned int i = 0; i < user->chans.size(); i++)
+ for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
{
- if (user->chans[i].channel)
+ if (((ucrec*)(*i))->channel == chan)
{
- if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL))
- {
- return user->chans[i].uc_modes;
- }
+ return ((ucrec*)(*i))->uc_modes;
}
}
return 0;
if (is_uline(user->server))
return STATUS_OP;
- for (unsigned int i = 0; i < user->chans.size(); i++)
+ for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
{
- if (user->chans[i].channel)
+ if (((ucrec*)(*i))->channel == chan)
{
- if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL))
+ if ((((ucrec*)(*i))->uc_modes & UCMODE_OP) > 0)
{
- if ((user->chans[i].uc_modes & UCMODE_OP) > 0)
- {
- return STATUS_OP;
- }
- if ((user->chans[i].uc_modes & UCMODE_HOP) > 0)
- {
- return STATUS_HOP;
- }
- if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0)
- {
- return STATUS_VOICE;
- }
- return STATUS_NORMAL;
+ return STATUS_OP;
}
- }
- }
- return STATUS_NORMAL;
-}
-
-/* returns 1 if user u has channel c in their record, 0 if not */
-
-int has_channel(userrec *u, chanrec *c)
-{
- if ((!u) || (!c))
- {
- log(DEFAULT,"*** BUG *** has_channel was given an invalid parameter");
- return 0;
- }
- for (unsigned int i =0; i < u->chans.size(); i++)
- {
- if (u->chans[i].channel)
- {
- if (!strcasecmp(u->chans[i].channel->name,c->name))
+ if ((((ucrec*)(*i))->uc_modes & UCMODE_HOP) > 0)
{
- return 1;
+ return STATUS_HOP;
}
+ if ((((ucrec*)(*i))->uc_modes & UCMODE_VOICE) > 0)
+ {
+ return STATUS_VOICE;
+ }
+ return STATUS_NORMAL;
}
}
- return 0;
+ return STATUS_NORMAL;
}
-
void TidyBan(char *ban)
{
if (!ban) {
strlcpy(NICK,temp,NICKMAX-1);
strlcpy(IDENT,pos_of_pling,IDENTMAX+1);
- strlcpy(HOST,pos_of_at,160);
+ strlcpy(HOST,pos_of_at,63);
snprintf(ban,MAXBUF,"%s!%s@%s",NICK,IDENT,HOST);
}
{
std::string cmp = "";
std::string lst = "";
- log(DEBUG,"chlist: %s",user->nick);
- if (!user)
+ if (!user || !source)
{
return lst;
}
- bool userinvisible = (strchr(user->modes,'i'));
- for (unsigned int i = 0; i < user->chans.size(); i++)
+ bool userinvisible = (user->modebits & UM_INVISIBLE);
+ for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
{
- if (user->chans[i].channel != NULL)
+ if ((((ucrec*)(*i))->channel != NULL) && (((ucrec*)(*i))->channel->name))
{
- if (user->chans[i].channel->name)
+ cmp = std::string(((ucrec*)(*i))->channel->name) + " ";
+ if (!strstr(lst.c_str(),cmp.c_str()))
{
- cmp = std::string(user->chans[i].channel->name) + " ";
- if (!strstr(lst.c_str(),cmp.c_str()))
+ // if the channel is NOT private/secret, OR the source user is on the channel, AND the user is not invisible.
+ // if the user is the same as the source, shortcircuit the comparison.
+ if ((source == user) || ((((!(((ucrec*)(*i))->channel->modes[CM_PRIVATE])) && (!(((ucrec*)(*i))->channel->modes[CM_SECRET])) && (!userinvisible)) || (((ucrec*)(*i))->channel->HasUser(source)))))
{
- // if the channel is NOT private/secret, OR the source user is on the channel, AND the user is not invisible.
- // if the user is the same as the source, shortcircuit the comparison.
- if ((source == user) || ((((!(user->chans[i].channel->binarymodes & CM_PRIVATE)) && (!(user->chans[i].channel->binarymodes & CM_SECRET)) && (!userinvisible)) || (has_channel(source,user->chans[i].channel)))))
- {
- lst = lst + std::string(cmode(user,user->chans[i].channel)) + std::string(user->chans[i].channel->name) + " ";
- }
+ lst = lst + std::string(cmode(user,((ucrec*)(*i))->channel)) + std::string(((ucrec*)(*i))->channel->name) + " ";
}
}
}