m_whois: show services even if they lack opernames

[solanum.git] / modules / m_version.c

diff --git a/modules/m_version.c b/modules/m_version.c
index be97edfe26ae2ad60688cd4554e5407daef3e67c..d9f7c76918985ceb6b0fa1ae77aba406fda531cf 100644 (file)
--- a/modules/m_version.c
+++ b/modules/m_version.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_version.c 1887 2006-08-29 13:42:56Z jilles $
  */
 
 #include <stdinc.h>
@@ -36,25 +34,29 @@
 #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 Client *, struct Client *, int, const char **);
-static int mo_version(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, MFLG_SLOW,
+       "VERSION", 0, 0, 0, 0,
        {mg_unreg, {m_version, 0}, {mo_version, 0}, {mo_version, 0}, mg_ignore, {mo_version, 0}}
 };
 
 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
-m_version(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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;
 
@@ -65,13 +67,13 @@ m_version(struct Client *client_p, struct Client *source_p, int parc, const char
                        /* 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),
@@ -79,20 +81,17 @@ m_version(struct Client *client_p, struct Client *source_p, int parc, const char
 #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
-mo_version(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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)
        {
@@ -101,12 +100,9 @@ mo_version(struct Client *client_p, struct Client *source_p, int parc, const cha
 #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()
@@ -126,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';
 
@@ -141,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';