X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/cbeab4bc340b7b3f4fbf424ff327758defb9598a..460e7932744e7d48795875270a1a610a6a8dfa31:/modules/m_version.c

diff --git a/modules/m_version.c b/modules/m_version.c
index 667bfe16..d9f7c769 100644
--- a/modules/m_version.c
+++ b/modules/m_version.c
@@ -34,10 +34,13 @@
 #include "parse.h"
 #include "modules.h"
 
+static const char version_desc[] =
+	"Provides the VERSION command to display server version information";
+
 static char *confopts(void);
 
-static int m_version(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int mo_version(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_version(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_version(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message version_msgtab = {
 	"VERSION", 0, 0, 0, 0,
@@ -45,13 +48,14 @@ struct Message version_msgtab = {
 };
 
 mapi_clist_av1 version_clist[] = { &version_msgtab, NULL };
-DECLARE_MODULE_AV1(version, NULL, NULL, version_clist, NULL, NULL, "$Revision: 1887 $");
+
+DECLARE_MODULE_AV2(version, NULL, NULL, version_clist, NULL, NULL, NULL, NULL, version_desc);
 
 /*
  * m_version - VERSION command handler
  *      parv[1] = remote server
  */
-static int
+static void
 m_version(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	static time_t last_used = 0L;
@@ -63,13 +67,13 @@ m_version(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 			/* safe enough to give this on a local connect only */
 			sendto_one(source_p, form_str(RPL_LOAD2HI),
 				   me.name, source_p->name, "VERSION");
-			return 0;
+			return;
 		}
 		else
 			last_used = rb_current_time();
 
 		if(hunt_server(client_p, source_p, ":%s VERSION :%s", 1, parc, parv) != HUNTED_ISME)
-			return 0;
+			return;
 	}
 
 	sendto_one_numeric(source_p, RPL_VERSION, form_str(RPL_VERSION),
@@ -77,19 +81,16 @@ m_version(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 #ifdef CUSTOM_BRANDING
 			   PACKAGE_NAME "-" PACKAGE_VERSION,
 #endif
-			   me.name, confopts(), TS_CURRENT,
-			   ServerInfo.sid);
+			   me.name, confopts(), TS_CURRENT);
 
 	show_isupport(source_p);
-
-	return 0;
 }
 
 /*
  * mo_version - VERSION command handler
  *      parv[1] = remote server
  */
-static int
+static void
 mo_version(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	if(hunt_server(client_p, source_p, ":%s VERSION :%s", 1, parc, parv) == HUNTED_ISME)
@@ -99,12 +100,9 @@ mo_version(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
 #ifdef CUSTOM_BRANDING
 				   PACKAGE_NAME "-" PACKAGE_VERSION,
 #endif
-				   me.name, confopts(), TS_CURRENT,
-				   ServerInfo.sid);
+				   me.name, confopts(), TS_CURRENT);
 		show_isupport(source_p);
 	}
-
-	return 0;
 }
 
 /* confopts()
@@ -124,10 +122,6 @@ confopts(void)
 	if(ConfigChannel.use_except)
 		*p++ = 'e';
 
-	/* might wanna hide this :P */
-	if(ServerInfo.hub)
-		*p++ = 'H';
-
 	if(ConfigChannel.use_invex)
 		*p++ = 'I';
 
@@ -139,17 +133,12 @@ confopts(void)
 
 	if(opers_see_all_users || ConfigFileEntry.operspy_dont_care_user_info)
 		*p++ = 'S';
-#ifdef IGNORE_BOGUS_TS
-	*p++ = 'T';
-#endif
 
 #ifdef HAVE_LIBZ
 	*p++ = 'Z';
 #endif
 
-#ifdef RB_IPV6
 	*p++ = '6';
-#endif
 
 	*p = '\0';