Remove trailing whitespace from all .c and .h files.

[solanum.git] / modules / m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index c2a00ef5b1cd74230b5ba05e8321d5e8862c97d3..a5515ed0934619eae193d6a0115b85b182ad2165 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -35,8 +35,7 @@
 #include "s_conf.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "s_conf.h"
 #include "logger.h"
 #include "msg.h"
@@ -44,6 +43,9 @@
 #include "modules.h"
 #include "hook.h"
 #include "s_newconf.h"
+#include "ipv4_from_ipv6.h"
+#include "ratelimit.h"
+#include "s_assert.h"
 
 static void do_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 static void single_whois(struct Client *source_p, struct Client *target_p, int operspy);
@@ -70,7 +72,6 @@ DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision
 
 /*
  * m_whois
- *      parv[0] = sender prefix
  *      parv[1] = nickname masklist
  */
 static int
@@ -90,11 +91,11 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
                if(!IsOper(source_p))
                {
                        /* seeing as this is going across servers, we should limit it */
-                       if((last_used + ConfigFileEntry.pace_wait_simple) > rb_current_time())
+                       if((last_used + ConfigFileEntry.pace_wait_simple) > rb_current_time() || !ratelimit_client(source_p, 2))
                        {
                                sendto_one(source_p, form_str(RPL_LOAD2HI),
                                           me.name, source_p->name, "WHOIS");
-                               sendto_one_numeric(source_p, RPL_ENDOFWHOIS, 
+                               sendto_one_numeric(source_p, RPL_ENDOFWHOIS,
                                                   form_str(RPL_ENDOFWHOIS), parv[2]);
                                return 0;
                        }
@@ -116,7 +117,6 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 /*
  * ms_whois
- *      parv[0] = sender prefix
  *      parv[1] = server to reply
  *      parv[2] = nickname to whois
  */
@@ -140,18 +140,18 @@ ms_whois(struct Client *client_p, struct Client *source_p, int parc, const char
        if((target_p = find_client(parv[1])) == NULL)
        {
                sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
-                                  form_str(ERR_NOSUCHSERVER), 
+                                  form_str(ERR_NOSUCHSERVER),
                                   IsDigit(parv[1][0]) ? "*" : parv[1]);
                return 0;
        }
 
        /* if parv[1] isnt my client, or me, someone else is supposed
-        * to be handling the request.. so send it to them 
+        * to be handling the request.. so send it to them
         */
        if(!MyClient(target_p) && !IsMe(target_p))
        {
-               sendto_one(target_p, ":%s WHOIS %s :%s", 
-                          get_id(source_p, target_p), 
+               sendto_one(target_p, ":%s WHOIS %s :%s",
+                          get_id(source_p, target_p),
                           get_id(target_p, target_p), parv[2]);
                return 0;
        }
@@ -168,8 +168,8 @@ ms_whois(struct Client *client_p, struct Client *source_p, int parc, const char
 
 /* do_whois
  *
- * inputs      - pointer to 
- * output      - 
+ * inputs      - pointer to
+ * output      -
  * side effects -
  */
 static void
@@ -190,18 +190,14 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
                nick++;
        }
 
-       if(MyClient(source_p))\r
-               target_p = find_named_person(nick);\r
-       else\r
-               target_p = find_person(nick);
-
+       target_p = find_named_person(nick);
        if(target_p != NULL)
        {
                if(operspy)
                {
                        char buffer[BUFSIZE];
 
-                       snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
+                       rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
                                target_p->name, target_p->username,
                                target_p->host, target_p->servptr->name);
                        report_operspy(source_p, "WHOIS", buffer);
@@ -211,10 +207,10 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
        }
        else
                sendto_one_numeric(source_p, ERR_NOSUCHNICK,
-                                  form_str(ERR_NOSUCHNICK), 
+                                  form_str(ERR_NOSUCHNICK),
                                   nick);
 
-       sendto_one_numeric(source_p, RPL_ENDOFWHOIS, 
+       sendto_one_numeric(source_p, RPL_ENDOFWHOIS,
                           form_str(RPL_ENDOFWHOIS), parv[1]);
        return;
 }
@@ -240,15 +236,11 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        char *t;
        int tlen;
        hook_data_client hdata;
-       char *name;
-       char quest[] = "?";
        int visible;
        int extra_space = 0;
-
-       if(target_p->name[0] == '\0')
-               name = quest;
-       else
-               name = target_p->name;
+#ifdef RB_IPV6
+       struct sockaddr_in ip4;
+#endif
 
        if(target_p->user == NULL)
        {
@@ -257,11 +249,11 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        }
 
        sendto_one_numeric(source_p, RPL_WHOISUSER, form_str(RPL_WHOISUSER),
-                          target_p->name, target_p->username, 
+                          target_p->name, target_p->username,
                           target_p->host, target_p->info);
 
-       cur_len = mlen = rb_sprintf(buf, form_str(RPL_WHOISCHANNELS), 
-                                   get_id(&me, source_p), get_id(source_p, source_p), 
+       cur_len = mlen = rb_sprintf(buf, form_str(RPL_WHOISCHANNELS),
+                                   get_id(&me, source_p), get_id(source_p, source_p),
                                    target_p->name);
 
        /* Make sure it won't overflow when sending it to the client
@@ -327,6 +319,15 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                    GlobalSetOptions.operstring));
        }
 
+       if(IsSSLClient(target_p))
+               sendto_one_numeric(source_p, RPL_WHOISSECURE, form_str(RPL_WHOISSECURE),
+                                  target_p->name);
+       if((source_p == target_p || IsOper(source_p)) &&
+                       target_p->certfp != NULL)
+               sendto_one_numeric(source_p, RPL_WHOISCERTFP,
+                               form_str(RPL_WHOISCERTFP),
+                               target_p->name, target_p->certfp);
+
        if(MyClient(target_p))
        {
                if (IsDynSpoof(target_p) && (IsOper(source_p) || source_p == target_p))
@@ -346,13 +347,24 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                           form_str(RPL_WHOISACTUALLY),
                                           target_p->name, target_p->sockhost);
 
-               sendto_one_numeric(source_p, RPL_WHOISIDLE, form_str(RPL_WHOISIDLE),
-                                  target_p->name, 
-                                  rb_current_time() - target_p->localClient->last, 
-                                  target_p->localClient->firsttime);
+#ifdef RB_IPV6
+               if (target_p->localClient->ip.ss_family == 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_inet_ntop_sock((struct sockaddr *)&ip4,
+                                       buf, sizeof buf);
+                       sendto_one_numeric(source_p, RPL_WHOISTEXT,
+                                       "%s :Underlying IPv4 is %s",
+                                       target_p->name, buf);
+               }
+#endif /* RB_IPV6 */
 
-               sendto_one_notice(source_p, ":%ld %ld", target_p->localClient->last, 
-                                  target_p->localClient->firsttime);
+               sendto_one_numeric(source_p, RPL_WHOISIDLE, form_str(RPL_WHOISIDLE),
+                                  target_p->name,
+                                  (long)(rb_current_time() - target_p->localClient->last),
+                                  (unsigned long)target_p->localClient->firsttime);
        }
        else
        {
@@ -371,9 +383,8 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                        sendto_one_numeric(source_p, RPL_WHOISACTUALLY,
                                           form_str(RPL_WHOISACTUALLY),
                                           target_p->name, target_p->sockhost);
-                       
+
                }
-       
        }
 
        hdata.client = source_p;