]> jfr.im git - solanum.git/blobdiff - modules/m_userhost.c
reference.conf: add drain_reason
[solanum.git] / modules / m_userhost.c
index 9eb63eadcbb2494daabf27f295d5bd03734cea7d..0199f415dbde1da8df83c1c847548c28fb9859b7 100644 (file)
 #include "parse.h"
 #include "modules.h"
 #include "s_conf.h"
+#include "s_newconf.h"
+
+static const char userhost_desc[] =
+       "Provides the USERHOST command to show a user's host";
 
 static char buf[BUFSIZE];
 
-static int m_userhost(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_userhost(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message userhost_msgtab = {
        "USERHOST", 0, 0, 0, 0,
@@ -44,14 +48,15 @@ struct Message userhost_msgtab = {
 };
 
 mapi_clist_av1 userhost_clist[] = { &userhost_msgtab, NULL };
-DECLARE_MODULE_AV1(userhost, NULL, NULL, userhost_clist, NULL, NULL, "$Revision: 254 $");
+
+DECLARE_MODULE_AV2(userhost, NULL, NULL, userhost_clist, NULL, NULL, NULL, NULL, userhost_desc);
 
 /*
  * m_userhost added by Darren Reed 13/8/91 to aid clients and reduce
  * the need for complicated requests like WHOIS. It returns user/host
  * information only (no spurious AWAY labels or channels).
  */
-static int
+static void
 m_userhost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Client *target_p;
@@ -71,26 +76,20 @@ m_userhost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
 
                if((target_p = find_person(parv[i])) != NULL)
                {
-                       /*
-                        * Show real IP for USERHOST on yourself.
-                        * This is needed for things like mIRC, which do a server-based
-                        * lookup (USERHOST) to figure out what the clients' local IP
-                        * is.  Useful for things like NAT, and dynamic dial-up users.
-                        */
-                       if(MyClient(target_p) && (target_p == source_p))
+                       if (MyClient(target_p) && target_p == source_p)
                        {
                                rl = sprintf(response, "%s%s=%c%s@%s ",
                                                target_p->name,
-                                               IsOper(target_p) ? "*" : "",
+                                               SeesOper(target_p, source_p) ? "*" : "",
                                                (target_p->user->away) ? '-' : '+',
                                                target_p->username,
-                                               target_p->sockhost);
+                                               IsIPSpoof(target_p) ? target_p->orighost : target_p->sockhost);
                        }
                        else
                        {
                                rl = sprintf(response, "%s%s=%c%s@%s ",
                                                target_p->name,
-                                               IsOper(target_p) ? "*" : "",
+                                               SeesOper(target_p, source_p) ? "*" : "",
                                                (target_p->user->away) ? '-' : '+',
                                                target_p->username, target_p->host);
                        }
@@ -107,6 +106,4 @@ m_userhost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
        }
 
        sendto_one(source_p, "%s", buf);
-
-       return 0;
 }