#include "parse.h"
#include "modules.h"
#include "s_conf.h"
+#include "s_newconf.h"
-static char buf[BUFSIZE];
-
-static int m_userhost(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
static const char userhost_desc[] =
"Provides the USERHOST command to show a user's host";
+static char buf[BUFSIZE];
+
+static void m_userhost(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
struct Message userhost_msgtab = {
"USERHOST", 0, 0, 0, 0,
{mg_unreg, {m_userhost, 2}, mg_ignore, mg_ignore, mg_ignore, {m_userhost, 2}}
};
mapi_clist_av1 userhost_clist[] = { &userhost_msgtab, NULL };
+
DECLARE_MODULE_AV2(userhost, NULL, NULL, userhost_clist, NULL, NULL, NULL, NULL, userhost_desc);
/*
* 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;
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);
}
}
sendto_one(source_p, "%s", buf);
-
- return 0;
}