X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=e7fcc0c8a98bba7a336e646ec46fc17a8005bbb2;hb=b10ebd5b1e010488870853620a35d704a3e36f82;hp=161d306d39ac97b95b26f9ce14b4f05de0e5d630;hpb=d04e4ad0b8ab9e5b71310030704d61b6eceb530b;p=citadel.git

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index 161d306d3..e7fcc0c8a 100644
--- 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,18 +88,18 @@ 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++) {
 			if (xmpp_is_visible(&cptr[i], CC)) {
-				syslog(LOG_DEBUG, "Rosterizing %s\n", cptr[i].user.fullname);
+				XMPP_syslog(LOG_DEBUG, "Rosterizing %s\n", cptr[i].user.fullname);
 				xmpp_roster_item(&cptr[i]);
 			}
 		}
 		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;
 	}
 
-	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>"
 		);
 	}
 
@@ -162,17 +176,17 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 	 */
 
 	else {
-		syslog(LOG_DEBUG,
-			"Unknown query namespace '%s' - returning <service-unavailable/>\n",
-			query_xmlns
+		XMPP_syslog(LOG_DEBUG,
+			    "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