Empty handlers for closing tags of <bind> and <query> stanzas. We handled those...

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

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index ea4adc48be009d30aecf3b85e65063d64f5d7226..e990ae3547d4841ddc9aa672811af0fb0d0ae11f 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -17,9 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-// uncomment for more verbosity
-#define XMPP_DEBUG 1
-
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -79,30 +76,11 @@ static void xmpp_entity_declaration(void *userData, const XML_Char *entityName,
                                const XML_Char *systemId, const XML_Char *publicId,
                                const XML_Char *notationName
 ) {
-       syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser.");
+       XMPPM_syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser.");
        XML_StopParser(XMPP->xp, XML_FALSE);
 }
 #endif
 
-static inline int XMPP_GetUtf8SequenceLength(const char *CharS, const char *CharE)
-{
-       /* if this is is migrated to strbuf, remove this copy. */
-       int n = 0;
-        unsigned char test = (1<<7);
-
-       if ((*CharS & 0xC0) != 0xC0) 
-               return 1;
-
-       while ((n < 8) && 
-              ((test & ((unsigned char)*CharS)) != 0)) 
-       {
-               test = test >> 1;
-               n ++;
-       }
-       if ((n > 6) || ((CharE - CharS) < n))
-               n = 0;
-       return n;
-}
 
 
 /*
@@ -115,11 +93,8 @@ static inline int XMPP_GetUtf8SequenceLength(const char *CharS, const char *Char
 char *xmlesc(char *buf, char *str, int bufsiz)
 {
        char *ptr;
-       char *eiptr;
        unsigned char ch;
-       int inlen;
        int len = 0;
-       int IsUtf8Sequence;
 
        if (!buf) return(NULL);
        buf[0] = 0;
@@ -128,9 +103,6 @@ char *xmlesc(char *buf, char *str, int bufsiz)
                return(buf);
        }
 
-       inlen = strlen(str);
-       eiptr = str + inlen;
-
        for (ptr=str; *ptr; ptr++) {
                ch = *ptr;
                if (ch == '<') {
@@ -155,25 +127,10 @@ char *xmlesc(char *buf, char *str, int bufsiz)
                        buf[len] = 0;
                }
                else {
-                       char oct[32];
-
-                       IsUtf8Sequence =  XMPP_GetUtf8SequenceLength(&buf[len], eiptr);
-                       if (IsUtf8Sequence)
-                       {
-                               while (IsUtf8Sequence > 0){
-                                       buf[len] = *ptr;
-                                       len ++;
-                                       if (--IsUtf8Sequence)
-                                               ptr++;
-                               }
-                               buf[len] = '\0';
-                       }
-                       else
-                       {
-                               sprintf(oct, "&#%o;", ch);
-                               strcpy(&buf[len], oct);
-                               len += strlen(oct);
-                       }
+                       char oct[10];
+                       sprintf(oct, "&#%o;", ch);
+                       strcpy(&buf[len], oct);
+                       len += strlen(oct);
                }
                if ((len + 6) > bufsiz) {
                        return(buf);
@@ -247,12 +204,12 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) {
                strcpy(el, ++sep);
        }
 
-#ifdef XMPP_DEBUG
-       syslog(LOG_DEBUG, "XMPP ELEMENT START: <%s>\n", el);
+       /*
+       XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT START: <%s>\n", el);
        for (i=0; attr[i] != NULL; i+=2) {
-               syslog(LOG_DEBUG, "                    Attribute '%s' = '%s'\n", attr[i], attr[i+1]);
+               XMPP_syslog(LOG_DEBUG, "                    Attribute '%s' = '%s'\n", attr[i], attr[i+1]);
        }
-#endif /* XMPP_DEBUG */
+       uncomment for more verbosity */
 
        if (!strcasecmp(el, "stream")) {
                xmpp_stream_start(data, supplied_el, attr);
@@ -319,12 +276,12 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
                strcpy(el, ++sep);
        }
 
-#ifdef XMPP_DEBUG
-       syslog(LOG_DEBUG, "XMPP ELEMENT END  : <%s>\n", el);
+       /*
+       XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT END  : <%s>\n", el);
        if (XMPP->chardata_len > 0) {
-               syslog(LOG_DEBUG, "          chardata: %s\n", XMPP->chardata);
+               XMPP_syslog(LOG_DEBUG, "          chardata: %s\n", XMPP->chardata);
        }
-#endif /* XMPP_DEBUG */
+       uncomment for more verbosity */
 
        if (!strcasecmp(el, "resource")) {
                if (XMPP->chardata_len > 0) {
@@ -383,7 +340,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
                         * Unknown query ... return the XML equivalent of a blank stare
                         */
                        else {
-                               syslog(LOG_DEBUG,
+                               XMPP_syslog(LOG_DEBUG,
                                            "Unknown query <%s> - returning <service-unavailable/>\n",
                                            el
                                );
@@ -518,18 +475,22 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
        }
 
        else if (!strcasecmp(el, "stream")) {
-               syslog(LOG_DEBUG, "XMPP client shut down their stream\n");
+               XMPPM_syslog(LOG_DEBUG, "XMPP client shut down their stream\n");
                xmpp_massacre_roster();
                cprintf("</stream>\n");
                CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
        }
 
        else if (!strcasecmp(el, "query")) {
-               // no action required here, we picked up the xmlns= parameter during xmpp_xml_start()
+               /* already processed , no further action needed here */
+       }
+
+       else if (!strcasecmp(el, "bind")) {
+               /* already processed , no further action needed here */
        }
 
        else {
-               syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
+               XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
        }
 
        XMPP->chardata_len = 0;
@@ -594,7 +555,7 @@ void xmpp_greeting(void) {
 
        XMPP->xp = XML_ParserCreateNS("UTF-8", ':');
        if (XMPP->xp == NULL) {
-               syslog(LOG_ALERT, "Cannot create XML parser!\n");
+               XMPPM_syslog(LOG_ALERT, "Cannot create XML parser!\n");
                CC->kill_me = KILLME_XML_PARSER;
                return;
        }
@@ -628,11 +589,10 @@ void xmpp_command_loop(void) {
        time(&CC->lastcmd);
        rc = client_read_random_blob(stream_input, 30);
        if (rc > 0) {
-               syslog(LOG_DEBUG, "\033[32m%s\033[0m", ChrPtr(stream_input));
                XML_Parse(XMPP->xp, ChrPtr(stream_input), rc, 0);
        }
        else {
-               syslog(LOG_ERR, "client disconnected: ending session.\n");
+               XMPPM_syslog(LOG_ERR, "client disconnected: ending session.\n");
                CC->kill_me = KILLME_CLIENT_DISCONNECTED;
        }
        FreeStrBuf(&stream_input);