X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;fp=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=0da671c5f3aa9692236cc405d1b068b17f01427d;hp=e791f3e6bcac09305038cb502165288ee9976b4a;hb=bb47b9c23a29dee2a8d801655a237ec50078b348;hpb=57231d9bfac327b0754787f097be79bc83cf24c6
diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index e791f3e6b..0da671c5f 100644
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -61,16 +61,19 @@
*/
void xmpp_roster_item(struct CitContext *cptr)
{
+ struct CitContext *CCC=CC;
- XPUT("- cs_inet_email, strlen(cptr->cs_inet_email));
- XPUT("\" name=\"");
- XPutProp(cptr->user.fullname, strlen(cptr->user.fullname));
- XPUT("\">"
- "");
- XPutBody(CFG_KEY(c_humannode));
- XPUT(""
- "
");
+ 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("");
}
/*
@@ -113,7 +116,13 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
{
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.
@@ -131,19 +140,18 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
* Beginning of query result.
*/
if (supported_namespace) {
- XPUT("");
+
+ XPrint(HKEY("iq"), 0,
+ XPROPERTY("type", TypeStr, TLen),
+ XOPROPERTY("to", iq_from, strlen(iq_from)),
+ XPROPERTY("id", iq_id, strlen(iq_id)));
/*
* Is this a query we know how to handle?