Combine stats A output parameters (#35)

[solanum.git] / modules / m_starttls.c

diff --git a/modules/m_starttls.c b/modules/m_starttls.c
index a0826736928cc8f3cc37ed52294770b8b9acf770..a51f652f246241d9994aeefd48d1c016af00226c 100644 (file)
--- a/modules/m_starttls.c
+++ b/modules/m_starttls.c
@@ -20,7 +20,6 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "common.h"
 #include "match.h"
 #include "hash.h"
 #include "ircd.h"
@@ -29,39 +28,60 @@
 #include "msg.h"
 #include "modules.h"
 #include "sslproc.h"
+#include "s_assert.h"
+#include "s_serv.h"
+#include "logger.h"
 
-static int mr_starttls(struct Client *, struct Client *, int, const char **);
+static const char starttls_desc[] = "Provides the tls CAP and STARTTLS command";
+
+static void mr_starttls(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message starttls_msgtab = {
-       "STARTTLS", 0, 0, 0, MFLG_SLOW,
+       "STARTTLS", 0, 0, 0, 0,
        {{mr_starttls, 0}, mg_ignore, mg_ignore, mg_ignore, mg_ignore, mg_ignore}
 };
 
 mapi_clist_av1 starttls_clist[] = { &starttls_msgtab, NULL };
 
-DECLARE_MODULE_AV1(starttls, NULL, NULL, starttls_clist, NULL, NULL, "$Revision$");
+unsigned int CLICAP_TLS = 0;
+
+static struct ClientCapability capdata_tls = {
+       .flags = CLICAP_FLAGS_PRIORITY,
+};
+
+mapi_cap_list_av2 starttls_cap_list[] = {
+       { MAPI_CAP_CLIENT, "tls", &capdata_tls, &CLICAP_TLS },
+       { 0, NULL, NULL, NULL }
+};
+
+DECLARE_MODULE_AV2(starttls, NULL, NULL, starttls_clist, NULL, NULL, starttls_cap_list, NULL, starttls_desc);
 
-static int
-mr_starttls(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mr_starttls(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-#ifdef HAVE_LIBCRYPTO
        ssl_ctl_t *ctl;
        rb_fde_t *F[2];
 
        if (!MyConnect(client_p))
-               return 0;
+               return;
 
-       if (!ssl_ok || !get_ssld_count())
+       if (IsSSL(client_p))
+       {
+               sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "Nested TLS handshake not allowed");
+               return;
+       }
+
+       if (!ircd_ssl_ok || !get_ssld_count())
        {
                sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "TLS is not configured");
-               return 1;
+               return;
        }
 
        if (rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &F[0], &F[1], "STARTTLS ssld session") == -1)
        {
                ilog_error("error creating SSL/TLS socketpair for ssld slave");
                sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "Unable to create SSL/TLS socketpair for ssld offload slave");
-               return 1;
+               return;
        }
 
        s_assert(client_p->localClient != NULL);
@@ -72,19 +92,13 @@ mr_starttls(struct Client *client_p, struct Client *source_p, int parc, const ch
        sendto_one_numeric(client_p, RPL_STARTTLS, form_str(RPL_STARTTLS));
        send_queued(client_p);
 
-       ctl = start_ssld_accept(client_p->localClient->F, F[1], rb_get_fd(F[0]));
+       /* TODO: set localClient->ssl_callback and handle success/failure */
+
+       ctl = start_ssld_accept(client_p->localClient->F, F[1], connid_get(client_p));
        if (ctl != NULL)
        {
-               del_from_cli_fd_hash(client_p);
                client_p->localClient->F = F[0];
-               add_to_cli_fd_hash(client_p);
                client_p->localClient->ssl_ctl = ctl;
                SetSSL(client_p);
        }
-       else
-               return 1;
-
-#endif
-       sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "TLS is not configured");
-       return 0;
 }