*/
void xmpp_roster_item(struct CitContext *cptr)
{
+ struct CitContext *CCC=CC;
- 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>");
+ XPrint(HKEY("item"), 0,
+ XCPROPERTY("subscription", "both"),
+ XPROPERTY("jid", cptr->cs_inet_email, strlen(cptr->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>");
}
/*
*
*/
-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;
-
+ static const 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;
}
- XMPP_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", ChrPtr(IQ->id), ChrPtr(IQ->from), ChrPtr(IQ->to), query_xmlns);
/*
* Beginning of query result.
*/
if (supported_namespace) {
- XPUT("<iq type=\"result\" ");
+ XPrint(HKEY("iq"), 0,
+ XPROPERTY("type", Type[0].Key, Type[0].len),
+ XSPROPERTY("to", IQ->from),
+ XSPROPERTY("id", IQ->id),
+ TYPE_ARGEND);
}
else {
- XPUT("<iq type=\"error\" ");
- }
- if (!IsEmptyStr(iq_from)) {
- XPUT("to=\"");
- XPutProp(iq_from, strlen(iq_from));
- XPUT("\" ");
+ XPrint(HKEY("iq"), 0,
+ XPROPERTY("type", Type[1].Key, Type[1].len),
+ XSPROPERTY("id", IQ->id),
+ TYPE_ARGEND);
}
- XPUT("id=\"");
- XPutProp(iq_id, strlen(iq_id));
- XPUT("\">");
/*
* Is this a query we know how to handle?