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 ((u->chans[i].channel == u2->chans[z].channel) && (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)))
{
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 "";
}
- 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 ((user->chans[i].channel == chan) && (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 ((user->chans[i].channel == chan) && (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 ((user->chans[i].channel == chan) && (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;
}
+ if ((((ucrec*)(*i))->uc_modes & UCMODE_HOP) > 0)
+ {
+ return STATUS_HOP;
+ }
+ if ((((ucrec*)(*i))->uc_modes & UCMODE_VOICE) > 0)
+ {
+ return STATUS_VOICE;
+ }
+ return STATUS_NORMAL;
}
}
return STATUS_NORMAL;
std::string chlist(userrec *user,userrec* source)
{
- std::string cmp = "";
- std::string lst = "";
- log(DEBUG,"chlist: %s",user->nick);
- if (!user)
- {
- return lst;
- }
- bool userinvisible = (strchr(user->modes,'i'));
- for (unsigned int i = 0; i < user->chans.size(); i++)
+ /* Should this be a stringstream? Not sure if it would be faster as streams are more oriented at appending stuff, which is all we do */
+ std::ostringstream list;
+
+ if (!user || !source)
+ return "";
+
+ for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
{
- if (user->chans[i].channel != NULL)
+ ucrec* rec = *i;
+
+ if(rec->channel && rec->channel->name)
{
- if (user->chans[i].channel->name)
- {
- cmp = std::string(user->chans[i].channel->name) + " ";
- if (!strstr(lst.c_str(),cmp.c_str()))
+ /* 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->modebits & UM_INVISIBLE)) || (rec->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)) || (user->chans[i].channel->HasUser(source)))))
- {
- lst = lst + std::string(cmode(user,user->chans[i].channel)) + std::string(user->chans[i].channel->name) + " ";
- }
+ list << cmode(user, rec->channel) << rec->channel->name << " ";
}
- }
+ //}
}
}
- return lst;
+
+ return list.str();
}
-