Define an XMPP queue...

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

diff --git a/citadel/modules/jabber/xmpp_query_namespace.c b/citadel/modules/jabber/xmpp_query_namespace.c
index bb5a5ab41bbfe4dd15fec60d2a527fcdce5173a1..5cca906393f3b0b0c1827462e54cc37c99c39d55 100644 (file)
--- a/citadel/modules/jabber/xmpp_query_namespace.c
+++ b/citadel/modules/jabber/xmpp_query_namespace.c
@@ -1,5 +1,5 @@
 /*
- * $Id:  $ 
+ * $Id$ 
  *
  * Handle <iq> <get> <query> type situations (namespace queries)
  *
@@ -47,24 +47,80 @@
 #include <expat.h>
 #include "serv_xmpp.h"
 
+
 /*
- * TODO: handle queries on some or all of these namespaces
+ * Output a single roster item, for roster queries or pushes
+ */
+void jabber_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>");
+}
+
+/* 
+ * Return the results for a "jabber:iq:roster:query"
+ *
+ * Since we are not yet managing a roster, we simply return the entire wholist
+ * (minus any entries for this user -- don't tell me about myself)
+ *
+ */
+void jabber_iq_roster_query(void)
+{
+       struct CitContext *cptr;
+       int aide = (CC->user.axlevel >= 6);
+
+       cprintf("<query xmlns=\"jabber:iq:roster\">");
+
+       for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
+
+               if (
+                  (((cptr->cs_flags&CS_STEALTH)==0) || (aide))
+                  && (cptr->user.usernum != CC->user.usernum)
+                  ) {
+                       jabber_roster_item(cptr);
+               }
+       }
+
+       cprintf("</query>");
+}
+
 
+/*
+ * TODO: handle queries on some or all of these namespaces
+ *
 xmpp_query_namespace(purple5b5c1e58, splorph.xand.com, http://jabber.org/protocol/disco#items:query)
 xmpp_query_namespace(purple5b5c1e59, splorph.xand.com, http://jabber.org/protocol/disco#info:query)
 xmpp_query_namespace(purple5b5c1e5a, , vcard-temp:query)
-xmpp_query_namespace(purple5b5c1e5b, , jabber:iq:roster:query)
- 
+ *
  */
 
-void xmpp_query_namespace(char *iq_id, char *iq_to, char *query_xmlns) {
+void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_xmlns) {
 
-       lprintf(CTDL_DEBUG, "\e[31mxmpp_query_namespace(%s, %s, %s)\e[0m\n", iq_id, iq_to, query_xmlns);
+       lprintf(CTDL_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", iq_id, iq_from, iq_to, query_xmlns);
+
+       /*
+        * Beginning of query result.
+        */
+       cprintf("<iq type=\"result\" ");
+       if (!IsEmptyStr(iq_from)) {
+               cprintf("to=\"%s\" ", iq_from);
+       }
+       cprintf("id=\"%s\">", iq_id);
+
+       /*
+        * Is this a query we know how to handle?
+        */
+       if (!strcasecmp(query_xmlns, "jabber:iq:roster:query")) {
+               jabber_iq_roster_query();
+       }
 
        /*
-        * Unknown query.  Return the XML equivalent of a blank stare (empty result)
+        * End of query result.  If we didn't hit any known namespaces then we will
+        * have simply delivered an empty result stanza, which should be ok.
         */
-       cprintf("<iq type=\"result\" id=\"%s\">", iq_id);
        cprintf("</iq>");
 
 }