Combine stats A output parameters (#35)

[solanum.git] / modules / m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index 5f7b42d134fee751196c9e46eceb8feb023226b7..281c6d8584f8491bbcffb27565f6c16540ba87e5 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -40,7 +40,6 @@
 #include "modules.h"
 #include "hook.h"
 #include "s_newconf.h"
-#include "ipv4_from_ipv6.h"
 #include "ratelimit.h"
 #include "s_assert.h"
 
@@ -90,7 +89,7 @@ m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                        return;
                }
 
-               if(!IsOper(source_p))
+               if(!IsOperGeneral(source_p))
                {
                        /* seeing as this is going across servers, we should limit it */
                        if((last_used + ConfigFileEntry.pace_wait_simple) > rb_current_time() || !ratelimit_client(source_p, 2))
@@ -225,18 +224,13 @@ static void
 single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 {
        char buf[BUFSIZE];
-       rb_dlink_node *ptr;
-       struct membership *msptr;
-       struct Channel *chptr;
        int cur_len = 0;
        int mlen;
        char *t;
        int tlen;
        hook_data_client hdata;
        int extra_space = 0;
-#ifdef RB_IPV6
        struct sockaddr_in ip4;
-#endif
 
        if(target_p->user == NULL)
        {
@@ -272,19 +266,29 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
        if (!IsService(target_p))
        {
-               RB_DLINK_FOREACH(ptr, target_p->user->channel.head)
+               hook_data_channel_visibility hdata_vis;
+               rb_dlink_node *ps, *pt;
+               struct Channel *chptr;
+               struct membership *ms, *mt;
+
+               hdata_vis.client = source_p;
+               hdata_vis.target = target_p;
+
+               ITER_COMM_CHANNELS(ps, pt, source_p->user->channel.head, target_p->user->channel.head, ms, mt, chptr)
                {
-                       msptr = ptr->data;
-                       chptr = msptr->chptr;
+                       if (mt == NULL)
+                               continue;
 
-                       hdata.chptr = chptr;
+                       hdata_vis.chptr = chptr;
+                       hdata_vis.clientms = ms;
+                       hdata_vis.targetms = mt;
+                       hdata_vis.approved = ms != NULL || PubChannel(chptr);
 
-                       hdata.approved = ShowChannel(source_p, chptr);
-                       call_hook(doing_whois_channel_visibility_hook, &hdata);
+                       call_hook(doing_whois_channel_visibility_hook, &hdata_vis);
 
-                       if(hdata.approved || operspy)
+                       if(hdata_vis.approved || operspy)
                        {
-                               if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5))
+                               if((cur_len + strlen(chptr->chname) + strlen("!@+ ")) > (BUFSIZE - strlen("\r\n")))
                                {
                                        sendto_one(source_p, "%s", buf);
                                        cur_len = mlen + extra_space;
@@ -292,8 +296,8 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                }
 
                                tlen = sprintf(t, "%s%s%s ",
-                                               hdata.approved ? "" : "!",
-                                               find_channel_status(msptr, 1),
+                                               hdata_vis.approved ? "" : "!",
+                                               find_channel_status(mt, 1),
                                                chptr->chname);
                                t += tlen;
                                cur_len += tlen;
@@ -312,7 +316,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
                                   target_p->name, target_p->user->away);
 
-       if(IsOper(target_p) && (!ConfigFileEntry.hide_opers_in_whois || IsOper(source_p)))
+       if((!ConfigFileEntry.hide_opers_in_whois || IsOper(source_p)) && SeesOper(target_p, source_p))
        {
                sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
                                   target_p->name,
@@ -321,11 +325,14 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                    GlobalSetOptions.operstring));
        }
 
-       if(MyClient(target_p) && !EmptyString(target_p->localClient->opername) && IsOper(source_p))
+       if(!EmptyString(target_p->user->opername) && IsOper(target_p) && (target_p == source_p || HasPrivilege(source_p, "oper:privs")))
        {
                char buf[512];
+               const char *privset = "(missing)";
+               if (target_p->user->privset != NULL)
+                       privset = target_p->user->privset->name;
                snprintf(buf, sizeof(buf), "is opered as %s, privset %s",
-                           target_p->localClient->opername, target_p->localClient->privset->name);
+                           target_p->user->opername, privset);
                sendto_one_numeric(source_p, RPL_WHOISSPECIAL, form_str(RPL_WHOISSPECIAL),
                                   target_p->name, buf);
        }
@@ -334,12 +341,13 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        {
                char cbuf[256] = "is using a secure connection";
 
-               if (MyClient(target_p) && target_p->localClient->cipher_string != NULL)
+               if (MyClient(target_p) && target_p->localClient->cipher_string != NULL &&
+                               (!ConfigFileEntry.tls_ciphers_oper_only || source_p == target_p || IsOper(source_p)))
                        rb_snprintf_append(cbuf, sizeof(cbuf), " [%s]", target_p->localClient->cipher_string);
 
                sendto_one_numeric(source_p, RPL_WHOISSECURE, form_str(RPL_WHOISSECURE),
                                   target_p->name, cbuf);
-               if((source_p == target_p || IsOper(source_p)) &&
+               if((source_p == target_p || IsOperGeneral(source_p)) &&
                                target_p->certfp != NULL)
                        sendto_one_numeric(source_p, RPL_WHOISCERTFP,
                                        form_str(RPL_WHOISCERTFP),
@@ -348,7 +356,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
        if(MyClient(target_p))
        {
-               if (IsDynSpoof(target_p) && (IsOper(source_p) || source_p == target_p))
+               if (IsDynSpoof(target_p) && (HasPrivilege(source_p, "auspex:hostname") || source_p == target_p))
                {
                        /* trick here: show a nonoper their own IP if
                         * dynamic spoofed but not if auth{} spoofed
@@ -365,11 +373,10 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                           form_str(RPL_WHOISACTUALLY),
                                           target_p->name, target_p->sockhost);
 
-#ifdef RB_IPV6
                if (GET_SS_FAMILY(&target_p->localClient->ip) == AF_INET6 &&
                                (show_ip(source_p, target_p) ||
                                 (source_p == target_p && !IsIPSpoof(target_p))) &&
-                               ipv4_from_ipv6((struct sockaddr_in6 *)&target_p->localClient->ip, &ip4))
+                               rb_ipv4_from_ipv6((struct sockaddr_in6 *)&target_p->localClient->ip, &ip4))
                {
                        rb_inet_ntop_sock((struct sockaddr *)&ip4,
                                        buf, sizeof buf);
@@ -377,7 +384,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                        "%s :Underlying IPv4 is %s",
                                        target_p->name, buf);
                }
-#endif /* RB_IPV6 */
 
                sendto_one_numeric(source_p, RPL_WHOISIDLE, form_str(RPL_WHOISIDLE),
                                   target_p->name,
@@ -386,7 +392,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        }
        else
        {
-               if (IsDynSpoof(target_p) && (IsOper(source_p) || source_p == target_p))
+               if (IsDynSpoof(target_p) && (HasPrivilege(source_p, "auspex:hostname") || source_p == target_p))
                {
                        ClearDynSpoof(target_p);
                        sendto_one_numeric(source_p, RPL_WHOISHOST,