cosmetic cleanup of files in xmpp directory

[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 e0b61af64413e38b7978d4b42d0f5388cd2ef71a..07188c2e948594fb57c25c8aea4cce9e5dee5e1c 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -67,7 +67,6 @@
 
 struct xmpp_event *xmpp_queue = NULL;
 
-
 #ifdef HAVE_XML_STOPPARSER
 /* Stop the parser if an entity declaration is hit. */
 static void xmpp_entity_declaration(void *userData, const XML_Char *entityName,
@@ -92,17 +91,17 @@ static inline int Ctdl_GetUtf8SequenceLength(const char *CharS, const char *Char
        int n = 0;
         unsigned char test = (1<<7);
 
-       if ((*CharS & 0xC0) != 0xC0) 
+       if ((*CharS & 0xC0) != 0xC0) {
                return 1;
+       }
 
-       while ((n < 8) && 
-              ((test & ((unsigned char)*CharS)) != 0)) 
-       {
+       while ((n < 8) && ((test & ((unsigned char)*CharS)) != 0))  {
                test = test >> 1;
                n ++;
        }
-       if ((n > 6) || ((CharE - CharS) < n))
+       if ((n > 6) || ((CharE - CharS) < n)) {
                n = 0;
+       }
        return n;
 }
 
@@ -299,7 +298,6 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) {
 }
 
 
-
 void xmpp_xml_end(void *data, const char *supplied_el) {
        char el[256];
        char *sep = NULL;
@@ -392,8 +390,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
                        xmpp_non_sasl_authenticate(
                                XMPP->iq_id,
                                XMPP->iq_client_username,
-                               XMPP->iq_client_password,
-                               XMPP->iq_client_resource
+                               XMPP->iq_client_password
                        );
                }       
 
@@ -407,26 +404,14 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
                ) {
 
                        /* If the client has not specified a client resource, generate one */
-
                        if (IsEmptyStr(XMPP->iq_client_resource)) {
-                               generate_uuid(XMPP->iq_client_resource);
+                               snprintf(XMPP->iq_client_resource, sizeof XMPP->iq_client_resource, "%d", CC->cs_pid);
                        }
 
-                       /* Generate the "full JID" of the client resource */
-
-                       if (IsEmptyStr(CC->cs_inet_email)) {                            // synthetic user@host if no email is set
-                               snprintf(XMPP->client_jid, sizeof XMPP->client_jid,
-                                       "%ld@%s/%s", CC->user.usernum, CtdlGetConfigStr("c_fqdn"), XMPP->iq_client_resource
-                               );
-                       }
-                       else {                                                          // use the email address if we have it
-                               snprintf(XMPP->client_jid, sizeof XMPP->client_jid,
-                                       "%s/%s", CC->cs_inet_email, XMPP->iq_client_resource
-                               );
-                       }
+                       /* Generate the "full JID" of the client (user@host/resource) */
+                       snprintf(XMPP->client_jid, sizeof XMPP->client_jid, "%s/%s", CC->cs_inet_email, XMPP->iq_client_resource);
 
                        /* Tell the client what its JID is */
-
                        cprintf("<iq type=\"result\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
                        cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\">");
                        cprintf("<jid>%s</jid>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));