/*
- * $Id$
- *
* Handle <iq> <get> <query> type situations (namespace queries)
*
* Copyright (c) 2007-2009 by Art Cancro
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
+ *
+ *
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *
+ *
*/
#include "sysdep.h"
/*
* Output a single roster item, for roster queries or pushes
*/
-void xmpp_roster_item(struct CitContext *cptr) {
- cprintf("<item jid=\"%s\" name=\"%s\" subscription=\"both\">",
- cptr->cs_inet_email,
- cptr->user.fullname
- );
- cprintf("<group>%s</group>", config.c_humannode);
- 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>");
}
/*
{
struct CitContext *cptr;
int nContexts, i;
- int aide = (CC->user.axlevel >= AxAideU);
-
- cprintf("<query xmlns=\"jabber:iq:roster\">");
+ XPUT("<query xmlns=\"jabber:iq:roster\">");
cptr = CtdlGetContextArray(&nContexts);
if (cptr) {
for (i=0; i<nContexts; i++) {
- if (cptr[i].logged_in) {
- if (
- (((cptr[i].cs_flags&CS_STEALTH)==0) || (aide))
- && (cptr[i].user.usernum != CC->user.usernum)
- ) {
- xmpp_roster_item(&cptr[i]);
- }
+ if (xmpp_is_visible(&cptr[i], CC)) {
+ XMPP_syslog(LOG_DEBUG, "Rosterizing %s\n", cptr[i].user.fullname);
+ xmpp_roster_item(&cptr[i]);
}
}
free (cptr);
}
- cprintf("</query>");
+ XPUT("</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;
+ 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.
supported_namespace = 1;
}
- CtdlLogPrintf(CTDL_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\" ", iq_from);
+ TypeStr = Type[1].Key;
+ TLen = Type[1].len;
}
- cprintf("id=\"%s\">", iq_id);
+
+ 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?
*/
if (!strcasecmp(query_xmlns, "jabber:iq:roster:query")) {
+ roster_query = 1;
xmpp_iq_roster_query();
}
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>"
);
}
*/
else {
- CtdlLogPrintf(CTDL_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
+ * stanza; this will be an unsolicited push.)
+ */
+ if (roster_query) {
+ xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster();
+ }
}
projects / citadel.git / blobdiff