Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

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

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index cf6f423a56516cd392ce78ae9c79f93d486ff2f5..e7fcc0c8a98bba7a336e646ec46fc17a8005bbb2 100644 (file)
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -59,16 +59,21 @@
 /*
  * Output a single roster item, for roster queries or pushes
  */
-void xmpp_roster_item(struct CitContext *cptr) {
-       char xmlbuf1[256];
-       char xmlbuf2[256];
-
-       cprintf("<item jid=\"%s\" name=\"%s\" subscription=\"both\">",
-               xmlesc(xmlbuf1, cptr->cs_inet_email, sizeof xmlbuf1),
-               xmlesc(xmlbuf2, cptr->user.fullname, sizeof xmlbuf2)
-       );
-       cprintf("<group>%s</group>", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1));
-       cprintf("</item>");
+void xmpp_roster_item(struct CitContext *cptr)
+{
+       struct CitContext *CCC=CC;
+
+       XPrint(HKEY("item"), 0,
+              XCPROPERTY("subscription", "both"),
+              XPROPERTY("jid",  CCC->cs_inet_email, strlen(CCC->cs_inet_email)),
+              XPROPERTY("name", cptr->user.fullname, strlen(cptr->user.fullname)),
+              TYPE_ARGEND);
+
+       XPrint(HKEY("group"), XCLOSED,
+              XCFGBODY(c_humannode),
+              TYPE_ARGEND);
+
+       XPUT("</item>");
 }
 
 /* 
@@ -83,7 +88,7 @@ void xmpp_iq_roster_query(void)
        struct CitContext *cptr;
        int nContexts, i;
 
-       cprintf("<query xmlns=\"jabber:iq:roster\">");
+       XPUT("<query xmlns=\"jabber:iq:roster\">");
        cptr = CtdlGetContextArray(&nContexts);
        if (cptr) {
                for (i=0; i<nContexts; i++) {
@@ -94,7 +99,7 @@ void xmpp_iq_roster_query(void)
                }
                free (cptr);
        }
-       cprintf("</query>");
+       XPUT("</query>");
 }
 
 
@@ -107,12 +112,17 @@ xmpp_query_namespace(purple5b5c1e5a, , vcard-temp:query)
  *
  */
 
-void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_xmlns)
+void xmpp_query_namespace(TheToken_iq *IQ/*char *iq_id, char *iq_from, char *iq_to*/, char *query_xmlns)
 {
        int supported_namespace = 0;
        int roster_query = 0;
-       char xmlbuf[256];
-
+       const char *TypeStr;
+       long TLen;
+       ConstStr Type[] = {
+               {HKEY("result")},
+               {HKEY("error")}
+       };
+       
        /* We need to know before we begin the response whether this is a supported namespace, so
         * unfortunately all supported namespaces need to be defined here *and* down below where
         * they are handled.
@@ -124,21 +134,25 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
                supported_namespace = 1;
        }
 
-       XMPP_syslog(LOG_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", iq_id, iq_from, iq_to, query_xmlns);
+       XMPP_syslog(LOG_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", ChrPtr(IQ->id), ChrPtr(IQ->from), ChrPtr(IQ->to), query_xmlns);
 
        /*
         * Beginning of query result.
         */
        if (supported_namespace) {
-               cprintf("<iq type=\"result\" ");
+               TypeStr = Type[0].Key;
+               TLen    = Type[0].len;
        }
        else {
-               cprintf("<iq type=\"error\" ");
-       }
-       if (!IsEmptyStr(iq_from)) {
-               cprintf("to=\"%s\" ", xmlesc(xmlbuf, iq_from, sizeof xmlbuf));
+               TypeStr = Type[1].Key;
+               TLen    = Type[1].len;
        }
-       cprintf("id=\"%s\">", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));
+
+       XPrint(HKEY("iq"), 0,
+              XPROPERTY("type", TypeStr, TLen),
+              XSPROPERTY("to",  IQ->from),
+              XSPROPERTY("id",   IQ->id),
+              TYPE_ARGEND);
 
        /*
         * Is this a query we know how to handle?
@@ -150,9 +164,9 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
        }
 
        else if (!strcasecmp(query_xmlns, "jabber:iq:auth:query")) {
-               cprintf("<query xmlns=\"jabber:iq:auth\">"
-                       "<username/><password/><resource/>"
-                       "</query>"
+               XPUT("<query xmlns=\"jabber:iq:auth\">"
+                    "<username/><password/><resource/>"
+                    "</query>"
                );
        }
 
@@ -166,13 +180,13 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
                            "Unknown query namespace '%s' - returning <service-unavailable/>\n",
                            query_xmlns
                );
-               cprintf("<error code=\"503\" type=\"cancel\">"
-                       "<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
-                       "</error>"
+               XPUT("<error code=\"503\" type=\"cancel\">"
+                    "<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
+                    "</error>"
                );
        }
 
-       cprintf("</iq>");
+       XPUT("</iq>");
 
        /* If we told the client who is on the roster, we also need to tell the client
         * who is *not* on the roster.  (It's down here because we can't do it in the same