Only send presence notifications when the first

[citadel.git] / citadel / modules / jabber / serv_xmpp.c

diff --git a/citadel/modules/jabber/serv_xmpp.c b/citadel/modules/jabber/serv_xmpp.c
index a70481696f6fb77b8bf012f1d582a35a7f9dda81..b7357925707b7051f4d15bdef7358ebeb5cdc060 100644 (file)
--- a/citadel/modules/jabber/serv_xmpp.c
+++ b/citadel/modules/jabber/serv_xmpp.c
@@ -79,6 +79,13 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
        /* The features of this stream are... */
        cprintf("<stream:features>");
 
+#ifdef HAVE_OPENSSL_XXXX_COMMENTED_OUT
+       /* TLS encryption (but only if it isn't already active) */
+       if (!CC->redirect_ssl) {
+               cprintf("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'></starttls>");
+       }
+#endif
+
        if (!CC->logged_in) {
                /* If we're not logged in yet, offer SASL as our feature set */
                xmpp_output_auth_mechs();
@@ -154,6 +161,10 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) {
                        }
                }
        }
+
+       else if (!strcasecmp(el, "html")) {
+               ++XMPP->html_tag_level;
+       }
 }
 
 
@@ -268,7 +279,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
                jabber_wholist_presence_dump();
        }
 
-       else if (!strcasecmp(el, "body")) {
+       else if ( (!strcasecmp(el, "body")) && (XMPP->html_tag_level == 0) ) {
                if (XMPP->message_body != NULL) {
                        free(XMPP->message_body);
                        XMPP->message_body = NULL;
@@ -280,6 +291,22 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
 
        else if (!strcasecmp(el, "message")) {
                jabber_send_message(XMPP->message_to, XMPP->message_body);
+               XMPP->html_tag_level = 0;
+       }
+
+       else if (!strcasecmp(el, "html")) {
+               --XMPP->html_tag_level;
+       }
+
+       else if (!strcasecmp(el, "starttls")) {
+#ifdef HAVE_OPENSSL
+       cprintf("<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+       CtdlModuleStartCryptoMsgs(NULL, NULL, NULL);
+       if (!CC->redirect_ssl) CC->kill_me = 1;
+#else
+       cprintf("<failure xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+       CC->kill_me = 1;
+#endif
        }
 
        XMPP->chardata_len = 0;
@@ -419,7 +446,8 @@ CTDL_MODULE_INIT(jabber)
                CtdlRegisterSessionHook(xmpp_cleanup_function, EVT_STOP);
                 CtdlRegisterSessionHook(xmpp_login_hook, EVT_LOGIN);
                 CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT);
-
+                CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH);
+                CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH);
        #else
                lprintf(CTDL_INFO, "This server is missing the Expat XML parser.  Jabber service will be disabled.\n");
 #endif