#include "whowas.h"
#include "monitor.h"
-static int me_realhost(struct Client *, struct Client *, int, const char **);
-static int ms_chghost(struct Client *, struct Client *, int, const char **);
-static int me_chghost(struct Client *, struct Client *, int, const char **);
-static int mo_chghost(struct Client *, struct Client *, int, const char **);
+static const char chghost_desc[] = "Provides commands used to change and retrieve client hostnames";
+
+static void me_realhost(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_chghost(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void me_chghost(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_chghost(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
struct Message realhost_msgtab = {
- "REALHOST", 0, 0, 0, MFLG_SLOW,
+ "REALHOST", 0, 0, 0, 0,
{mg_ignore, mg_ignore, mg_ignore, mg_ignore, {me_realhost, 2}, mg_ignore}
};
struct Message chghost_msgtab = {
- "CHGHOST", 0, 0, 0, MFLG_SLOW,
+ "CHGHOST", 0, 0, 0, 0,
{mg_ignore, mg_not_oper, {ms_chghost, 3}, {ms_chghost, 3}, {me_chghost, 3}, {mo_chghost, 3}}
};
mapi_clist_av1 chghost_clist[] = { &chghost_msgtab, &realhost_msgtab, NULL };
-DECLARE_MODULE_AV1(chghost, NULL, NULL, chghost_clist, NULL, NULL, "$Revision: 3424 $");
+DECLARE_MODULE_AV2(chghost, NULL, NULL, chghost_clist, NULL, NULL, NULL, NULL, chghost_desc);
/* clean_host()
*
* input - host to check
- * output - 0 if erroneous, else 0
+ * output - 0 if erroneous, else 1
* side effects -
*/
static int
clean_host(const char *host)
{
int len = 0;
-
+ const char *last_slash = 0;
+
if (*host == '\0' || *host == ':')
return 0;
if(!IsHostChar(*host))
return 0;
+ if(*host == '/')
+ last_slash = host;
}
if(len > HOSTLEN)
return 0;
+ if(last_slash && IsDigit(last_slash[1]))
+ return 0;
+
return 1;
}
/*
* me_realhost
- * parv[0] = origin
* parv[1] = real host
*
* Yes this contains a little race condition if someone does a whois
* I don't think that's a big problem as the whole thing is a
* race condition.
*/
-static int
-me_realhost(struct Client *client_p, struct Client *source_p,
+static void
+me_realhost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
int parc, const char *parv[])
{
if (!IsPerson(source_p))
- return 0;
+ return;
del_from_hostname_hash(source_p->orighost, source_p);
rb_strlcpy(source_p->orighost, parv[1], sizeof source_p->orighost);
else
ClearDynSpoof(source_p);
add_to_hostname_hash(source_p->orighost, source_p);
- return 0;
+ return;
}
static int
/*
* ms_chghost
- * parv[0] = origin
* parv[1] = target
* parv[2] = host
*/
-static int
-ms_chghost(struct Client *client_p, struct Client *source_p,
+static void
+ms_chghost(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[1])))
- return -1;
+ return;
if (do_chghost(source_p, target_p, parv[2], 0))
{
use_id(source_p), use_id(target_p), parv[2]);
}
- return 0;
+ return;
}
/*
* me_chghost
- * parv[0] = origin
* parv[1] = target
* parv[2] = host
*/
-static int
-me_chghost(struct Client *client_p, struct Client *source_p,
+static void
+me_chghost(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[1])))
- return -1;
+ return;
do_chghost(source_p, target_p, parv[2], 1);
- return 0;
+ return;
}
/*
* mo_chghost
- * parv[0] = origin
* parv[1] = target
* parv[2] = host
*/
/* Disable this because of the abuse potential -- jilles
* No, make it toggleable via ./configure. --nenolod
*/
-static int
-mo_chghost(struct Client *client_p, struct Client *source_p,
+static void
+mo_chghost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
int parc, const char *parv[])
{
#ifdef ENABLE_OPER_CHGHOST
{
sendto_one(source_p, form_str(ERR_NOPRIVS),
me.name, source_p->name, "admin");
- return 0;
+ return;
}
if (!(target_p = find_named_person(parv[1])))
{
sendto_one_numeric(source_p, ERR_NOSUCHNICK,
form_str(ERR_NOSUCHNICK), parv[1]);
- return 0;
+ return;
}
if (!clean_host(parv[2]))
{
sendto_one_notice(source_p, ":Hostname %s is invalid", parv[2]);
- return 0;
+ return;
}
do_chghost(source_p, target_p, parv[2], 0);
"CHGHOST");
#endif
- return 0;
+ return;
}