* 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_userhost.c 254 2005-09-21 23:35:12Z nenolod $
*/
#include "stdinc.h"
#include "numeric.h"
#include "s_serv.h"
#include "send.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "msg.h"
#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 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, MFLG_SLOW,
+ "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_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
-m_userhost(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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;
char response[NICKLEN * 2 + USERLEN + HOSTLEN + 30];
int cur_len;
int rl;
- cur_len = rb_sprintf(buf, form_str(RPL_USERHOST), me.name, parv[0], "");
+ cur_len = sprintf(buf, form_str(RPL_USERHOST), me.name, source_p->name, "");
t = buf + cur_len;
for (i = 1; i <= 5; i++)
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 = rb_sprintf(response, "%s%s=%c%s@%s ",
+ 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 = rb_sprintf(response, "%s%s=%c%s@%s ",
+ 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);
}
if((rl + cur_len) < (BUFSIZE - 10))
{
- rb_sprintf(t, "%s", response);
+ sprintf(t, "%s", response);
t += rl;
cur_len += rl;
}
}
sendto_one(source_p, "%s", buf);
-
- return 0;
}