X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/4562c604897f18f08e1bee993d455d9c1774f9ad..01fb744c405792dd3f0859a53f74cd4cb5fd166f:/modules/m_ping.c

diff --git a/modules/m_ping.c b/modules/m_ping.c
index 6269c54e..0c66656b 100644
--- a/modules/m_ping.c
+++ b/modules/m_ping.c
@@ -20,8 +20,6 @@
  *  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_ping.c 254 2005-09-21 23:35:12Z nenolod $
  */
 
 #include "stdinc.h"
@@ -37,25 +35,28 @@
 #include "s_conf.h"
 #include "s_serv.h"
 
-static int m_ping(struct Client *, struct Client *, int, const char **);
-static int ms_ping(struct Client *, struct Client *, int, const char **);
+static const char ping_desc[] =
+	"Provides the PING command to ensure a client or server is still alive";
+
+static void m_ping(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_ping(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message ping_msgtab = {
-	"PING", 0, 0, 0, MFLG_SLOW,
+	"PING", 0, 0, 0, 0,
 	{mg_unreg, {m_ping, 2}, {ms_ping, 2}, {ms_ping, 2}, mg_ignore, {m_ping, 2}}
 };
 
 mapi_clist_av1 ping_clist[] = { &ping_msgtab, NULL };
-DECLARE_MODULE_AV1(ping, NULL, NULL, ping_clist, NULL, NULL, "$Revision: 254 $");
+
+DECLARE_MODULE_AV2(ping, NULL, NULL, ping_clist, NULL, NULL, NULL, NULL, ping_desc);
 
 /*
 ** m_ping
-**      parv[0] = sender prefix
 **      parv[1] = origin
 **      parv[2] = destination
 */
-static int
-m_ping(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_ping(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Client *target_p;
 	const char *destination;
@@ -75,18 +76,16 @@ m_ping(struct Client *client_p, struct Client *source_p, int parc, const char *p
 			sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
 					   form_str(ERR_NOSUCHSERVER),
 					   destination);
-			return 0;
+			return;
 		}
 	}
 	else
 		sendto_one(source_p, ":%s PONG %s :%s", me.name,
 			   (destination) ? destination : me.name, parv[1]);
-
-	return 0;
 }
 
-static int
-ms_ping(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_ping(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Client *target_p;
 	const char *destination;
@@ -97,7 +96,7 @@ ms_ping(struct Client *client_p, struct Client *source_p, int parc, const char *
 	   irccmp(destination, me.id))
 	{
 		if((target_p = find_client(destination)) && IsServer(target_p))
-			sendto_one(target_p, ":%s PING %s :%s", 
+			sendto_one(target_p, ":%s PING %s :%s",
 				   get_id(source_p, target_p), source_p->name,
 				   get_id(target_p, target_p));
 		/* not directed at an id.. */
@@ -107,9 +106,7 @@ ms_ping(struct Client *client_p, struct Client *source_p, int parc, const char *
 					   destination);
 	}
 	else
-		sendto_one(source_p, ":%s PONG %s :%s", 
-			   get_id(&me, source_p), me.name, 
+		sendto_one(source_p, ":%s PONG %s :%s",
+			   get_id(&me, source_p), me.name,
 			   get_id(source_p, source_p));
-
-	return 0;
 }