X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fjabber%2Fserv_xmpp.c;h=fe7178db32fe32f813a61f5a15d9eba0da5f2ae5;hb=8c47559cb5ae97ec0fa35660ee16fd61a9451c72;hp=6fa8a66b9172ee5105979dd8aa045d043c6a47b8;hpb=a4a539f7b5c10763dff969efa26ec49349c0363f;p=citadel.git

diff --git a/citadel/modules/jabber/serv_xmpp.c b/citadel/modules/jabber/serv_xmpp.c
index 6fa8a66b9..fe7178db3 100644
--- a/citadel/modules/jabber/serv_xmpp.c
+++ b/citadel/modules/jabber/serv_xmpp.c
@@ -2,9 +2,21 @@
  * $Id$ 
  *
  * XMPP (Jabber) service for the Citadel system
- * Copyright (c) 2007 by Art Cancro
- * This code is released under the terms of the GNU General Public License.
+ * 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 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"
@@ -33,6 +45,7 @@
 #include <limits.h>
 #include <ctype.h>
 #include <libcitadel.h>
+#include <expat.h>
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
@@ -46,9 +59,6 @@
 #include "internet_addressing.h"
 #include "md5.h"
 #include "ctdl_module.h"
-
-#ifdef HAVE_EXPAT
-#include <expat.h>
 #include "serv_xmpp.h"
 
 struct xmpp_event *xmpp_queue = NULL;
@@ -57,8 +67,6 @@ struct xmpp_event *xmpp_queue = NULL;
 
 void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
 {
-	lprintf(CTDL_DEBUG, "New XMPP stream.\n");
-
 	while (*attr) {
 		if (!strcasecmp(attr[0], "to")) {
 			safestrncpy(XMPP->server_name, attr[1], sizeof XMPP->server_name);
@@ -114,11 +122,12 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) {
 		strcpy(el, ++sep);
 	}
 
-	lprintf(CTDL_DEBUG, "XMPP ELEMENT START: <%s>\n", el);
-
+	/*
+	CtdlLogPrintf(CTDL_DEBUG, "XMPP ELEMENT START: <%s>\n", el);
 	for (i=0; attr[i] != NULL; i+=2) {
-		lprintf(CTDL_DEBUG, "                    Attribute '%s' = '%s'\n", attr[i], attr[i+1]);
+		CtdlLogPrintf(CTDL_DEBUG, "                    Attribute '%s' = '%s'\n", attr[i], attr[i+1]);
 	}
+	uncomment for more verbosity */
 
 	if (!strcasecmp(el, "stream")) {
 		xmpp_stream_start(data, supplied_el, attr);
@@ -184,10 +193,12 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
 		strcpy(el, ++sep);
 	}
 
-	lprintf(CTDL_DEBUG, "XMPP ELEMENT END  : <%s>\n", el);
+	/*
+	CtdlLogPrintf(CTDL_DEBUG, "XMPP ELEMENT END  : <%s>\n", el);
 	if (XMPP->chardata_len > 0) {
-		lprintf(CTDL_DEBUG, "          chardata: %s\n", XMPP->chardata);
+		CtdlLogPrintf(CTDL_DEBUG, "          chardata: %s\n", XMPP->chardata);
 	}
+	uncomment for more verbosity */
 
 	if (!strcasecmp(el, "resource")) {
 		if (XMPP->chardata_len > 0) {
@@ -386,7 +397,6 @@ void xmpp_cleanup_function(void) {
 	/* Don't do this stuff if this is not a XMPP session! */
 	if (CC->h_command_function != xmpp_command_loop) return;
 
-	lprintf(CTDL_DEBUG, "Performing XMPP cleanup hook\n");
 	if (XMPP->chardata != NULL) {
 		free(XMPP->chardata);
 		XMPP->chardata = NULL;
@@ -415,7 +425,7 @@ void xmpp_greeting(void) {
 
 	XMPP->xp = XML_ParserCreateNS("UTF-8", ':');
 	if (XMPP->xp == NULL) {
-		lprintf(CTDL_ALERT, "Cannot create XML parser!\n");
+		CtdlLogPrintf(CTDL_ALERT, "Cannot create XML parser!\n");
 		CC->kill_me = 1;
 		return;
 	}
@@ -423,6 +433,8 @@ void xmpp_greeting(void) {
 	XML_SetElementHandler(XMPP->xp, xmpp_xml_start, xmpp_xml_end);
 	XML_SetCharacterDataHandler(XMPP->xp, xmpp_xml_chardata);
 	// XML_SetUserData(XMPP->xp, something...);
+
+	CC->can_receive_im = 1;		/* This protocol is capable of receiving instant messages */
 }
 
 
@@ -437,7 +449,7 @@ void xmpp_command_loop(void) {
 	memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
 	retval = client_read(cmdbuf, 1);
 	if (retval != 1) {
-		lprintf(CTDL_ERR, "Client disconnected: ending session.\r\n");
+		CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\r\n");
 		CC->kill_me = 1;
 		return;
 	}
@@ -475,12 +487,9 @@ void xmpp_logout_hook(void) {
 
 const char *CitadelServiceXMPP="XMPP";
 
-#endif	/* HAVE_EXPAT */
-
 CTDL_MODULE_INIT(jabber)
 {
 	if (!threading) {
-#ifdef HAVE_EXPAT
 		CtdlRegisterServiceHook(config.c_xmpp_c2s_port,
 					NULL,
 					xmpp_greeting,
@@ -492,9 +501,6 @@ CTDL_MODULE_INIT(jabber)
                 CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT);
                 CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH);
                 CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH);
-	#else
-		lprintf(CTDL_INFO, "This server is missing the Expat XML parser.  Jabber service will be disabled.\n");
-#endif
 	}
 
 	/* return our Subversion id for the Log */