wsockd: conn_t.stream is not needed

[solanum.git] / modules / m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index 63c6a927ea8359ea09bd53967442baf52120da99..5f7b42d134fee751196c9e46eceb8feb023226b7 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -20,12 +20,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_whois.c 3536 2007-07-14 21:50:21Z jilles $
  */
 
 #include "stdinc.h"
-#include "common.h"
 #include "client.h"
 #include "hash.h"
 #include "channel.h"
@@ -47,14 +44,17 @@
 #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 Client *, struct Client *, int, const char **);
-static int ms_whois(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, MFLG_SLOW,
+       "WHOIS", 0, 0, 0, 0,
        {mg_unreg, {m_whois, 2}, {ms_whois, 2}, mg_ignore, mg_ignore, {m_whois, 2}}
 };
 
@@ -70,14 +70,14 @@ mapi_hlist_av1 whois_hlist[] = {
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3536 $");
+DECLARE_MODULE_AV2(whois, NULL, NULL, whois_clist, whois_hlist, NULL, NULL, NULL, whois_desc);
 
 /*
  * m_whois
  *      parv[1] = nickname masklist
  */
-static int
-m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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;
 
@@ -87,7 +87,7 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
                {
                        sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN),
                                        me.name, source_p->name);
-                       return 0;
+                       return;
                }
 
                if(!IsOper(source_p))
@@ -99,7 +99,7 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
                                           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();
@@ -107,14 +107,12 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
 
                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;
 }
 
 /*
@@ -122,8 +120,8 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
  *      parv[1] = server to reply
  *      parv[2] = nickname to whois
  */
-static int
-ms_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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;
 
@@ -135,7 +133,7 @@ ms_whois(struct Client *client_p, struct Client *source_p, int parc, const char
        {
                sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN),
                                me.name, source_p->name);
-               return 0;
+               return;
        }
 
        /* check if parv[1] exists */
@@ -144,7 +142,7 @@ ms_whois(struct Client *client_p, struct Client *source_p, int parc, const char
                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
@@ -155,7 +153,7 @@ ms_whois(struct Client *client_p, struct Client *source_p, int parc, const char
                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
@@ -164,8 +162,6 @@ ms_whois(struct Client *client_p, struct Client *source_p, int parc, const char
         */
        parv[1] = parv[2];
        do_whois(client_p, source_p, parc, parv);
-
-       return 0;
 }
 
 /* do_whois
@@ -199,7 +195,7 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
                {
                        char buffer[BUFSIZE];
 
-                       rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
+                       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);
@@ -214,7 +210,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;
 }
 
 /*
@@ -253,7 +248,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                           target_p->name, target_p->username,
                           target_p->host, target_p->info);
 
-       cur_len = mlen = rb_sprintf(buf, form_str(RPL_WHOISCHANNELS),
+       cur_len = mlen = sprintf(buf, form_str(RPL_WHOISCHANNELS),
                                    get_id(&me, source_p), get_id(source_p, source_p),
                                    target_p->name);
 
@@ -296,7 +291,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                        t = buf + mlen;
                                }
 
-                               tlen = rb_sprintf(t, "%s%s%s ",
+                               tlen = sprintf(t, "%s%s%s ",
                                                hdata.approved ? "" : "!",
                                                find_channel_status(msptr, 1),
                                                chptr->chname);
@@ -317,7 +312,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))
+       if(IsOper(target_p) && (!ConfigFileEntry.hide_opers_in_whois || IsOper(source_p)))
        {
                sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
                                   target_p->name,
@@ -329,7 +324,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        if(MyClient(target_p) && !EmptyString(target_p->localClient->opername) && IsOper(source_p))
        {
                char buf[512];
-               rb_snprintf(buf, sizeof(buf), "is opered as %s, privset %s",
+               snprintf(buf, sizeof(buf), "is opered as %s, privset %s",
                            target_p->localClient->opername, target_p->localClient->privset->name);
                sendto_one_numeric(source_p, RPL_WHOISSPECIAL, form_str(RPL_WHOISSPECIAL),
                                   target_p->name, buf);
@@ -371,7 +366,7 @@ 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))
@@ -420,7 +415,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;
 }
-