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

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index 161d306d3..e791f3e6b 100644
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -59,16 +59,18 @@
 /*
  * 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)
+{
+
+	XPUT("<item subscription=\"both\" jid=\"");
+	XPutProp(cptr->cs_inet_email, strlen(cptr->cs_inet_email));
+	XPUT("\" name=\"");
+	XPutProp(cptr->user.fullname, strlen(cptr->user.fullname));
+	XPUT("\">"
+	     "<group>");
+	XPutBody(CFG_KEY(c_humannode));
+	XPUT("</group>"
+	     "</item>");
 }
 
 /* 
@@ -83,18 +85,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>");
 }
 
 
@@ -111,7 +113,6 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 {
 	int supported_namespace = 0;
 	int roster_query = 0;
-	char xmlbuf[256];
 
 	/* 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
@@ -124,21 +125,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", iq_id, iq_from, iq_to, query_xmlns);
 
 	/*
 	 * Beginning of query result.
 	 */
 	if (supported_namespace) {
-		cprintf("<iq type=\"result\" ");
+		XPUT("<iq type=\"result\" ");
 	}
 	else {
-		cprintf("<iq type=\"error\" ");
+		 XPUT("<iq type=\"error\" ");
 	}
 	if (!IsEmptyStr(iq_from)) {
-		cprintf("to=\"%s\" ", xmlesc(xmlbuf, iq_from, sizeof xmlbuf));
+		XPUT("to=\"");
+		XPutProp(iq_from, strlen(iq_from));
+		XPUT("\" ");
 	}
-	cprintf("id=\"%s\">", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));
+	XPUT("id=\"");
+	XPutProp(iq_id, strlen(iq_id));
+	XPUT("\">");
 
 	/*
 	 * Is this a query we know how to handle?
@@ -150,9 +155,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 +167,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