/*
* Handle <iq> <get> <query> type situations (namespace queries)
*
- * Copyright (c) 2007-2009 by Art Cancro
+ * Copyright (c) 2007-2015 by Art Cancro and citadel.org
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
struct CitContext *cptr;
int nContexts, i;
+ syslog(LOG_DEBUG, "Roster push!");
cprintf("<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]);
}
}
* Client is doing a namespace query. These are all handled differently.
* A "rumplestiltskin lookup" is the most efficient way to handle this. Please do not refactor this code.
*/
-<<<<<<< HEAD
-=======
-
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_xmlns)
{
int supported_namespace = 0;
supported_namespace = 1;
}
-<<<<<<< HEAD
- syslog(LOG_DEBUG, "xmpp_query_namespace(id=%s, from=%s, to=%s, xmlns=%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);
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
+ XMPP_syslog(LOG_DEBUG, "xmpp_query_namespace(id=%s, from=%s, to=%s, xmlns=%s)\n", iq_id, iq_from, iq_to, query_xmlns);
/*
* Beginning of query result.
*/
if (supported_namespace) {
- cprintf("<iq type=\"result\" ");
+ cprintf("<iq type=\"result\" from=\"%s\" ", xmlesc(xmlbuf, XMPP->server_name, sizeof xmlbuf) );
}
else {
- cprintf("<iq type=\"error\" ");
-<<<<<<< HEAD
- }
- if (!IsEmptyStr(iq_from)) {
- cprintf("to=\"%s\" ", xmlesc(xmlbuf, iq_from, sizeof xmlbuf));
- }
-=======
+ cprintf("<iq type=\"error\" from=\"%s\" ", xmlesc(xmlbuf, XMPP->server_name, sizeof xmlbuf) );
}
if (!IsEmptyStr(iq_from)) {
cprintf("to=\"%s\" ", xmlesc(xmlbuf, iq_from, sizeof xmlbuf));
}
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
cprintf("id=\"%s\">", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));
/*
*/
else {
-<<<<<<< HEAD
- 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
- );
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
+ 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>"