[openssl] support ECDHE on more than one curve when possible

[solanum.git] / modules / m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index f419308cafa1f9790104068f0156f766c3648b8e..a43b9109dc8022c81f5591edefa34a3feef0ba44 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -23,7 +23,6 @@
  */
 
 #include "stdinc.h"
-#include "common.h"
 #include "client.h"
 #include "hash.h"
 #include "channel.h"
@@ -41,15 +40,17 @@
 #include "modules.h"
 #include "hook.h"
 #include "s_newconf.h"
-#include "ipv4_from_ipv6.h"
 #include "ratelimit.h"
 #include "s_assert.h"
 
+static const char whois_desc[] =
+       "Provides the WHOIS command to display information about a user";
+
 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);
 
-static int m_whois(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int ms_whois(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_whois(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_whois(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message whois_msgtab = {
        "WHOIS", 0, 0, 0, 0,
@@ -68,13 +69,13 @@ mapi_hlist_av1 whois_hlist[] = {
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV2(whois, NULL, NULL, whois_clist, whois_hlist, NULL, NULL, NULL, NULL);
+DECLARE_MODULE_AV2(whois, NULL, NULL, whois_clist, whois_hlist, NULL, NULL, NULL, whois_desc);
 
 /*
  * m_whois
  *      parv[1] = nickname masklist
  */
-static int
+static void
 m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        static time_t last_used = 0;
@@ -85,7 +86,7 @@ m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                {
                        sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN),
                                        me.name, source_p->name);
-                       return 0;
+                       return;
                }
 
                if(!IsOper(source_p))
@@ -97,7 +98,7 @@ m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                                           me.name, source_p->name, "WHOIS");
                                sendto_one_numeric(source_p, RPL_ENDOFWHOIS,
                                                   form_str(RPL_ENDOFWHOIS), parv[2]);
-                               return 0;
+                               return;
                        }
                        else
                                last_used = rb_current_time();
@@ -105,14 +106,12 @@ m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 
                if(hunt_server(client_p, source_p, ":%s WHOIS %s :%s", 1, parc, parv) !=
                   HUNTED_ISME)
-                       return 0;
+                       return;
 
                parv[1] = parv[2];
 
        }
        do_whois(client_p, source_p, parc, parv);
-
-       return 0;
 }
 
 /*
@@ -120,7 +119,7 @@ m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
  *      parv[1] = server to reply
  *      parv[2] = nickname to whois
  */
-static int
+static void
 ms_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Client *target_p;
@@ -133,7 +132,7 @@ ms_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
        {
                sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN),
                                me.name, source_p->name);
-               return 0;
+               return;
        }
 
        /* check if parv[1] exists */
@@ -142,7 +141,7 @@ ms_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
                sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
                                   form_str(ERR_NOSUCHSERVER),
                                   IsDigit(parv[1][0]) ? "*" : parv[1]);
-               return 0;
+               return;
        }
 
        /* if parv[1] isnt my client, or me, someone else is supposed
@@ -153,7 +152,7 @@ ms_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
                sendto_one(target_p, ":%s WHOIS %s :%s",
                           get_id(source_p, target_p),
                           get_id(target_p, target_p), parv[2]);
-               return 0;
+               return;
        }
 
        /* ok, the target is either us, or a client on our server, so perform the whois
@@ -162,8 +161,6 @@ ms_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
         */
        parv[1] = parv[2];
        do_whois(client_p, source_p, parc, parv);
-
-       return 0;
 }
 
 /* do_whois
@@ -212,7 +209,6 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
 
        sendto_one_numeric(source_p, RPL_ENDOFWHOIS,
                           form_str(RPL_ENDOFWHOIS), parv[1]);
-       return;
 }
 
 /*
@@ -369,10 +365,10 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                           target_p->name, target_p->sockhost);
 
 #ifdef RB_IPV6
-               if (target_p->localClient->ip.ss_family == AF_INET6 &&
+               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);
@@ -418,6 +414,4 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                call_hook(doing_whois_hook, &hdata);
        else
                call_hook(doing_whois_global_hook, &hdata);
-
-       return;
 }