Mercurial > pidgin
annotate libpurple/protocols/jabber/caps.c @ 26446:882748e27f9d
propagate from branch 'im.pidgin.pidgin' (head 58b2ba106e563fcd0984b9438aa427f1d61e25e9)
to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh' (head 66b3abfbbc6c37e976677819dd23987db9d3b083)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 04 Apr 2009 03:15:59 +0000 |
parents | e23a74d7c97c c4fd9222dda1 |
children | 20743d9bd62d |
rev | line source |
---|---|
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
1 /* |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
2 * purple - Jabber Protocol Plugin |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
3 * |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
4 * Copyright (C) 2007, Andreas Monitzer <andy@monitzer.com> |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
5 * |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
6 * This program is free software; you can redistribute it and/or modify |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
7 * it under the terms of the GNU General Public License as published by |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
8 * the Free Software Foundation; either version 2 of the License, or |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
9 * (at your option) any later version. |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
10 * |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
11 * This program is distributed in the hope that it will be useful, |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
14 * GNU General Public License for more details. |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
15 * |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
16 * You should have received a copy of the GNU General Public License |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
17 * along with this program; if not, write to the Free Software |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
19 * |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
20 */ |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
21 |
19698
d32ed28cf645
Fix mingw build of xmpp prpl
Daniel Atallah <daniel.atallah@gmail.com>
parents:
17902
diff
changeset
|
22 #include "internal.h" |
d32ed28cf645
Fix mingw build of xmpp prpl
Daniel Atallah <daniel.atallah@gmail.com>
parents:
17902
diff
changeset
|
23 |
25158
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
24 #include "debug.h" |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
25 #include "caps.h" |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
26 #include "cipher.h" |
25145
1225f3dcf5ab
Fix compilation errors and many warnings
Paul Aurich <paul@darkrain42.org>
parents:
25144
diff
changeset
|
27 #include "iq.h" |
1225f3dcf5ab
Fix compilation errors and many warnings
Paul Aurich <paul@darkrain42.org>
parents:
25144
diff
changeset
|
28 #include "presence.h" |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
29 #include "util.h" |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
30 |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
31 #define JABBER_CAPS_FILENAME "xmpp-caps.xml" |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
32 |
25162
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
33 typedef struct _JabberDataFormField { |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
34 gchar *var; |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
35 GList *values; |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
36 } JabberDataFormField; |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
37 |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
38 typedef struct _JabberCapsKey { |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
39 char *node; |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
40 char *ver; |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
41 char *hash; |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
42 } JabberCapsKey; |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
43 |
25166
18fdbe507fdd
Make capstable caps.c-only and add a jabber_caps_uninit() function
Paul Aurich <paul@darkrain42.org>
parents:
25165
diff
changeset
|
44 static GHashTable *capstable = NULL; /* JabberCapsKey -> JabberCapsClientInfo */ |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
45 static GHashTable *nodetable = NULL; /* char *node -> JabberCapsNodeExts */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
46 static guint save_timer = 0; |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
47 |
25162
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
48 /** |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
49 * Processes a query-node and returns a JabberCapsClientInfo object with all relevant info. |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
50 * |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
51 * @param query A query object. |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
52 * @return A JabberCapsClientInfo object. |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
53 */ |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
54 static JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query); |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
55 |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
56 /* Free a GList of allocated char* */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
57 static void |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
58 free_string_glist(GList *list) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
59 { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
60 g_list_foreach(list, (GFunc)g_free, NULL); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
61 g_list_free(list); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
62 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
63 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
64 static JabberCapsNodeExts* |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
65 jabber_caps_node_exts_ref(JabberCapsNodeExts *exts) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
66 { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
67 g_return_val_if_fail(exts != NULL, NULL); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
68 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
69 ++exts->ref; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
70 return exts; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
71 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
72 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
73 static void |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
74 jabber_caps_node_exts_unref(JabberCapsNodeExts *exts) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
75 { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
76 if (exts == NULL) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
77 return; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
78 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
79 g_return_if_fail(exts->ref != 0); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
80 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
81 if (--exts->ref != 0) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
82 return; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
83 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
84 g_hash_table_destroy(exts->exts); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
85 g_free(exts); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
86 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
87 |
25188 | 88 static guint jabber_caps_hash(gconstpointer data) { |
89 const JabberCapsKey *key = data; | |
90 guint nodehash = g_str_hash(key->node); | |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
91 guint verhash = g_str_hash(key->ver); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
92 /* 'hash' was optional in XEP-0115 v1.4 and I think g_str_hash crashes on |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
93 * NULL >:O. Okay, maybe I've played too much Zelda, but that looks like |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
94 * a Deku Shrub... */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
95 guint hashhash = (key->hash ? g_str_hash(key->hash) : 0); |
25027
45816181b7de
* fixing a bug in jabber_caps_compare()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25026
diff
changeset
|
96 return nodehash ^ verhash ^ hashhash; |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
97 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
98 |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
99 static gboolean jabber_caps_compare(gconstpointer v1, gconstpointer v2) { |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
100 const JabberCapsKey *name1 = v1; |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
101 const JabberCapsKey *name2 = v2; |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
102 /* Again, hash might be NULL and I *know* strcmp will crash on NULL. */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
103 gboolean hasheq = ((!name1->hash && !name2->hash) || |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
104 (name1->hash && name2->hash && !strcmp(name1->hash, name2->hash))); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
105 |
25152
8789b9202c06
Use strcmp instead of a wrapper
Paul Aurich <paul@darkrain42.org>
parents:
25150
diff
changeset
|
106 return strcmp(name1->node, name2->node) == 0 && |
8789b9202c06
Use strcmp instead of a wrapper
Paul Aurich <paul@darkrain42.org>
parents:
25150
diff
changeset
|
107 strcmp(name1->ver, name2->ver) == 0 && |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
108 hasheq; |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
109 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
110 |
25188 | 111 void jabber_caps_destroy_key(gpointer data) { |
112 JabberCapsKey *key = data; | |
113 g_free(key->node); | |
114 g_free(key->ver); | |
115 g_free(key->hash); | |
116 g_free(key); | |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
117 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
118 |
25191
5ad14a53e266
Partial disapproval of b8fdbd255c614e7305f835b843a3414675a86a19
Paul Aurich <paul@darkrain42.org>
parents:
25190
diff
changeset
|
119 static void |
5ad14a53e266
Partial disapproval of b8fdbd255c614e7305f835b843a3414675a86a19
Paul Aurich <paul@darkrain42.org>
parents:
25190
diff
changeset
|
120 jabber_caps_client_info_destroy(JabberCapsClientInfo *info) |
25187
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
121 { |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
122 if (info == NULL) |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
123 return; |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
124 |
25161
0ccb80ae7262
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <paul@darkrain42.org>
parents:
25160
diff
changeset
|
125 while(info->identities) { |
0ccb80ae7262
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <paul@darkrain42.org>
parents:
25160
diff
changeset
|
126 JabberIdentity *id = info->identities->data; |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
127 g_free(id->category); |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
128 g_free(id->type); |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
129 g_free(id->name); |
25155
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
130 g_free(id->lang); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
131 g_free(id); |
25161
0ccb80ae7262
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <paul@darkrain42.org>
parents:
25160
diff
changeset
|
132 info->identities = g_list_delete_link(info->identities, info->identities); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
133 } |
25161
0ccb80ae7262
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <paul@darkrain42.org>
parents:
25160
diff
changeset
|
134 |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
135 free_string_glist(info->features); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
136 free_string_glist(info->forms); |
25025
a85f9b85a7fb
* changed storage format for cache to mirror all needed features for XEP-0115v1.5
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25024
diff
changeset
|
137 |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
138 jabber_caps_node_exts_unref(info->exts); |
25161
0ccb80ae7262
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <paul@darkrain42.org>
parents:
25160
diff
changeset
|
139 |
0ccb80ae7262
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <paul@darkrain42.org>
parents:
25160
diff
changeset
|
140 g_free(info); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
141 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
142 |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
143 /* NOTE: Takes a reference to the exts, unref it if you don't really want to |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
144 * keep it around. */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
145 static JabberCapsNodeExts* |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
146 jabber_caps_find_exts_by_node(const char *node) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
147 { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
148 JabberCapsNodeExts *exts; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
149 if (NULL == (exts = g_hash_table_lookup(nodetable, node))) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
150 exts = g_new0(JabberCapsNodeExts, 1); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
151 exts->exts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
152 (GDestroyNotify)free_string_glist); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
153 g_hash_table_insert(nodetable, g_strdup(node), jabber_caps_node_exts_ref(exts)); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
154 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
155 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
156 return jabber_caps_node_exts_ref(exts); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
157 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
158 |
25190
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
159 static void |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
160 exts_to_xmlnode(gconstpointer key, gconstpointer value, gpointer user_data) |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
161 { |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
162 const char *identifier = key; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
163 const GList *features = value, *node; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
164 xmlnode *client = user_data, *ext, *feature; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
165 |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
166 ext = xmlnode_new_child(client, "ext"); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
167 xmlnode_set_attrib(ext, "identifier", identifier); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
168 |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
169 for (node = features; node; node = node->next) { |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
170 feature = xmlnode_new_child(ext, "feature"); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
171 xmlnode_set_attrib(feature, "var", (const gchar *)node->data); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
172 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
173 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
174 |
25190
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
175 static void jabber_caps_store_client(gpointer key, gpointer value, gpointer user_data) { |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
176 JabberCapsKey *clientinfo = key; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
177 JabberCapsClientInfo *props = value; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
178 xmlnode *root = user_data; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
179 xmlnode *client = xmlnode_new_child(root, "client"); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
180 GList *iter; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
181 |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
182 xmlnode_set_attrib(client, "node", clientinfo->node); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
183 xmlnode_set_attrib(client, "ver", clientinfo->ver); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
184 if (clientinfo->hash) |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
185 xmlnode_set_attrib(client, "hash", clientinfo->hash); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
186 for(iter = props->identities; iter; iter = g_list_next(iter)) { |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
187 JabberIdentity *id = iter->data; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
188 xmlnode *identity = xmlnode_new_child(client, "identity"); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
189 xmlnode_set_attrib(identity, "category", id->category); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
190 xmlnode_set_attrib(identity, "type", id->type); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
191 if (id->name) |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
192 xmlnode_set_attrib(identity, "name", id->name); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
193 if (id->lang) |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
194 xmlnode_set_attrib(identity, "lang", id->lang); |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
195 } |
25190
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
196 |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
197 for(iter = props->features; iter; iter = g_list_next(iter)) { |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
198 const char *feat = iter->data; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
199 xmlnode *feature = xmlnode_new_child(client, "feature"); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
200 xmlnode_set_attrib(feature, "var", feat); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
201 } |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
202 |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
203 for(iter = props->forms; iter; iter = g_list_next(iter)) { |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
204 /* FIXME: See #7814 */ |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
205 xmlnode *xdata = iter->data; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
206 xmlnode_insert_child(client, xmlnode_copy(xdata)); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
207 } |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
208 |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
209 /* TODO: Ideally, only save this once-per-node... */ |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
210 if (props->exts) |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
211 g_hash_table_foreach(props->exts->exts, (GHFunc)exts_to_xmlnode, client); |
25166
18fdbe507fdd
Make capstable caps.c-only and add a jabber_caps_uninit() function
Paul Aurich <paul@darkrain42.org>
parents:
25165
diff
changeset
|
212 } |
18fdbe507fdd
Make capstable caps.c-only and add a jabber_caps_uninit() function
Paul Aurich <paul@darkrain42.org>
parents:
25165
diff
changeset
|
213 |
25190
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
214 static gboolean |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
215 do_jabber_caps_store(gpointer data) |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
216 { |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
217 char *str; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
218 int length = 0; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
219 xmlnode *root = xmlnode_new("capabilities"); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
220 g_hash_table_foreach(capstable, jabber_caps_store_client, root); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
221 str = xmlnode_to_formatted_str(root, &length); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
222 xmlnode_free(root); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
223 purple_util_write_data_to_file(JABBER_CAPS_FILENAME, str, length); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
224 g_free(str); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
225 |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
226 save_timer = 0; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
227 return FALSE; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
228 } |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
229 |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
230 static void |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
231 schedule_caps_save(void) |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
232 { |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
233 if (save_timer == 0) |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
234 save_timer = purple_timeout_add_seconds(5, do_jabber_caps_store, NULL); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
235 } |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
236 |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
237 static void |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
238 jabber_caps_load(void) |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
239 { |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
240 xmlnode *capsdata = purple_util_read_xml_from_file(JABBER_CAPS_FILENAME, "XMPP capabilities cache"); |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
241 xmlnode *client; |
19729
d397000d32fc
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19728
diff
changeset
|
242 |
d397000d32fc
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19728
diff
changeset
|
243 if(!capsdata) |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
244 return; |
19729
d397000d32fc
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19728
diff
changeset
|
245 |
d397000d32fc
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19728
diff
changeset
|
246 if (strcmp(capsdata->name, "capabilities") != 0) { |
d397000d32fc
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19728
diff
changeset
|
247 xmlnode_free(capsdata); |
d397000d32fc
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19728
diff
changeset
|
248 return; |
d397000d32fc
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19728
diff
changeset
|
249 } |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
250 |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
251 for(client = capsdata->child; client; client = client->next) { |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
252 if(client->type != XMLNODE_TYPE_TAG) |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
253 continue; |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
254 if(!strcmp(client->name, "client")) { |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
255 JabberCapsKey *key = g_new0(JabberCapsKey, 1); |
25161
0ccb80ae7262
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <paul@darkrain42.org>
parents:
25160
diff
changeset
|
256 JabberCapsClientInfo *value = g_new0(JabberCapsClientInfo, 1); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
257 xmlnode *child; |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
258 JabberCapsNodeExts *exts = NULL; |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
259 key->node = g_strdup(xmlnode_get_attrib(client,"node")); |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
260 key->ver = g_strdup(xmlnode_get_attrib(client,"ver")); |
25025
a85f9b85a7fb
* changed storage format for cache to mirror all needed features for XEP-0115v1.5
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25024
diff
changeset
|
261 key->hash = g_strdup(xmlnode_get_attrib(client,"hash")); |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
262 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
263 /* v1.3 capabilities */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
264 if (key->hash == NULL) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
265 exts = jabber_caps_find_exts_by_node(key->node); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
266 |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
267 for(child = client->child; child; child = child->next) { |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
268 if(child->type != XMLNODE_TYPE_TAG) |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
269 continue; |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
270 if(!strcmp(child->name,"feature")) { |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
271 const char *var = xmlnode_get_attrib(child, "var"); |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
272 if(!var) |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
273 continue; |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
274 value->features = g_list_append(value->features,g_strdup(var)); |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
275 } else if(!strcmp(child->name,"identity")) { |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
276 const char *category = xmlnode_get_attrib(child, "category"); |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
277 const char *type = xmlnode_get_attrib(child, "type"); |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
278 const char *name = xmlnode_get_attrib(child, "name"); |
25155
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
279 const char *lang = xmlnode_get_attrib(child, "lang"); |
25156
c2438ad6e6c1
Error checking and use g_list_foreach
Paul Aurich <paul@darkrain42.org>
parents:
25155
diff
changeset
|
280 JabberIdentity *id; |
c2438ad6e6c1
Error checking and use g_list_foreach
Paul Aurich <paul@darkrain42.org>
parents:
25155
diff
changeset
|
281 |
c2438ad6e6c1
Error checking and use g_list_foreach
Paul Aurich <paul@darkrain42.org>
parents:
25155
diff
changeset
|
282 if (!category || !type) |
c2438ad6e6c1
Error checking and use g_list_foreach
Paul Aurich <paul@darkrain42.org>
parents:
25155
diff
changeset
|
283 continue; |
c2438ad6e6c1
Error checking and use g_list_foreach
Paul Aurich <paul@darkrain42.org>
parents:
25155
diff
changeset
|
284 |
c2438ad6e6c1
Error checking and use g_list_foreach
Paul Aurich <paul@darkrain42.org>
parents:
25155
diff
changeset
|
285 id = g_new0(JabberIdentity, 1); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
286 id->category = g_strdup(category); |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
287 id->type = g_strdup(type); |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
288 id->name = g_strdup(name); |
25155
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
289 id->lang = g_strdup(lang); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
290 |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
291 value->identities = g_list_append(value->identities,id); |
25025
a85f9b85a7fb
* changed storage format for cache to mirror all needed features for XEP-0115v1.5
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25024
diff
changeset
|
292 } else if(!strcmp(child->name,"x")) { |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
293 /* FIXME: See #7814 -- this will cause problems if anyone |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
294 * ever actually specifies forms. In fact, for this to |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
295 * work properly, that bug needs to be fixed in |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
296 * xmlnode_from_str, not the output version... */ |
25025
a85f9b85a7fb
* changed storage format for cache to mirror all needed features for XEP-0115v1.5
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25024
diff
changeset
|
297 value->forms = g_list_append(value->forms, xmlnode_copy(child)); |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
298 } else if (!strcmp(child->name, "ext") && key->hash != NULL) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
299 purple_debug_warning("jabber", "Ignoring exts when reading new-style caps\n"); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
300 } else if (!strcmp(child->name, "ext")) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
301 /* TODO: Do we care about reading in the identities listed here? */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
302 const char *identifier = xmlnode_get_attrib(child, "identifier"); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
303 xmlnode *node; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
304 GList *features = NULL; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
305 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
306 if (!identifier) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
307 continue; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
308 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
309 for (node = child->child; node; node = node->next) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
310 if (node->type != XMLNODE_TYPE_TAG) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
311 continue; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
312 if (!strcmp(node->name, "feature")) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
313 const char *var = xmlnode_get_attrib(node, "var"); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
314 if (!var) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
315 continue; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
316 features = g_list_prepend(features, g_strdup(var)); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
317 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
318 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
319 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
320 if (features) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
321 g_hash_table_insert(exts->exts, g_strdup(identifier), |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
322 features); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
323 } else |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
324 purple_debug_warning("jabber", "Caps ext %s had no features.\n", |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
325 identifier); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
326 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
327 } |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
328 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
329 value->exts = exts; |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
330 g_hash_table_replace(capstable, key, value); |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
331 |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
332 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
333 } |
19729
d397000d32fc
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19728
diff
changeset
|
334 xmlnode_free(capsdata); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
335 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
336 |
25190
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
337 void jabber_caps_init(void) |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
338 { |
25190
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
339 nodetable = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)jabber_caps_node_exts_unref); |
25191
5ad14a53e266
Partial disapproval of b8fdbd255c614e7305f835b843a3414675a86a19
Paul Aurich <paul@darkrain42.org>
parents:
25190
diff
changeset
|
340 capstable = g_hash_table_new_full(jabber_caps_hash, jabber_caps_compare, jabber_caps_destroy_key, (GDestroyNotify)jabber_caps_client_info_destroy); |
25190
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
341 jabber_caps_load(); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
342 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
343 |
25190
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
344 void jabber_caps_uninit(void) |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
345 { |
25190
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
346 if (save_timer != 0) { |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
347 purple_timeout_remove(save_timer); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
348 save_timer = 0; |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
349 do_jabber_caps_store(NULL); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
350 } |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
351 g_hash_table_destroy(capstable); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
352 g_hash_table_destroy(nodetable); |
3bec4f4db198
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <paul@darkrain42.org>
parents:
25189
diff
changeset
|
353 capstable = NULL; |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
354 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
355 |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
356 typedef struct _jabber_caps_cbplususerdata { |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
357 guint ref; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
358 |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
359 jabber_caps_get_info_cb cb; |
25185
5d2e4a3b0c63
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <paul@darkrain42.org>
parents:
25169
diff
changeset
|
360 gpointer cb_data; |
5d2e4a3b0c63
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <paul@darkrain42.org>
parents:
25169
diff
changeset
|
361 |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
362 char *who; |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
363 char *node; |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
364 char *ver; |
25022
4c97156431b4
* pass hash type to the caps handling functions
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25021
diff
changeset
|
365 char *hash; |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
366 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
367 JabberCapsClientInfo *info; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
368 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
369 GList *exts; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
370 guint extOutstanding; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
371 JabberCapsNodeExts *node_exts; |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
372 } jabber_caps_cbplususerdata; |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
373 |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
374 static jabber_caps_cbplususerdata* |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
375 cbplususerdata_ref(jabber_caps_cbplususerdata *data) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
376 { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
377 g_return_val_if_fail(data != NULL, NULL); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
378 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
379 ++data->ref; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
380 return data; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
381 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
382 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
383 static void |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
384 cbplususerdata_unref(jabber_caps_cbplususerdata *data) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
385 { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
386 if (data == NULL) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
387 return; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
388 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
389 g_return_if_fail(data->ref != 0); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
390 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
391 if (--data->ref > 0) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
392 return; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
393 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
394 g_free(data->who); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
395 g_free(data->node); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
396 g_free(data->ver); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
397 g_free(data->hash); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
398 |
25191
5ad14a53e266
Partial disapproval of b8fdbd255c614e7305f835b843a3414675a86a19
Paul Aurich <paul@darkrain42.org>
parents:
25190
diff
changeset
|
399 /* If we have info here, it's already in the capstable, so don't free it */ |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
400 if (data->exts) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
401 free_string_glist(data->exts); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
402 if (data->node_exts) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
403 jabber_caps_node_exts_unref(data->node_exts); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
404 g_free(data); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
405 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
406 |
25158
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
407 static void |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
408 jabber_caps_get_info_complete(jabber_caps_cbplususerdata *userdata) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
409 { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
410 userdata->cb(userdata->info, userdata->exts, userdata->cb_data); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
411 userdata->info = NULL; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
412 userdata->exts = NULL; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
413 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
414 if (userdata->ref != 1) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
415 purple_debug_warning("jabber", "Lost a reference to caps cbdata: %d\n", |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
416 userdata->ref); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
417 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
418 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
419 static void |
25158
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
420 jabber_caps_client_iqcb(JabberStream *js, xmlnode *packet, gpointer data) |
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
421 { |
21595
5f85d0781bee
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21325
diff
changeset
|
422 xmlnode *query = xmlnode_get_child_with_namespace(packet, "query", |
5f85d0781bee
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21325
diff
changeset
|
423 "http://jabber.org/protocol/disco#info"); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
424 jabber_caps_cbplususerdata *userdata = data; |
25185
5d2e4a3b0c63
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <paul@darkrain42.org>
parents:
25169
diff
changeset
|
425 JabberCapsClientInfo *info = NULL, *value; |
25158
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
426 const char *type = xmlnode_get_attrib(packet, "type"); |
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
427 JabberCapsKey key; |
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
428 |
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
429 if (!query || !strcmp(type, "error")) { |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
430 /* Any outstanding exts will be dealt with via ref-counting */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
431 userdata->cb(NULL, NULL, userdata->cb_data); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
432 cbplususerdata_unref(userdata); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
433 return; |
25158
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
434 } |
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
435 |
25157
b6cfc5cc6799
Whitespace cleanup (no functional changes, just unwrap the huge if block and
Paul Aurich <paul@darkrain42.org>
parents:
25156
diff
changeset
|
436 /* check hash */ |
b6cfc5cc6799
Whitespace cleanup (no functional changes, just unwrap the huge if block and
Paul Aurich <paul@darkrain42.org>
parents:
25156
diff
changeset
|
437 info = jabber_caps_parse_client_info(query); |
25145
1225f3dcf5ab
Fix compilation errors and many warnings
Paul Aurich <paul@darkrain42.org>
parents:
25144
diff
changeset
|
438 |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
439 /* Only validate if these are v1.5 capabilities */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
440 if (userdata->hash) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
441 gchar *hash = NULL; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
442 if (!strcmp(userdata->hash, "sha-1")) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
443 hash = jabber_caps_calculate_hash(info, "sha1"); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
444 } else if (!strcmp(userdata->hash, "md5")) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
445 hash = jabber_caps_calculate_hash(info, "md5"); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
446 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
447 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
448 if (!hash || strcmp(hash, userdata->ver)) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
449 purple_debug_warning("jabber", "Could not validate caps info from %s\n", |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
450 xmlnode_get_attrib(packet, "from")); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
451 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
452 userdata->cb(NULL, NULL, userdata->cb_data); |
25191
5ad14a53e266
Partial disapproval of b8fdbd255c614e7305f835b843a3414675a86a19
Paul Aurich <paul@darkrain42.org>
parents:
25190
diff
changeset
|
453 jabber_caps_client_info_destroy(info); |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
454 cbplususerdata_unref(userdata); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
455 g_free(hash); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
456 return; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
457 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
458 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
459 g_free(hash); |
25157
b6cfc5cc6799
Whitespace cleanup (no functional changes, just unwrap the huge if block and
Paul Aurich <paul@darkrain42.org>
parents:
25156
diff
changeset
|
460 } |
21595
5f85d0781bee
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21325
diff
changeset
|
461 |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
462 if (!userdata->hash && userdata->node_exts) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
463 /* If the ClientInfo doesn't have information about the exts, give them |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
464 * ours (along with our ref) */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
465 info->exts = userdata->node_exts; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
466 userdata->node_exts = NULL; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
467 } |
25145
1225f3dcf5ab
Fix compilation errors and many warnings
Paul Aurich <paul@darkrain42.org>
parents:
25144
diff
changeset
|
468 |
25158
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
469 key.node = userdata->node; |
25185
5d2e4a3b0c63
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <paul@darkrain42.org>
parents:
25169
diff
changeset
|
470 key.ver = userdata->ver; |
25158
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
471 key.hash = userdata->hash; |
21595
5f85d0781bee
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21325
diff
changeset
|
472 |
25185
5d2e4a3b0c63
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <paul@darkrain42.org>
parents:
25169
diff
changeset
|
473 /* Use the copy of this data already in the table if it exists or insert |
5d2e4a3b0c63
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <paul@darkrain42.org>
parents:
25169
diff
changeset
|
474 * a new one if we need to */ |
25158
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
475 if ((value = g_hash_table_lookup(capstable, &key))) { |
25191
5ad14a53e266
Partial disapproval of b8fdbd255c614e7305f835b843a3414675a86a19
Paul Aurich <paul@darkrain42.org>
parents:
25190
diff
changeset
|
476 jabber_caps_client_info_destroy(info); |
25158
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
477 info = value; |
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
478 } else { |
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
479 JabberCapsKey *n_key = g_new(JabberCapsKey, 1); |
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
480 n_key->node = userdata->node; |
25185
5d2e4a3b0c63
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <paul@darkrain42.org>
parents:
25169
diff
changeset
|
481 n_key->ver = userdata->ver; |
25158
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
482 n_key->hash = userdata->hash; |
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
483 userdata->node = userdata->ver = userdata->hash = NULL; |
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
484 |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
485 /* The capstable gets a reference */ |
25191
5ad14a53e266
Partial disapproval of b8fdbd255c614e7305f835b843a3414675a86a19
Paul Aurich <paul@darkrain42.org>
parents:
25190
diff
changeset
|
486 g_hash_table_insert(capstable, n_key, info); |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
487 schedule_caps_save(); |
25157
b6cfc5cc6799
Whitespace cleanup (no functional changes, just unwrap the huge if block and
Paul Aurich <paul@darkrain42.org>
parents:
25156
diff
changeset
|
488 } |
21595
5f85d0781bee
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21325
diff
changeset
|
489 |
25191
5ad14a53e266
Partial disapproval of b8fdbd255c614e7305f835b843a3414675a86a19
Paul Aurich <paul@darkrain42.org>
parents:
25190
diff
changeset
|
490 userdata->info = info; |
5ad14a53e266
Partial disapproval of b8fdbd255c614e7305f835b843a3414675a86a19
Paul Aurich <paul@darkrain42.org>
parents:
25190
diff
changeset
|
491 |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
492 if (userdata->extOutstanding == 0) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
493 jabber_caps_get_info_complete(userdata); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
494 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
495 cbplususerdata_unref(userdata); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
496 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
497 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
498 typedef struct { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
499 const char *name; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
500 jabber_caps_cbplususerdata *data; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
501 } ext_iq_data; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
502 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
503 static void |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
504 jabber_caps_ext_iqcb(JabberStream *js, xmlnode *packet, gpointer data) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
505 { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
506 xmlnode *query = xmlnode_get_child_with_namespace(packet, "query", |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
507 "http://jabber.org/protocol/disco#info"); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
508 xmlnode *child; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
509 ext_iq_data *userdata = data; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
510 const char *type = xmlnode_get_attrib(packet, "type"); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
511 GList *features = NULL; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
512 JabberCapsNodeExts *node_exts; |
25158
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
513 |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
514 if (!query || !strcmp(type, "error")) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
515 cbplususerdata_unref(userdata->data); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
516 g_free(userdata); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
517 return; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
518 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
519 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
520 /* So, we decrement this after checking for an error, which means that |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
521 * if there *is* an error, we'll never call the callback passed to |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
522 * jabber_caps_get_info. We will still free all of our data, though. |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
523 */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
524 --userdata->data->extOutstanding; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
525 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
526 for (child = xmlnode_get_child(query, "feature"); child; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
527 child = xmlnode_get_next_twin(child)) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
528 const char *var = xmlnode_get_attrib(child, "var"); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
529 if (var) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
530 features = g_list_prepend(features, g_strdup(var)); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
531 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
532 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
533 node_exts = (userdata->data->info ? userdata->data->info->exts : |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
534 userdata->data->node_exts); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
535 g_hash_table_insert(node_exts->exts, g_strdup(userdata->name), features); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
536 schedule_caps_save(); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
537 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
538 /* Are we done? */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
539 if (userdata->data->info && userdata->data->extOutstanding == 0) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
540 jabber_caps_get_info_complete(userdata->data); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
541 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
542 cbplususerdata_unref(userdata->data); |
25158
ec0c95ae4a65
Clean up jabber_caps_client_iqcb
Paul Aurich <paul@darkrain42.org>
parents:
25157
diff
changeset
|
543 g_free(userdata); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
544 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
545 |
25150 | 546 void jabber_caps_get_info(JabberStream *js, const char *who, const char *node, |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
547 const char *ver, const char *hash, const char *ext, |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
548 jabber_caps_get_info_cb cb, gpointer user_data) |
25150 | 549 { |
25187
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
550 JabberCapsClientInfo *info; |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
551 JabberCapsKey key; |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
552 jabber_caps_cbplususerdata *userdata; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
553 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
554 if (ext && *ext && hash) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
555 purple_debug_warning("jabber", "Ignoring exts in new-style caps from %s\n", |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
556 who); |
25187
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
557 |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
558 /* Using this in a read-only fashion, so the cast is OK */ |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
559 key.node = (char *)node; |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
560 key.ver = (char *)ver; |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
561 key.hash = (char *)hash; |
19698
d32ed28cf645
Fix mingw build of xmpp prpl
Daniel Atallah <daniel.atallah@gmail.com>
parents:
17902
diff
changeset
|
562 |
25187
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
563 info = g_hash_table_lookup(capstable, &key); |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
564 if (info && hash) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
565 /* v1.5 - We already have all the information we care about */ |
25191
5ad14a53e266
Partial disapproval of b8fdbd255c614e7305f835b843a3414675a86a19
Paul Aurich <paul@darkrain42.org>
parents:
25190
diff
changeset
|
566 cb(info, NULL, user_data); |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
567 return; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
568 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
569 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
570 userdata = g_new0(jabber_caps_cbplususerdata, 1); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
571 /* This ref is given to fetching the basic node#ver info if we need it |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
572 * or unrefed at the bottom of this function */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
573 cbplususerdata_ref(userdata); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
574 userdata->cb = cb; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
575 userdata->cb_data = user_data; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
576 userdata->who = g_strdup(who); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
577 userdata->node = g_strdup(node); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
578 userdata->ver = g_strdup(ver); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
579 userdata->hash = g_strdup(hash); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
580 |
25187
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
581 if (info) { |
25191
5ad14a53e266
Partial disapproval of b8fdbd255c614e7305f835b843a3414675a86a19
Paul Aurich <paul@darkrain42.org>
parents:
25190
diff
changeset
|
582 userdata->info = info; |
25187
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
583 } else { |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
584 /* If we don't have the basic information about the client, we need |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
585 * to fetch it. */ |
25187
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
586 JabberIq *iq; |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
587 xmlnode *query; |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
588 char *nodever; |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
589 |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
590 iq = jabber_iq_new_query(js, JABBER_IQ_GET, |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
591 "http://jabber.org/protocol/disco#info"); |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
592 query = xmlnode_get_child_with_namespace(iq->node, "query", |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
593 "http://jabber.org/protocol/disco#info"); |
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
594 nodever = g_strdup_printf("%s#%s", node, ver); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
595 xmlnode_set_attrib(query, "node", nodever); |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
596 g_free(nodever); |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
597 xmlnode_set_attrib(iq->node, "to", who); |
19729
d397000d32fc
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19728
diff
changeset
|
598 |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
599 jabber_iq_set_callback(iq, jabber_caps_client_iqcb, userdata); |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
600 jabber_iq_send(iq); |
25026
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
601 } |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
602 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
603 /* Are there any exts that we don't recognize? */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
604 if (ext && *ext && !hash) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
605 JabberCapsNodeExts *node_exts; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
606 gchar **splat = g_strsplit(ext, " ", 0); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
607 int i; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
608 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
609 if (info) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
610 if (info->exts) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
611 node_exts = info->exts; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
612 else |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
613 node_exts = info->exts = jabber_caps_find_exts_by_node(node); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
614 } else |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
615 /* We'll put it in later once we have the client info */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
616 node_exts = userdata->node_exts = jabber_caps_find_exts_by_node(node); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
617 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
618 for (i = 0; splat[i]; ++i) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
619 userdata->exts = g_list_prepend(userdata->exts, splat[i]); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
620 /* Look it up if we don't already know what it means */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
621 if (!g_hash_table_lookup(node_exts->exts, splat[i])) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
622 JabberIq *iq; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
623 xmlnode *query; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
624 char *nodeext; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
625 ext_iq_data *cbdata = g_new(ext_iq_data, 1); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
626 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
627 cbdata->name = splat[i]; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
628 cbdata->data = cbplususerdata_ref(userdata); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
629 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
630 iq = jabber_iq_new_query(js, JABBER_IQ_GET, |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
631 "http://jabber.org/protocol/disco#info"); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
632 query = xmlnode_get_child_with_namespace(iq->node, "query", |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
633 "http://jabber.org/protocol/disco#info"); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
634 nodeext = g_strdup_printf("%s#%s", node, splat[i]); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
635 xmlnode_set_attrib(query, "node", nodeext); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
636 g_free(nodeext); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
637 xmlnode_set_attrib(iq->node, "to", who); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
638 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
639 jabber_iq_set_callback(iq, jabber_caps_ext_iqcb, cbdata); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
640 jabber_iq_send(iq); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
641 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
642 ++userdata->extOutstanding; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
643 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
644 splat[i] = NULL; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
645 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
646 /* All the strings are now part of the GList, so don't need |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
647 * g_strfreev. */ |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
648 g_free(splat); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
649 } |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
650 |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
651 if (userdata->info && userdata->extOutstanding == 0) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
652 jabber_caps_get_info_complete(userdata); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
653 cbplususerdata_unref(userdata); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
654 } |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
655 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
656 |
25186
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
657 static gint |
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
658 jabber_identity_compare(gconstpointer a, gconstpointer b) |
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
659 { |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
660 const JabberIdentity *ac; |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
661 const JabberIdentity *bc; |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
662 gint cat_cmp; |
25019
f6272b156873
* jabber_caps_jabber_identity_compare() compares xml:lang too, now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25018
diff
changeset
|
663 gint typ_cmp; |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
664 |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
665 ac = a; |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
666 bc = b; |
25155
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
667 |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
668 if ((cat_cmp = strcmp(ac->category, bc->category)) == 0) { |
25019
f6272b156873
* jabber_caps_jabber_identity_compare() compares xml:lang too, now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25018
diff
changeset
|
669 if ((typ_cmp = strcmp(ac->type, bc->type)) == 0) { |
25155
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
670 if (!ac->lang && !bc->lang) { |
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
671 return 0; |
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
672 } else if (ac->lang && !bc->lang) { |
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
673 return 1; |
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
674 } else if (!ac->lang && bc->lang) { |
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
675 return -1; |
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
676 } else { |
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
677 return strcmp(ac->lang, bc->lang); |
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
678 } |
25019
f6272b156873
* jabber_caps_jabber_identity_compare() compares xml:lang too, now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25018
diff
changeset
|
679 } else { |
f6272b156873
* jabber_caps_jabber_identity_compare() compares xml:lang too, now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25018
diff
changeset
|
680 return typ_cmp; |
f6272b156873
* jabber_caps_jabber_identity_compare() compares xml:lang too, now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25018
diff
changeset
|
681 } |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
682 } else { |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
683 return cat_cmp; |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
684 } |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
685 } |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
686 |
25145
1225f3dcf5ab
Fix compilation errors and many warnings
Paul Aurich <paul@darkrain42.org>
parents:
25144
diff
changeset
|
687 static gchar *jabber_caps_get_formtype(const xmlnode *x) { |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
688 xmlnode *formtypefield; |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
689 formtypefield = xmlnode_get_child(x, "field"); |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
690 while (formtypefield && strcmp(xmlnode_get_attrib(formtypefield, "var"), "FORM_TYPE")) formtypefield = xmlnode_get_next_twin(formtypefield); |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
691 formtypefield = xmlnode_get_child(formtypefield, "value"); |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
692 return xmlnode_get_data(formtypefield);; |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
693 } |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
694 |
25186
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
695 static gint |
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
696 jabber_xdata_compare(gconstpointer a, gconstpointer b) |
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
697 { |
25030
61f37abc8a70
* removing several warnings
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25028
diff
changeset
|
698 const xmlnode *aformtypefield = a; |
61f37abc8a70
* removing several warnings
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25028
diff
changeset
|
699 const xmlnode *bformtypefield = b; |
25020
9867a406707e
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25019
diff
changeset
|
700 char *aformtype; |
9867a406707e
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25019
diff
changeset
|
701 char *bformtype; |
9867a406707e
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25019
diff
changeset
|
702 int result; |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
703 |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
704 aformtype = jabber_caps_get_formtype(aformtypefield); |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
705 bformtype = jabber_caps_get_formtype(bformtypefield); |
25020
9867a406707e
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25019
diff
changeset
|
706 |
9867a406707e
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25019
diff
changeset
|
707 result = strcmp(aformtype, bformtype); |
9867a406707e
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25019
diff
changeset
|
708 g_free(aformtype); |
9867a406707e
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25019
diff
changeset
|
709 g_free(bformtype); |
9867a406707e
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25019
diff
changeset
|
710 return result; |
9867a406707e
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25019
diff
changeset
|
711 } |
9867a406707e
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25019
diff
changeset
|
712 |
25162
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
713 static JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query) |
7dcba13d0e28
Move structures and function definitions in to caps.c and stop any other code from killing JabberCapsClientInfo structures (owned by the hash table)
Paul Aurich <paul@darkrain42.org>
parents:
25161
diff
changeset
|
714 { |
25018
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
715 xmlnode *child; |
25145
1225f3dcf5ab
Fix compilation errors and many warnings
Paul Aurich <paul@darkrain42.org>
parents:
25144
diff
changeset
|
716 JabberCapsClientInfo *info; |
1225f3dcf5ab
Fix compilation errors and many warnings
Paul Aurich <paul@darkrain42.org>
parents:
25144
diff
changeset
|
717 |
25153
b5dbf1d9930b
Whitespace, formatting, and // -> /* */
Paul Aurich <paul@darkrain42.org>
parents:
25152
diff
changeset
|
718 if (!query || strcmp(query->xmlns, "http://jabber.org/protocol/disco#info")) |
b5dbf1d9930b
Whitespace, formatting, and // -> /* */
Paul Aurich <paul@darkrain42.org>
parents:
25152
diff
changeset
|
719 return 0; |
25018
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
720 |
25145
1225f3dcf5ab
Fix compilation errors and many warnings
Paul Aurich <paul@darkrain42.org>
parents:
25144
diff
changeset
|
721 info = g_new0(JabberCapsClientInfo, 1); |
25187
6bdcdb77ce77
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <paul@darkrain42.org>
parents:
25186
diff
changeset
|
722 |
25018
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
723 for(child = query->child; child; child = child->next) { |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
724 if (!strcmp(child->name,"identity")) { |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
725 /* parse identity */ |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
726 const char *category = xmlnode_get_attrib(child, "category"); |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
727 const char *type = xmlnode_get_attrib(child, "type"); |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
728 const char *name = xmlnode_get_attrib(child, "name"); |
25155
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
729 const char *lang = xmlnode_get_attrib(child, "lang"); |
25156
c2438ad6e6c1
Error checking and use g_list_foreach
Paul Aurich <paul@darkrain42.org>
parents:
25155
diff
changeset
|
730 JabberIdentity *id; |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
731 |
25156
c2438ad6e6c1
Error checking and use g_list_foreach
Paul Aurich <paul@darkrain42.org>
parents:
25155
diff
changeset
|
732 if (!category || !type) |
c2438ad6e6c1
Error checking and use g_list_foreach
Paul Aurich <paul@darkrain42.org>
parents:
25155
diff
changeset
|
733 continue; |
c2438ad6e6c1
Error checking and use g_list_foreach
Paul Aurich <paul@darkrain42.org>
parents:
25155
diff
changeset
|
734 |
c2438ad6e6c1
Error checking and use g_list_foreach
Paul Aurich <paul@darkrain42.org>
parents:
25155
diff
changeset
|
735 id = g_new0(JabberIdentity, 1); |
25018
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
736 id->category = g_strdup(category); |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
737 id->type = g_strdup(type); |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
738 id->name = g_strdup(name); |
25155
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
739 id->lang = g_strdup(lang); |
27a9672371f1
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <paul@darkrain42.org>
parents:
25154
diff
changeset
|
740 |
25018
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
741 info->identities = g_list_append(info->identities, id); |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
742 } else if (!strcmp(child->name, "feature")) { |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
743 /* parse feature */ |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
744 const char *var = xmlnode_get_attrib(child, "var"); |
25189
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
745 if (var) |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25188
diff
changeset
|
746 info->features = g_list_prepend(info->features, g_strdup(var)); |
25018
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
747 } else if (!strcmp(child->name, "x")) { |
25156
c2438ad6e6c1
Error checking and use g_list_foreach
Paul Aurich <paul@darkrain42.org>
parents:
25155
diff
changeset
|
748 if (child->xmlns && !strcmp(child->xmlns, "jabber:x:data")) { |
25018
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
749 /* x-data form */ |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
750 xmlnode *dataform = xmlnode_copy(child); |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
751 info->forms = g_list_append(info->forms, dataform); |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
752 } |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
753 } |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
754 } |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
755 return info; |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
756 } |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
757 |
25160
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
758 static gint jabber_caps_xdata_field_compare(gconstpointer a, gconstpointer b) |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
759 { |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
760 const JabberDataFormField *ac = a; |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
761 const JabberDataFormField *bc = b; |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
762 |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
763 return strcmp(ac->var, bc->var); |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
764 } |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
765 |
25160
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
766 static GList* jabber_caps_xdata_get_fields(const xmlnode *x) |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
767 { |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
768 GList *fields = NULL; |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
769 xmlnode *field; |
25160
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
770 |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
771 if (!x) |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
772 return NULL; |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
773 |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
774 for (field = xmlnode_get_child(x, "field"); field; field = xmlnode_get_next_twin(field)) { |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
775 xmlnode *value; |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
776 JabberDataFormField *xdatafield = g_new0(JabberDataFormField, 1); |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
777 xdatafield->var = g_strdup(xmlnode_get_attrib(field, "var")); |
25160
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
778 |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
779 for (value = xmlnode_get_child(field, "value"); value; value = xmlnode_get_next_twin(value)) { |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
780 gchar *val = xmlnode_get_data(value); |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
781 xdatafield->values = g_list_append(xdatafield->values, val); |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
782 } |
25160
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
783 |
25152
8789b9202c06
Use strcmp instead of a wrapper
Paul Aurich <paul@darkrain42.org>
parents:
25150
diff
changeset
|
784 xdatafield->values = g_list_sort(xdatafield->values, (GCompareFunc)strcmp); |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
785 fields = g_list_append(fields, xdatafield); |
25160
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
786 } |
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
787 |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
788 fields = g_list_sort(fields, jabber_caps_xdata_field_compare); |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
789 return fields; |
17882
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
790 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
diff
changeset
|
791 |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
792 static GString* |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
793 jabber_caps_verification_append(GString *verification, const gchar *string) |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
794 { |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
795 verification = g_string_append(verification, string); |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
796 return g_string_append_c(verification, '<'); |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
797 } |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
798 |
25153
b5dbf1d9930b
Whitespace, formatting, and // -> /* */
Paul Aurich <paul@darkrain42.org>
parents:
25152
diff
changeset
|
799 gchar *jabber_caps_calculate_hash(JabberCapsClientInfo *info, const char *hash) |
b5dbf1d9930b
Whitespace, formatting, and // -> /* */
Paul Aurich <paul@darkrain42.org>
parents:
25152
diff
changeset
|
800 { |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
801 GList *node; |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
802 GString *verification; |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
803 PurpleCipherContext *context; |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
804 guint8 checksum[20]; |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
805 gsize checksum_size = 20; |
25186
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
806 gboolean success; |
25153
b5dbf1d9930b
Whitespace, formatting, and // -> /* */
Paul Aurich <paul@darkrain42.org>
parents:
25152
diff
changeset
|
807 |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
808 if (!info || !(context = purple_cipher_context_new_by_name(hash, NULL))) |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
809 return NULL; |
25153
b5dbf1d9930b
Whitespace, formatting, and // -> /* */
Paul Aurich <paul@darkrain42.org>
parents:
25152
diff
changeset
|
810 |
25020
9867a406707e
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25019
diff
changeset
|
811 /* sort identities, features and x-data forms */ |
25186
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
812 info->identities = g_list_sort(info->identities, jabber_identity_compare); |
25152
8789b9202c06
Use strcmp instead of a wrapper
Paul Aurich <paul@darkrain42.org>
parents:
25150
diff
changeset
|
813 info->features = g_list_sort(info->features, (GCompareFunc)strcmp); |
25186
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
814 info->forms = g_list_sort(info->forms, jabber_xdata_compare); |
25153
b5dbf1d9930b
Whitespace, formatting, and // -> /* */
Paul Aurich <paul@darkrain42.org>
parents:
25152
diff
changeset
|
815 |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
816 verification = g_string_new(""); |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
817 |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
818 /* concat identities to the verification string */ |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
819 for (node = info->identities; node; node = node->next) { |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
820 JabberIdentity *id = (JabberIdentity*)node->data; |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
821 |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
822 g_string_append_printf(verification, "%s/%s/%s/%s<", id->category, |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
823 id->type, id->lang ? id->lang : "", id->name); |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
824 } |
25153
b5dbf1d9930b
Whitespace, formatting, and // -> /* */
Paul Aurich <paul@darkrain42.org>
parents:
25152
diff
changeset
|
825 |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
826 /* concat features to the verification string */ |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
827 for (node = info->features; node; node = node->next) { |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
828 verification = jabber_caps_verification_append(verification, node->data); |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
829 } |
25153
b5dbf1d9930b
Whitespace, formatting, and // -> /* */
Paul Aurich <paul@darkrain42.org>
parents:
25152
diff
changeset
|
830 |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
831 /* concat x-data forms to the verification string */ |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
832 for(node = info->forms; node; node = node->next) { |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
833 xmlnode *data = (xmlnode *)node->data; |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
834 gchar *formtype = jabber_caps_get_formtype(data); |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
835 GList *fields = jabber_caps_xdata_get_fields(data); |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
836 |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
837 /* append FORM_TYPE's field value to the verification string */ |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
838 verification = jabber_caps_verification_append(verification, formtype); |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
839 g_free(formtype); |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
840 |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
841 while (fields) { |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
842 GList *value; |
25022
4c97156431b4
* pass hash type to the caps handling functions
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25021
diff
changeset
|
843 JabberDataFormField *field = (JabberDataFormField*)fields->data; |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
844 |
25160
c8b4029d37c5
Whitespace and formatting changes
Paul Aurich <paul@darkrain42.org>
parents:
25159
diff
changeset
|
845 if (strcmp(field->var, "FORM_TYPE")) { |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
846 /* Append the "var" attribute */ |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
847 verification = jabber_caps_verification_append(verification, field->var); |
25186
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
848 /* Append <value/> elements' cdata */ |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
849 for(value = field->values; value; value = value->next) { |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
850 verification = jabber_caps_verification_append(verification, value->data); |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
851 g_free(value->data); |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
852 } |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
853 } |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
854 |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
855 g_free(field->var); |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
856 g_list_free(field->values); |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
857 |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
858 fields = g_list_delete_link(fields, fields); |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
859 } |
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
860 } |
25153
b5dbf1d9930b
Whitespace, formatting, and // -> /* */
Paul Aurich <paul@darkrain42.org>
parents:
25152
diff
changeset
|
861 |
25024
fd19927e2b64
* support for calculating both hashes, sha-1 and md5
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25022
diff
changeset
|
862 /* generate hash */ |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
863 purple_cipher_context_append(context, (guchar*)verification->str, verification->len); |
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
864 |
25186
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
865 success = purple_cipher_context_digest(context, verification->len, |
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
866 checksum, &checksum_size); |
25153
b5dbf1d9930b
Whitespace, formatting, and // -> /* */
Paul Aurich <paul@darkrain42.org>
parents:
25152
diff
changeset
|
867 |
25159
7155fa3ec052
Rework jabber_caps_calculate_hash
Paul Aurich <paul@darkrain42.org>
parents:
25158
diff
changeset
|
868 g_string_free(verification, TRUE); |
25021
a5e437b7f915
* implemented jabber_caps_calcualte_hash() which calculates the SHA-1 hash for someones disco response according to XEP-0115
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25020
diff
changeset
|
869 purple_cipher_context_destroy(context); |
25153
b5dbf1d9930b
Whitespace, formatting, and // -> /* */
Paul Aurich <paul@darkrain42.org>
parents:
25152
diff
changeset
|
870 |
25186
ef90728dbae8
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <paul@darkrain42.org>
parents:
25185
diff
changeset
|
871 return (success ? purple_base64_encode(checksum, checksum_size) : NULL); |
25018
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
872 } |
2a6a37c7970b
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25017
diff
changeset
|
873 |
25026
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
874 void jabber_caps_calculate_own_hash(JabberStream *js) { |
25164
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
875 JabberCapsClientInfo info; |
25026
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
876 GList *iter = 0; |
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
877 GList *features = 0; |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
878 |
25164
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
879 if (!jabber_identities && !jabber_features) { |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
880 /* This really shouldn't ever happen */ |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
881 purple_debug_warning("jabber", "No features or identities, cannot calculate own caps hash.\n"); |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
882 g_free(js->caps_hash); |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
883 js->caps_hash = NULL; |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
884 return; |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
885 } |
25030
61f37abc8a70
* removing several warnings
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25028
diff
changeset
|
886 |
25164
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
887 /* build the currently-supported list of features */ |
25026
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
888 if (jabber_features) { |
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
889 for (iter = jabber_features; iter; iter = iter->next) { |
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
890 JabberFeature *feat = iter->data; |
25164
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
891 if(!feat->is_enabled || feat->is_enabled(js, feat->namespace)) { |
25026
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
892 features = g_list_append(features, feat->namespace); |
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
893 } |
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
894 } |
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
895 } |
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
896 |
25164
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
897 info.features = features; |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
898 info.identities = jabber_identities; |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
899 info.forms = NULL; |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
900 |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
901 g_free(js->caps_hash); |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25162
diff
changeset
|
902 js->caps_hash = jabber_caps_calculate_hash(&info, "sha1"); |
25026
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25025
diff
changeset
|
903 g_list_free(features); |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
904 } |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
905 |
25146
4040da08a733
Entity Capabilities must be per-JabberStream
Paul Aurich <paul@darkrain42.org>
parents:
25145
diff
changeset
|
906 const gchar* jabber_caps_get_own_hash(JabberStream *js) |
4040da08a733
Entity Capabilities must be per-JabberStream
Paul Aurich <paul@darkrain42.org>
parents:
25145
diff
changeset
|
907 { |
4040da08a733
Entity Capabilities must be per-JabberStream
Paul Aurich <paul@darkrain42.org>
parents:
25145
diff
changeset
|
908 if (!js->caps_hash) |
4040da08a733
Entity Capabilities must be per-JabberStream
Paul Aurich <paul@darkrain42.org>
parents:
25145
diff
changeset
|
909 jabber_caps_calculate_own_hash(js); |
4040da08a733
Entity Capabilities must be per-JabberStream
Paul Aurich <paul@darkrain42.org>
parents:
25145
diff
changeset
|
910 |
4040da08a733
Entity Capabilities must be per-JabberStream
Paul Aurich <paul@darkrain42.org>
parents:
25145
diff
changeset
|
911 return js->caps_hash; |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
912 } |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21688
diff
changeset
|
913 |
25147
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25146
diff
changeset
|
914 void jabber_caps_broadcast_change() |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25146
diff
changeset
|
915 { |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25146
diff
changeset
|
916 GList *node, *accounts = purple_accounts_get_all_active(); |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25146
diff
changeset
|
917 |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25146
diff
changeset
|
918 for (node = accounts; node; node = node->next) { |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25146
diff
changeset
|
919 PurpleAccount *account = node->data; |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25146
diff
changeset
|
920 const char *prpl_id = purple_account_get_protocol_id(account); |
25148
6adbaf3d25e3
Fix a null dereference on non-connected accounts
Paul Aurich <paul@darkrain42.org>
parents:
25147
diff
changeset
|
921 if (!strcmp("prpl-jabber", prpl_id) && purple_account_is_connected(account)) { |
25147
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25146
diff
changeset
|
922 PurpleConnection *gc = purple_account_get_connection(account); |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25146
diff
changeset
|
923 jabber_presence_send(gc->proto_data, TRUE); |
25032
7f6558c7a0a3
* implemented jabber_caps_broadcast_change() and finished jabber_ipc_add_feature() IPC function
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25031
diff
changeset
|
924 } |
7f6558c7a0a3
* implemented jabber_caps_broadcast_change() and finished jabber_ipc_add_feature() IPC function
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25031
diff
changeset
|
925 } |
25147
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25146
diff
changeset
|
926 |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25146
diff
changeset
|
927 g_list_free(accounts); |
25032
7f6558c7a0a3
* implemented jabber_caps_broadcast_change() and finished jabber_ipc_add_feature() IPC function
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25031
diff
changeset
|
928 } |
7f6558c7a0a3
* implemented jabber_caps_broadcast_change() and finished jabber_ipc_add_feature() IPC function
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25031
diff
changeset
|
929 |