add help for `chm_regmsg`

[solanum.git] / modules / m_connect.c

diff --git a/modules/m_connect.c b/modules/m_connect.c
index 8d31597ae6a1baee4be6a7250500ee8338235b95..3f1db4ddfc553e880894fd41c5d6992c411ee59d 100644 (file)
--- a/modules/m_connect.c
+++ b/modules/m_connect.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_connect.c 3161 2007-01-25 07:23:01Z nenolod $
  */
 
 #include "stdinc.h"
@@ -40,8 +38,11 @@
 #include "modules.h"
 #include "sslproc.h"
 
-static int mo_connect(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int ms_connect(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char connect_desc[] =
+       "Provides the CONNECT command to introduce servers to the network";
+
+static void mo_connect(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_connect(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message connect_msgtab = {
        "CONNECT", 0, 0, 0, 0,
@@ -49,7 +50,8 @@ struct Message connect_msgtab = {
 };
 
 mapi_clist_av1 connect_clist[] = { &connect_msgtab, NULL };
-DECLARE_MODULE_AV1(connect, NULL, NULL, connect_clist, NULL, NULL, "$Revision: 3161 $");
+
+DECLARE_MODULE_AV2(connect, NULL, NULL, connect_clist, NULL, NULL, NULL, NULL, connect_desc);
 
 /*
  * mo_connect - CONNECT command handler
@@ -61,7 +63,7 @@ DECLARE_MODULE_AV1(connect, NULL, NULL, connect_clist, NULL, NULL, "$Revision: 3
  *      parv[2] = port number
  *      parv[3] = remote server
  */
-static int
+static void
 mo_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        int port;
@@ -75,17 +77,17 @@ mo_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
        {
                sendto_one(source_p, form_str(ERR_NOPRIVS),
                           me.name, source_p->name, "remote");
-               return 0;
+               return;
        }
 
        if(hunt_server(client_p, source_p, ":%s CONNECT %s %s :%s", 3, parc, parv) != HUNTED_ISME)
-               return 0;
+               return;
 
        if((target_p = find_server(source_p, parv[1])))
        {
                sendto_one_notice(source_p, ":Connect: Server %s already exists from %s.", parv[1],
                        target_p->from->name);
-               return 0;
+               return;
        }
 
        /*
@@ -94,15 +96,15 @@ mo_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
        if((server_p = find_server_conf(parv[1])) == NULL)
        {
                sendto_one_notice(source_p, ":Connect: Host %s not listed in ircd.conf", parv[1]);
-               return 0;
+               return;
        }
 
-       if(ServerConfSSL(server_p) && (!ssl_ok || !get_ssld_count()))
+       if(ServerConfSSL(server_p) && (!ircd_ssl_ok || !get_ssld_count()))
        {
                sendto_one_notice(source_p,
                                  ":Connect: Server %s is set to use SSL/TLS but SSL/TLS is not configured.",
                                  parv[1]);
-               return 0;
+               return;
        }
 
        /*
@@ -118,9 +120,9 @@ mo_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
        else if(port <= 0)
        {
                sendto_one_notice(source_p, ":Connect: illegal port number");
-               return 0;
+               return;
        }
-       
+
        /*
         * Notify all operators about remote connect requests
         */
@@ -150,8 +152,6 @@ mo_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
         * destroyed, so reset it back to the configured settings
         */
        server_p->port = tmpport;
-
-       return 0;
 }
 
 /*
@@ -164,7 +164,7 @@ mo_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
  *      parv[2] = port number
  *      parv[3] = remote server
  */
-static int
+static void
 ms_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        int port;
@@ -173,13 +173,13 @@ ms_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
        struct Client *target_p;
 
        if(hunt_server(client_p, source_p, ":%s CONNECT %s %s :%s", 3, parc, parv) != HUNTED_ISME)
-               return 0;
+               return;
 
        if((target_p = find_server(NULL, parv[1])))
        {
                sendto_one_notice(source_p, ":Connect: Server %s already exists from %s.",
                                  parv[1], target_p->from->name);
-               return 0;
+               return;
        }
 
        /*
@@ -189,15 +189,15 @@ ms_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
        {
                sendto_one_notice(source_p, ":Connect: Host %s not listed in ircd.conf",
                                  parv[1]);
-               return 0;
+               return;
        }
 
-       if(ServerConfSSL(server_p) && (!ssl_ok || !get_ssld_count()))
+       if(ServerConfSSL(server_p) && (!ircd_ssl_ok || !get_ssld_count()))
        {
                sendto_one_notice(source_p,
                                  ":Connect: Server %s is set to use SSL/TLS but SSL/TLS is not configured.",
                                  parv[1]);
-               return 0;
+               return;
        }
 
        /*
@@ -215,7 +215,7 @@ ms_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
        else if(port <= 0)
        {
                sendto_one_notice(source_p, ":Connect: Illegal port number");
-               return 0;
+               return;
        }
 
        /*
@@ -246,5 +246,4 @@ ms_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
         * destroyed
         */
        server_p->port = tmpport;
-       return 0;
 }