From 8904d5e7123ba2f4588f48deed392b1a2d9faa39 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Thu, 28 Nov 2013 22:53:57 +0100 Subject: [PATCH] XMPP: continue work on message body --- citadel/modules/xmpp/serv_xmpp.c | 6 +++--- citadel/modules/xmpp/serv_xmpp.h | 1 + citadel/modules/xmpp/xmpp_xmacros.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c index 63b27c513..ea58e3b62 100644 --- a/citadel/modules/xmpp/serv_xmpp.c +++ b/citadel/modules/xmpp/serv_xmpp.c @@ -282,7 +282,7 @@ void xmpp_start_auth(void *data, const char *supplied_el, const char **attr) } } } - +/* void xmpp_start_message(void *data, const char *supplied_el, const char **attr) { int i; @@ -293,7 +293,7 @@ void xmpp_start_message(void *data, const char *supplied_el, const char **attr) } } } - +*/ void xmpp_start_html(void *data, const char *supplied_el, const char **attr) { ++XMPP->html_tag_level; @@ -931,7 +931,7 @@ CTDL_MODULE_INIT(xmpp) AddXMPPStartHandler(HKEY("query"), xmpp_start_query, 0); AddXMPPStartHandler(HKEY("bind"), xmpp_start_bind, 0); AddXMPPStartHandler(HKEY("auth"), xmpp_start_auth, 0); - AddXMPPStartHandler(HKEY("message"), xmpp_start_message, 0); +/// AddXMPPStartHandler(HKEY("message"), xmpp_start_message, 0); AddXMPPStartHandler(HKEY("html"), xmpp_start_html, 0); diff --git a/citadel/modules/xmpp/serv_xmpp.h b/citadel/modules/xmpp/serv_xmpp.h index ba19e7af2..97264ff30 100644 --- a/citadel/modules/xmpp/serv_xmpp.h +++ b/citadel/modules/xmpp/serv_xmpp.h @@ -31,6 +31,7 @@ typedef struct _citxmpp { /* Information about the current session */ int last_event_processed; TheToken_iq IQ; + TheToken_message Message; char iq_client_username[256]; /* username requested by the client (NON SASL ONLY) */ char iq_client_password[256]; /* password requested by the client (NON SASL ONLY) */ diff --git a/citadel/modules/xmpp/xmpp_xmacros.c b/citadel/modules/xmpp/xmpp_xmacros.c index 3ef9f3161..b7f5e672e 100644 --- a/citadel/modules/xmpp/xmpp_xmacros.c +++ b/citadel/modules/xmpp/xmpp_xmacros.c @@ -15,7 +15,7 @@ void *GetToken_piq(void) void *GetToken_message(void) { - return NULL; + return &XMPP->Message; } -- 2.30.2