add initial support for sending a capability hash

src/core/Makefile

@@ -11,6 +11,7 @@ SRCS=	xmpp-commands.c \
 	rosters-tools.c \
 	stanzas.c \
 	tools.c \
+	xep/caps.c \
 	xep/chatstates.c \
 	xep/composing.c \
 	xep/datetime.c \

src/core/module.h

@@ -1,5 +1,5 @@
 #define MODULE_NAME "xmpp/core"
 
-#include "irssi-config.h"
-#include "common.h"
+#include <irssi/irssi-config.h>
+#include <irssi/src/common.h>
 #include "xmpp.h"

src/core/protocol.c

@@ -16,7 +16,7 @@
  */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "rosters-tools.h"

src/core/rosters.c

@@ -19,7 +19,7 @@
 #include <string.h>
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "rosters-tools.h"

src/core/stanzas.c

@@ -16,8 +16,8 @@
  */
 
 #include "module.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "tools.h"

src/core/tools.c

@@ -18,9 +18,9 @@
 #include <string.h>
 
 #include "module.h"
-#include "recode.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #define XMPP_PRIORITY_MIN -128
 #define XMPP_PRIORITY_MAX 127

src/core/xep/caps.c

@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2007,2008,2009 Colin DIDIER
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+ /* XEP-0115:  Entity Capabilities */
+
+#define XMLNS_CAPS "http://jabber.org/protocol/caps"
+
+#include "module.h"
+#include "caps.h"
+#include "disco.h"
+#include "loudmouth/loudmouth.h"
+
+#include <irssi/src/core/signals.h>
+
+static gchar *
+ver_hash(void)
+{
+	GSList *tmp;
+	GChecksum *sum;
+	GString *str = g_string_new(NULL);
+	guint8 *out;
+	gsize len;
+	gchar *hash;
+	g_string_append(str, "client/console//" IRSSI_XMPP_PACKAGE "<");
+	for (tmp = disco_my_features(); tmp != NULL; tmp = tmp->next) {
+		g_string_append(str, tmp->data);
+		g_string_append_c(str, '<');
+	}
+	sum = g_checksum_new(G_CHECKSUM_SHA1);
+	g_checksum_update(sum, str->str, str->len);
+	len = g_checksum_type_get_length(G_CHECKSUM_SHA1);
+	out = g_new0(guint8, len);
+	g_checksum_get_digest(sum, out, &len);
+	hash = g_base64_encode(out, len);
+	g_free(out);
+	g_checksum_free(sum);
+	return hash;
+}
+
+static void
+sig_add_caps(XMPP_SERVER_REC *server, LmMessage *lmsg)
+{
+	gchar *ver;
+	LmMessageNode *c;
+	ver = ver_hash();
+	c = lm_message_node_add_child(lmsg->node, "c", NULL);
+	lm_message_node_set_attribute(c, "xmlns", XMLNS_CAPS);
+	lm_message_node_set_attribute(c, "hash", "sha-1");
+	lm_message_node_set_attribute(c, "node", "https://github.com/cdidier/irssi-xmpp");
+	lm_message_node_set_attribute(c, "ver", ver);
+	g_free(ver);
+}
+
+void
+caps_init(void)
+{
+	disco_add_feature(XMLNS_CAPS);
+	signal_add("xmpp send presence", sig_add_caps);
+}
+
+void
+caps_deinit(void)
+{
+	signal_remove("xmpp send presence", sig_add_caps);
+}

src/core/xep/caps.h

@@ -0,0 +1,9 @@
+#ifndef __CAPS_H
+#define __CAPS_H
+
+__BEGIN_DECLS
+void caps_init(void);
+void caps_deinit(void);
+__END_DECLS
+
+#endif

src/core/xep/chatstates.c

@@ -20,7 +20,7 @@
  */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "disco.h"

src/core/xep/composing.c

@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-queries.h"

src/core/xep/delay.c

@@ -20,7 +20,7 @@
  */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "tools.h"

src/core/xep/disco.c

@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "tools.h"
@@ -38,6 +38,12 @@ disco_add_feature(char *feature)
 	    (GCompareFunc)strcmp);
 }
 
+GSList *
+disco_my_features(void)
+{
+	return my_features;
+}
+
 gboolean
 disco_have_feature(GSList *list, const char *feature)
 {

src/core/xep/disco.h

@@ -3,6 +3,7 @@
 
 __BEGIN_DECLS
 void		disco_add_feature(char *);
+GSList *	disco_my_features(void);
 gboolean	disco_have_feature(GSList *, const char *);
 void		disco_request(XMPP_SERVER_REC *, const char *);
 

src/core/xep/muc-commands.c

@@ -18,9 +18,9 @@
 #include <stdlib.h>
 
 #include "module.h"
-#include "settings.h"
-#include "signals.h"
-#include "window-item-def.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/window-item-def.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-commands.h"

src/core/xep/muc-events.c

@@ -23,10 +23,10 @@
 #include <string.h>
 
 #include "module.h"
-#include "commands.h"
-#include "misc.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "rosters-tools.h"
 #include "tools.h"

src/core/xep/muc-nicklist.c

@@ -18,7 +18,7 @@
 #include <string.h>
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "rosters.h"
 #include "muc-affiliation.h"

src/core/xep/muc-nicklist.h

@@ -1,7 +1,7 @@
 #ifndef __MUC_NICKLIST_H
 #define __MUC_NICKLIST_H
 
-#include "nicklist.h"
+#include <irssi/src/core/nicklist.h>
 #include "muc.h"
 
 /* Returns XMPP_NICK_REC if it's XMPP channel, NULL if it isn't. */
@@ -16,7 +16,7 @@
 
 
 struct _XMPP_NICK_REC {
-	#include "nick-rec.h"
+	#include <irssi/src/core/nick-rec.h>
 
 	int 	 show;
 	char 	*status;

src/core/xep/muc-reconnect.c

@@ -16,8 +16,8 @@
  */
 
 #include "module.h"
-#include "servers-reconnect.h"
-#include "signals.h"
+#include <irssi/src/core/servers-reconnect.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "muc.h"

src/core/xep/muc.c

@@ -22,9 +22,9 @@
 #include <string.h>
 
 #include "module.h"
-#include "commands.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "rosters-tools.h"
 #include "tools.h"

src/core/xep/muc.h

@@ -1,8 +1,8 @@
 #ifndef __MUC_H
 #define __MUC_H
 
-#include "channels.h"
-#include "channels-setup.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/channels-setup.h>
 #include "xmpp-servers.h"
 #include "tools.h"
 
@@ -34,7 +34,7 @@
 
 #define STRUCT_SERVER_REC XMPP_SERVER_REC
 struct _MUC_REC {
-	#include "channel-rec.h"
+	#include <irssi/src/core/channel-rec.h>
 
 	char	*nick;
 };

src/core/xep/oob.c

@@ -20,7 +20,7 @@
  */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "tools.h"

src/core/xep/ping.c

@@ -24,9 +24,9 @@
 #include <time.h>
 
 #include "module.h"
-#include "misc.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-commands.h"

src/core/xep/registration.c

@@ -23,8 +23,8 @@
 #include <string.h>
 
 #include "module.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 #include "tools.h"
 
 #include "xmpp-servers.h"

src/core/xep/vcard.c

@@ -16,8 +16,8 @@
  */
 
 #include "module.h"
-#include "queries.h"
-#include "signals.h"
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-commands.h"

src/core/xep/version.c

@@ -23,9 +23,9 @@
 #include <string.h>
 
 #include "module.h"
-#include "queries.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-commands.h"

src/core/xep/xep.c

@@ -32,6 +32,7 @@ void
 xep_init(void)
 {
 	disco_init(); /* init sevice discovery first */
+	caps_init();
 	chatstates_init();
 	composing_init();
 	delay_init();

src/core/xmpp-commands.c

@@ -18,12 +18,12 @@
 #include <stdlib.h>
 
 #include "module.h"
-#include "channels.h"
-#include "nicklist.h"
-#include "recode.h"
-#include "settings.h"
-#include "signals.h"
-#include "window-item-def.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/window-item-def.h>
 
 #include "xmpp-commands.h"
 #include "xmpp-queries.h"

src/core/xmpp-commands.h

@@ -1,7 +1,7 @@
 #ifndef __XMPP_COMMANDS_H
 #define __XMPP_COMMANDS_H
 
-#include "commands.h"
+#include <irssi/src/core/commands.h>
 
 enum {
 	XMPP_COMMAND_AWAY,