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 66a32097ca740fd982df1bccda496ef3fda9aa52..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();
@@ -146,6 +153,18 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) {
                        }
                }
        }
+
+       else if (!strcasecmp(el, "message")) {
+               for (i=0; attr[i] != NULL; i+=2) {
+                       if (!strcasecmp(attr[i], "to")) {
+                               safestrncpy(XMPP->message_to, attr[i+1], sizeof XMPP->message_to);
+                       }
+               }
+       }
+
+       else if (!strcasecmp(el, "html")) {
+               ++XMPP->html_tag_level;
+       }
 }
 
 
@@ -203,13 +222,6 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
 
                        /* Generate the "full JID" of the client resource */
 
-                       // snprintf(XMPP->client_jid, sizeof XMPP->client_jid,
-                       //      "%d@%s/%s",
-                       //      CC->cs_pid,
-                       //      config.c_fqdn,
-                       //      XMPP->iq_client_resource
-                       //);
-
                        snprintf(XMPP->client_jid, sizeof XMPP->client_jid,
                                "%s/%s",
                                CC->cs_inet_email,
@@ -267,6 +279,36 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
                jabber_wholist_presence_dump();
        }
 
+       else if ( (!strcasecmp(el, "body")) && (XMPP->html_tag_level == 0) ) {
+               if (XMPP->message_body != NULL) {
+                       free(XMPP->message_body);
+                       XMPP->message_body = NULL;
+               }
+               if (XMPP->chardata_len > 0) {
+                       XMPP->message_body = strdup(XMPP->chardata);
+               }
+       }
+
+       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;
        if (XMPP->chardata_alloc > 0) {
                XMPP->chardata[0] = 0;
@@ -306,6 +348,9 @@ void xmpp_cleanup_function(void) {
                XMPP->chardata = NULL;
                XMPP->chardata_len = 0;
                XMPP->chardata_alloc = 0;
+               if (XMPP->message_body != NULL) {
+                       free(XMPP->message_body);
+               }
        }
        XML_ParserFree(XMPP->xp);
        free(XMPP);
@@ -320,6 +365,7 @@ void xmpp_greeting(void) {
        strcpy(CC->cs_clientname, "Jabber session");
        CC->session_specific_data = malloc(sizeof(struct citxmpp));
        memset(XMPP, 0, sizeof(struct citxmpp));
+       XMPP->last_event_processed = queue_event_seq;
 
        /* XMPP does not use a greeting, but we still have to initialize some things. */
 
@@ -362,6 +408,7 @@ void xmpp_command_loop(void) {
  * Async loop for XMPP sessions (handles the transmission of unsolicited stanzas)
  */
 void xmpp_async_loop(void) {
+       xmpp_process_events();
        jabber_output_incoming_messages();
 }
 
@@ -370,12 +417,15 @@ void xmpp_async_loop(void) {
  * Login hook for XMPP sessions
  */
 void xmpp_login_hook(void) {
+       xmpp_queue_event(XMPP_EVT_LOGIN, CC->cs_inet_email);
+}
 
-       // we need to somehow alert all xmpp sessions that we are here
-       // and do a roster push followed by a presence push
-
-       lprintf(CTDL_DEBUG, "LOGIN HOOOOOOOOOOOOOKK!!!\n");
 
+/*
+ * Logout hook for XMPP sessions
+ */
+void xmpp_logout_hook(void) {
+       xmpp_queue_event(XMPP_EVT_LOGOUT, CC->cs_inet_email);
 }
 
 
@@ -395,7 +445,9 @@ CTDL_MODULE_INIT(jabber)
                                        CitadelServiceXMPP);
                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