Sun, 16 Aug 2020 18:58:39 -0500
Fix some leaks.
Also, expand `g_ascii_dtostr` buffers to `G_ASCII_DTOSTR_BUF_SIZE`.
This is the size it's guaranteed to be under, so might as well have it be that size. It not too much bigger than the existing choice anyway.
Testing Done:
Compile only.
Reviewed at https://reviews.imfreedom.org/r/71/
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
1 | /* |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
2 | * purple - Jabber Protocol Plugin |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
3 | * |
|
28322
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
28321
diff
changeset
|
4 | * Purple is the legal property of its developers, whose names are too numerous |
|
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
28321
diff
changeset
|
5 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
28321
diff
changeset
|
6 | * source distribution. |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
7 | * |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
8 | * This program is free software; you can redistribute it and/or modify |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
9 | * it under the terms of the GNU General Public License as published by |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
10 | * the Free Software Foundation; either version 2 of the License, or |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
11 | * (at your option) any later version. |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
12 | * |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
13 | * This program is distributed in the hope that it will be useful, |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
16 | * GNU General Public License for more details. |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
17 | * |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
18 | * You should have received a copy of the GNU General Public License |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
19 | * along with this program; if not, write to the Free Software |
|
28321
c8d617c408ab
Update various header copyrights thanks to licensecheck.
Paul Aurich <darkrain42@pidgin.im>
parents:
28316
diff
changeset
|
20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
21 | * |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
22 | */ |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
23 | |
|
40439
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40358
diff
changeset
|
24 | #include <glib/gi18n-lib.h> |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40358
diff
changeset
|
25 | |
|
40358
e6fe6fc1f516
move all protocols, purple plugins, and purple tests to use purple.h instead of including files individually
Gary Kramlich <grim@reaperworld.com>
parents:
40264
diff
changeset
|
26 | #include <purple.h> |
|
19898
218e4bb04853
Fix mingw build of xmpp prpl
Daniel Atallah <datallah@pidgin.im>
parents:
17836
diff
changeset
|
27 | |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
28 | #include "caps.h" |
|
24715
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
29 | #include "iq.h" |
|
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
30 | #include "presence.h" |
|
30511
3e43438dbd72
jabber: Move (and harden) a function to xdata.c
Paul Aurich <darkrain42@pidgin.im>
parents:
30509
diff
changeset
|
31 | #include "xdata.h" |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
32 | |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
33 | #define JABBER_CAPS_FILENAME "xmpp-caps.xml" |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
34 | |
|
39556
622bf98df0ac
Remove unnecessary struct tags.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38898
diff
changeset
|
35 | typedef struct { |
|
24732
7d4f758b7b0a
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 <darkrain42@pidgin.im>
parents:
24731
diff
changeset
|
36 | gchar *var; |
|
7d4f758b7b0a
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 <darkrain42@pidgin.im>
parents:
24731
diff
changeset
|
37 | GList *values; |
|
7d4f758b7b0a
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 <darkrain42@pidgin.im>
parents:
24731
diff
changeset
|
38 | } JabberDataFormField; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
39 | |
|
27067
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
40 | static GHashTable *capstable = NULL; /* JabberCapsTuple -> JabberCapsClientInfo */ |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
41 | static GHashTable *nodetable = NULL; /* char *node -> JabberCapsNodeExts */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
42 | static guint save_timer = 0; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
43 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
44 | /* Free a GList of allocated char* */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
45 | static void |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
46 | free_string_glist(GList *list) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
47 | { |
|
40062
d25228fc7b8e
Use g_list_free_full instead of manual iterations
qarkai <qarkai@gmail.com>
parents:
39913
diff
changeset
|
48 | g_list_free_full(list, g_free); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
49 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
50 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
51 | static JabberCapsNodeExts* |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
52 | jabber_caps_node_exts_ref(JabberCapsNodeExts *exts) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
53 | { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
54 | g_return_val_if_fail(exts != NULL, NULL); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
55 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
56 | ++exts->ref; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
57 | return exts; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
58 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
59 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
60 | static void |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
61 | jabber_caps_node_exts_unref(JabberCapsNodeExts *exts) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
62 | { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
63 | if (exts == NULL) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
64 | return; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
65 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
66 | g_return_if_fail(exts->ref != 0); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
67 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
68 | if (--exts->ref != 0) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
69 | return; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
70 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
71 | g_hash_table_destroy(exts->exts); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
72 | g_free(exts); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
73 | } |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24029
diff
changeset
|
74 | |
|
24879
823943d2f2b9
Rename a few variables
Paul Aurich <darkrain42@pidgin.im>
parents:
24878
diff
changeset
|
75 | static guint jabber_caps_hash(gconstpointer data) { |
|
27067
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
76 | const JabberCapsTuple *key = data; |
|
24879
823943d2f2b9
Rename a few variables
Paul Aurich <darkrain42@pidgin.im>
parents:
24878
diff
changeset
|
77 | guint nodehash = g_str_hash(key->node); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
78 | guint verhash = g_str_hash(key->ver); |
|
26905
61eac5fd16fe
Use purple_strequal and g_str_equal
Paul Aurich <darkrain42@pidgin.im>
parents:
26708
diff
changeset
|
79 | /* |
|
61eac5fd16fe
Use purple_strequal and g_str_equal
Paul Aurich <darkrain42@pidgin.im>
parents:
26708
diff
changeset
|
80 | * 'hash' was optional in XEP-0115 v1.4 and g_str_hash crashes on NULL >:O. |
|
61eac5fd16fe
Use purple_strequal and g_str_equal
Paul Aurich <darkrain42@pidgin.im>
parents:
26708
diff
changeset
|
81 | * Okay, maybe I've played too much Zelda, but that looks like |
|
61eac5fd16fe
Use purple_strequal and g_str_equal
Paul Aurich <darkrain42@pidgin.im>
parents:
26708
diff
changeset
|
82 | * a Deku Shrub... |
|
61eac5fd16fe
Use purple_strequal and g_str_equal
Paul Aurich <darkrain42@pidgin.im>
parents:
26708
diff
changeset
|
83 | */ |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
84 | guint hashhash = (key->hash ? g_str_hash(key->hash) : 0); |
|
23596
164fbee281c1
* fixing a bug in jabber_caps_compare()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23595
diff
changeset
|
85 | return nodehash ^ verhash ^ hashhash; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
86 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
87 | |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
88 | static gboolean jabber_caps_compare(gconstpointer v1, gconstpointer v2) { |
|
27067
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
89 | const JabberCapsTuple *name1 = v1; |
|
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
90 | const JabberCapsTuple *name2 = v2; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
91 | |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
92 | return purple_strequal(name1->node, name2->node) && |
|
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
93 | purple_strequal(name1->ver, name2->ver) && |
|
26905
61eac5fd16fe
Use purple_strequal and g_str_equal
Paul Aurich <darkrain42@pidgin.im>
parents:
26708
diff
changeset
|
94 | purple_strequal(name1->hash, name2->hash); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
95 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
96 | |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
97 | static void |
|
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
98 | jabber_caps_client_info_destroy(JabberCapsClientInfo *info) |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
99 | { |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
100 | if (info == NULL) |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
101 | return; |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
102 | |
|
40137
016690872c6c
Add new and free functions for structs to reduce duplication
qarkai <qarkai@gmail.com>
parents:
40062
diff
changeset
|
103 | g_list_free_full(info->identities, (GDestroyNotify)jabber_identity_free); |
|
24731
c0a5e4f2bed5
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <darkrain42@pidgin.im>
parents:
24730
diff
changeset
|
104 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
105 | free_string_glist(info->features); |
|
27040
775b48f69568
Free the forms properly; they're xmlnodes, not strings.
Paul Aurich <darkrain42@pidgin.im>
parents:
27028
diff
changeset
|
106 | |
|
40062
d25228fc7b8e
Use g_list_free_full instead of manual iterations
qarkai <qarkai@gmail.com>
parents:
39913
diff
changeset
|
107 | g_list_free_full(info->forms, (GDestroyNotify)purple_xmlnode_free); |
|
23594
f80bec337aa7
* changed storage format for cache to mirror all needed features for XEP-0115v1.5
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23593
diff
changeset
|
108 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
109 | jabber_caps_node_exts_unref(info->exts); |
|
24731
c0a5e4f2bed5
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <darkrain42@pidgin.im>
parents:
24730
diff
changeset
|
110 | |
|
27067
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
111 | g_free((char *)info->tuple.node); |
|
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
112 | g_free((char *)info->tuple.ver); |
|
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
113 | g_free((char *)info->tuple.hash); |
|
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
114 | |
|
24731
c0a5e4f2bed5
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <darkrain42@pidgin.im>
parents:
24730
diff
changeset
|
115 | g_free(info); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
116 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
117 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
118 | /* NOTE: Takes a reference to the exts, unref it if you don't really want to |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
119 | * keep it around. */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
120 | static JabberCapsNodeExts* |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
121 | jabber_caps_find_exts_by_node(const char *node) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
122 | { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
123 | JabberCapsNodeExts *exts; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
124 | if (NULL == (exts = g_hash_table_lookup(nodetable, node))) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
125 | exts = g_new0(JabberCapsNodeExts, 1); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
126 | exts->exts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
127 | (GDestroyNotify)free_string_glist); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
128 | g_hash_table_insert(nodetable, g_strdup(node), jabber_caps_node_exts_ref(exts)); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
129 | } |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
130 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
131 | return jabber_caps_node_exts_ref(exts); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
132 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
133 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
134 | static void |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
135 | exts_to_xmlnode(gconstpointer key, gconstpointer value, gpointer user_data) |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
136 | { |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
137 | const char *identifier = key; |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
138 | const GList *features = value, *node; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
139 | PurpleXmlNode *client = user_data, *ext, *feature; |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
140 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
141 | ext = purple_xmlnode_new_child(client, "ext"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
142 | purple_xmlnode_set_attrib(ext, "identifier", identifier); |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
143 | |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
144 | for (node = features; node; node = node->next) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
145 | feature = purple_xmlnode_new_child(ext, "feature"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
146 | purple_xmlnode_set_attrib(feature, "var", (const gchar *)node->data); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
147 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
148 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
149 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
150 | static void jabber_caps_store_client(gpointer key, gpointer value, gpointer user_data) { |
|
27067
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
151 | const JabberCapsTuple *tuple = key; |
|
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
152 | const JabberCapsClientInfo *props = value; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
153 | PurpleXmlNode *root = user_data; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
154 | PurpleXmlNode *client = purple_xmlnode_new_child(root, "client"); |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
155 | GList *iter; |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24029
diff
changeset
|
156 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
157 | purple_xmlnode_set_attrib(client, "node", tuple->node); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
158 | purple_xmlnode_set_attrib(client, "ver", tuple->ver); |
|
27067
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
159 | if (tuple->hash) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
160 | purple_xmlnode_set_attrib(client, "hash", tuple->hash); |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
161 | for(iter = props->identities; iter; iter = g_list_next(iter)) { |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
162 | JabberIdentity *id = iter->data; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
163 | PurpleXmlNode *identity = purple_xmlnode_new_child(client, "identity"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
164 | purple_xmlnode_set_attrib(identity, "category", id->category); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
165 | purple_xmlnode_set_attrib(identity, "type", id->type); |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
166 | if (id->name) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
167 | purple_xmlnode_set_attrib(identity, "name", id->name); |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
168 | if (id->lang) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
169 | purple_xmlnode_set_attrib(identity, "lang", id->lang); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
170 | } |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
171 | |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
172 | for(iter = props->features; iter; iter = g_list_next(iter)) { |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
173 | const char *feat = iter->data; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
174 | PurpleXmlNode *feature = purple_xmlnode_new_child(client, "feature"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
175 | purple_xmlnode_set_attrib(feature, "var", feat); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
176 | } |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27072
diff
changeset
|
177 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
178 | for(iter = props->forms; iter; iter = g_list_next(iter)) { |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
179 | /* FIXME: See #7814 */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
180 | PurpleXmlNode *xdata = iter->data; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
181 | purple_xmlnode_insert_child(client, purple_xmlnode_copy(xdata)); |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
182 | } |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
183 | |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
184 | /* TODO: Ideally, only save this once-per-node... */ |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
185 | if (props->exts) |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
186 | g_hash_table_foreach(props->exts->exts, (GHFunc)exts_to_xmlnode, client); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
187 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
188 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
189 | static gboolean |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
190 | do_jabber_caps_store(gpointer data) |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
191 | { |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
192 | char *str; |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
193 | int length = 0; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
194 | PurpleXmlNode *root = purple_xmlnode_new("capabilities"); |
|
38878
6d800b496317
Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents:
37390
diff
changeset
|
195 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
196 | g_hash_table_foreach(capstable, jabber_caps_store_client, root); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
197 | str = purple_xmlnode_to_formatted_str(root, &length); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
198 | purple_xmlnode_free(root); |
|
38878
6d800b496317
Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents:
37390
diff
changeset
|
199 | purple_util_write_data_to_cache_file(JABBER_CAPS_FILENAME, str, length); |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
200 | g_free(str); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
201 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
202 | save_timer = 0; |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
203 | return FALSE; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
204 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
205 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
206 | static void |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
207 | schedule_caps_save(void) |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
208 | { |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
209 | if (save_timer == 0) |
|
38433
361c801c4536
Remove purple_timeout_* function usage
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
210 | save_timer = g_timeout_add_seconds(5, do_jabber_caps_store, NULL); |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
211 | } |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
212 | |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
213 | static void |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
214 | jabber_caps_load(void) |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
215 | { |
|
38878
6d800b496317
Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents:
37390
diff
changeset
|
216 | PurpleXmlNode *capsdata = purple_util_read_xml_from_cache_file(JABBER_CAPS_FILENAME, "XMPP capabilities cache"); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
217 | PurpleXmlNode *client; |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
218 | |
|
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
219 | if(!capsdata) |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
220 | return; |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
221 | |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
222 | if (!purple_strequal(capsdata->name, "capabilities")) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
223 | purple_xmlnode_free(capsdata); |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
224 | return; |
|
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
225 | } |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24029
diff
changeset
|
226 | |
|
30509
716b12588874
jabber: Minor cleanup (formatting + strcmp->g_str_equal) of caps
Paul Aurich <darkrain42@pidgin.im>
parents:
30508
diff
changeset
|
227 | for (client = capsdata->child; client; client = client->next) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
228 | if (client->type != PURPLE_XMLNODE_TYPE_TAG) |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
229 | continue; |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
230 | if (purple_strequal(client->name, "client")) { |
|
24731
c0a5e4f2bed5
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <darkrain42@pidgin.im>
parents:
24730
diff
changeset
|
231 | JabberCapsClientInfo *value = g_new0(JabberCapsClientInfo, 1); |
|
27067
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
232 | JabberCapsTuple *key = (JabberCapsTuple*)&value->tuple; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
233 | PurpleXmlNode *child; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
234 | JabberCapsNodeExts *exts = NULL; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
235 | key->node = g_strdup(purple_xmlnode_get_attrib(client,"node")); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
236 | key->ver = g_strdup(purple_xmlnode_get_attrib(client,"ver")); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
237 | key->hash = g_strdup(purple_xmlnode_get_attrib(client,"hash")); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
238 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
239 | /* v1.3 capabilities */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
240 | if (key->hash == NULL) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
241 | exts = jabber_caps_find_exts_by_node(key->node); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
242 | |
|
30509
716b12588874
jabber: Minor cleanup (formatting + strcmp->g_str_equal) of caps
Paul Aurich <darkrain42@pidgin.im>
parents:
30508
diff
changeset
|
243 | for (child = client->child; child; child = child->next) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
244 | if (child->type != PURPLE_XMLNODE_TYPE_TAG) |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
245 | continue; |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
246 | if (purple_strequal(child->name, "feature")) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
247 | const char *var = purple_xmlnode_get_attrib(child, "var"); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
248 | if(!var) |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
249 | continue; |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
250 | value->features = g_list_append(value->features,g_strdup(var)); |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
251 | } else if (purple_strequal(child->name, "identity")) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
252 | const char *category = purple_xmlnode_get_attrib(child, "category"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
253 | const char *type = purple_xmlnode_get_attrib(child, "type"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
254 | const char *name = purple_xmlnode_get_attrib(child, "name"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
255 | const char *lang = purple_xmlnode_get_attrib(child, "lang"); |
|
24726
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
256 | JabberIdentity *id; |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24029
diff
changeset
|
257 | |
|
24726
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
258 | if (!category || !type) |
|
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
259 | continue; |
|
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
260 | |
|
40137
016690872c6c
Add new and free functions for structs to reduce duplication
qarkai <qarkai@gmail.com>
parents:
40062
diff
changeset
|
261 | id = jabber_identity_new(category, type, lang, name); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
262 | value->identities = g_list_append(value->identities,id); |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
263 | } else if (purple_strequal(child->name, "x")) { |
|
26995
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
264 | /* TODO: See #7814 -- this might cause problems if anyone |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
265 | * ever actually specifies forms. In fact, for this to |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
266 | * work properly, that bug needs to be fixed in |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
267 | * purple_xmlnode_from_str, not the output version... */ |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
268 | value->forms = g_list_append(value->forms, purple_xmlnode_copy(child)); |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
269 | } else if (purple_strequal(child->name, "ext")) { |
|
31797
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
270 | if (key->hash != NULL) |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
271 | purple_debug_warning("jabber", "Ignoring exts when reading new-style caps\n"); |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
272 | else { |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
273 | /* TODO: Do we care about reading in the identities listed here? */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
274 | const char *identifier = purple_xmlnode_get_attrib(child, "identifier"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
275 | PurpleXmlNode *node; |
|
31797
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
276 | GList *features = NULL; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
277 | |
|
31797
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
278 | if (!identifier) |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
279 | continue; |
|
31797
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
280 | |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
281 | for (node = child->child; node; node = node->next) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
282 | if (node->type != PURPLE_XMLNODE_TYPE_TAG) |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
283 | continue; |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
284 | if (purple_strequal(node->name, "feature")) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
285 | const char *var = purple_xmlnode_get_attrib(node, "var"); |
|
31797
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
286 | if (!var) |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
287 | continue; |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
288 | features = g_list_prepend(features, g_strdup(var)); |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
289 | } |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
290 | } |
|
31797
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
291 | |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
292 | if (features) { |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
293 | g_hash_table_insert(exts->exts, g_strdup(identifier), |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
294 | features); |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
295 | } else |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
296 | purple_debug_warning("jabber", "Caps ext %s had no features.\n", |
|
e26c45c86ea7
jabber/caps: Reorganize for the purpose of making clang's analyzer happier
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
297 | identifier); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
298 | } |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
299 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
300 | } |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
301 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
302 | value->exts = exts; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
303 | g_hash_table_replace(capstable, key, value); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
304 | |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
305 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
306 | } |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
307 | purple_xmlnode_free(capsdata); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
308 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
309 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
310 | void jabber_caps_init(void) |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
311 | { |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27072
diff
changeset
|
312 | nodetable = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)jabber_caps_node_exts_unref); |
|
27067
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
313 | capstable = g_hash_table_new_full(jabber_caps_hash, jabber_caps_compare, NULL, (GDestroyNotify)jabber_caps_client_info_destroy); |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
314 | jabber_caps_load(); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
315 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
316 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
317 | void jabber_caps_uninit(void) |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
318 | { |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
319 | if (save_timer != 0) { |
|
38433
361c801c4536
Remove purple_timeout_* function usage
Mike Ruprecht <cmaiku@gmail.com>
parents:
38358
diff
changeset
|
320 | g_source_remove(save_timer); |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
321 | save_timer = 0; |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
322 | do_jabber_caps_store(NULL); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
323 | } |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
324 | g_hash_table_destroy(capstable); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
325 | g_hash_table_destroy(nodetable); |
|
27028
1a2ef7ddb463
Clean up jabber prpl memory allocations on uninit.
Nick Hebner <hebnern@gmail.com>
parents:
27015
diff
changeset
|
326 | capstable = nodetable = NULL; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
327 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
328 | |
|
27068
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
329 | gboolean jabber_caps_exts_known(const JabberCapsClientInfo *info, |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
330 | char **exts) |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
331 | { |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
332 | int i; |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
333 | g_return_val_if_fail(info != NULL, FALSE); |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
334 | |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
335 | if (!exts) |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
336 | return TRUE; |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
337 | |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
338 | for (i = 0; exts[i]; ++i) { |
|
27072
1cefe8bcdc2a
I forgot to finish this comment before coming back from dinner and committing.
Paul Aurich <darkrain42@pidgin.im>
parents:
27068
diff
changeset
|
339 | /* Hack since we advertise the ext along with v1.5 caps but don't |
|
1cefe8bcdc2a
I forgot to finish this comment before coming back from dinner and committing.
Paul Aurich <darkrain42@pidgin.im>
parents:
27068
diff
changeset
|
340 | * store any exts */ |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
341 | if (purple_strequal(exts[i], "voice-v1") && !info->exts) |
|
27068
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
342 | continue; |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
343 | if (!info->exts || |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
344 | !g_hash_table_lookup(info->exts->exts, exts[i])) |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
345 | return FALSE; |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
346 | } |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
347 | |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
348 | return TRUE; |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
349 | } |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
350 | |
|
39556
622bf98df0ac
Remove unnecessary struct tags.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38898
diff
changeset
|
351 | typedef struct { |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
352 | guint ref; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
353 | |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
354 | jabber_caps_get_info_cb cb; |
|
24876
5861f7210c6c
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <darkrain42@pidgin.im>
parents:
24742
diff
changeset
|
355 | gpointer cb_data; |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24029
diff
changeset
|
356 | |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
357 | char *who; |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
358 | char *node; |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
359 | char *ver; |
|
23591
ba1e3ed78d40
* pass hash type to the caps handling functions
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23590
diff
changeset
|
360 | char *hash; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
361 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
362 | JabberCapsClientInfo *info; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
363 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
364 | GList *exts; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
365 | guint extOutstanding; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
366 | JabberCapsNodeExts *node_exts; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
367 | } jabber_caps_cbplususerdata; |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
368 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
369 | static jabber_caps_cbplususerdata* |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
370 | cbplususerdata_ref(jabber_caps_cbplususerdata *data) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
371 | { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
372 | g_return_val_if_fail(data != NULL, NULL); |
|
19922
6b9cf9463ea4
Some clients don't put the node in the 115 disco response, so send the node to the callback
Sean Egan <seanegan@pidgin.im>
parents:
19919
diff
changeset
|
373 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
374 | ++data->ref; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
375 | return data; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
376 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
377 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
378 | static void |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
379 | cbplususerdata_unref(jabber_caps_cbplususerdata *data) |
|
26687
1e799151fabe
Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <darkrain42@pidgin.im>
parents:
26042
diff
changeset
|
380 | { |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
381 | if (data == NULL) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
382 | return; |
|
21680
1b52846a0d97
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <datallah@pidgin.im>
parents:
21491
diff
changeset
|
383 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
384 | g_return_if_fail(data->ref != 0); |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
385 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
386 | if (--data->ref > 0) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
387 | return; |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
388 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
389 | g_free(data->who); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
390 | g_free(data->node); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
391 | g_free(data->ver); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
392 | g_free(data->hash); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
393 | |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
394 | /* If we have info here, it's already in the capstable, so don't free it */ |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
395 | if (data->exts) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
396 | free_string_glist(data->exts); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
397 | if (data->node_exts) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
398 | jabber_caps_node_exts_unref(data->node_exts); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
399 | g_free(data); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
400 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
401 | |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
402 | static void |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
403 | jabber_caps_get_info_complete(jabber_caps_cbplususerdata *userdata) |
|
26687
1e799151fabe
Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <darkrain42@pidgin.im>
parents:
26042
diff
changeset
|
404 | { |
|
26992
3a3f6cc07b02
Don't crash when the caps cb is NULL and don't corrupt jabber_identities
Paul Aurich <darkrain42@pidgin.im>
parents:
26973
diff
changeset
|
405 | if (userdata->cb) { |
|
3a3f6cc07b02
Don't crash when the caps cb is NULL and don't corrupt jabber_identities
Paul Aurich <darkrain42@pidgin.im>
parents:
26973
diff
changeset
|
406 | userdata->cb(userdata->info, userdata->exts, userdata->cb_data); |
|
3a3f6cc07b02
Don't crash when the caps cb is NULL and don't corrupt jabber_identities
Paul Aurich <darkrain42@pidgin.im>
parents:
26973
diff
changeset
|
407 | userdata->info = NULL; |
|
3a3f6cc07b02
Don't crash when the caps cb is NULL and don't corrupt jabber_identities
Paul Aurich <darkrain42@pidgin.im>
parents:
26973
diff
changeset
|
408 | userdata->exts = NULL; |
|
3a3f6cc07b02
Don't crash when the caps cb is NULL and don't corrupt jabber_identities
Paul Aurich <darkrain42@pidgin.im>
parents:
26973
diff
changeset
|
409 | } |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
410 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
411 | if (userdata->ref != 1) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
412 | purple_debug_warning("jabber", "Lost a reference to caps cbdata: %d\n", |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
413 | userdata->ref); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
414 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
415 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
416 | static void |
| 26708 | 417 | jabber_caps_client_iqcb(JabberStream *js, const char *from, JabberIqType type, |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
418 | const char *id, PurpleXmlNode *packet, gpointer data) |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
419 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
420 | PurpleXmlNode *query = purple_xmlnode_get_child_with_namespace(packet, "query", |
|
28984
1d84517d56eb
jabber: More namespaces! This is a good stopping point for now.
Paul Aurich <darkrain42@pidgin.im>
parents:
28761
diff
changeset
|
421 | NS_DISCO_INFO); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
422 | jabber_caps_cbplususerdata *userdata = data; |
|
24876
5861f7210c6c
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <darkrain42@pidgin.im>
parents:
24742
diff
changeset
|
423 | JabberCapsClientInfo *info = NULL, *value; |
|
27067
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
424 | JabberCapsTuple key; |
|
21680
1b52846a0d97
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <datallah@pidgin.im>
parents:
21491
diff
changeset
|
425 | |
| 26708 | 426 | if (!query || type == JABBER_IQ_ERROR) { |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
427 | /* Any outstanding exts will be dealt with via ref-counting */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
428 | userdata->cb(NULL, NULL, userdata->cb_data); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
429 | cbplususerdata_unref(userdata); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
430 | return; |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
431 | } |
|
21680
1b52846a0d97
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <datallah@pidgin.im>
parents:
21491
diff
changeset
|
432 | |
|
24727
77092d0aaaf0
Whitespace cleanup (no functional changes, just unwrap the huge if block and
Paul Aurich <darkrain42@pidgin.im>
parents:
24726
diff
changeset
|
433 | /* check hash */ |
|
77092d0aaaf0
Whitespace cleanup (no functional changes, just unwrap the huge if block and
Paul Aurich <darkrain42@pidgin.im>
parents:
24726
diff
changeset
|
434 | info = jabber_caps_parse_client_info(query); |
|
21680
1b52846a0d97
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <datallah@pidgin.im>
parents:
21491
diff
changeset
|
435 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
436 | /* Only validate if these are v1.5 capabilities */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
437 | if (userdata->hash) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
438 | gchar *hash = NULL; |
|
38337
4b8cc47d05da
jabber: Only attempt to calculate hash for supported hashes
Mike Ruprecht <cmaiku@gmail.com>
parents:
38336
diff
changeset
|
439 | GChecksumType hash_type; |
|
4b8cc47d05da
jabber: Only attempt to calculate hash for supported hashes
Mike Ruprecht <cmaiku@gmail.com>
parents:
38336
diff
changeset
|
440 | gboolean supported_hash = TRUE; |
|
38336
db6beb747e05
jabber: Rework jabber_caps_calculate_hash() to allow any size digest
Mike Ruprecht <cmaiku@gmail.com>
parents:
38335
diff
changeset
|
441 | |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
442 | if (purple_strequal(userdata->hash, "sha-1")) { |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
443 | hash_type = G_CHECKSUM_SHA1; |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
444 | } else if (purple_strequal(userdata->hash, "md5")) { |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
445 | hash_type = G_CHECKSUM_MD5; |
|
38337
4b8cc47d05da
jabber: Only attempt to calculate hash for supported hashes
Mike Ruprecht <cmaiku@gmail.com>
parents:
38336
diff
changeset
|
446 | } else { |
|
4b8cc47d05da
jabber: Only attempt to calculate hash for supported hashes
Mike Ruprecht <cmaiku@gmail.com>
parents:
38336
diff
changeset
|
447 | supported_hash = FALSE; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
448 | } |
|
38337
4b8cc47d05da
jabber: Only attempt to calculate hash for supported hashes
Mike Ruprecht <cmaiku@gmail.com>
parents:
38336
diff
changeset
|
449 | |
|
4b8cc47d05da
jabber: Only attempt to calculate hash for supported hashes
Mike Ruprecht <cmaiku@gmail.com>
parents:
38336
diff
changeset
|
450 | if (supported_hash) { |
|
4b8cc47d05da
jabber: Only attempt to calculate hash for supported hashes
Mike Ruprecht <cmaiku@gmail.com>
parents:
38336
diff
changeset
|
451 | hash = jabber_caps_calculate_hash(info, hash_type); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
452 | } |
|
21680
1b52846a0d97
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <datallah@pidgin.im>
parents:
21491
diff
changeset
|
453 | |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
454 | if (!hash || !purple_strequal(hash, userdata->ver)) { |
|
28316
39822449ee6a
jabber: Print out the expected/generated caps hashes.
Paul Aurich <darkrain42@pidgin.im>
parents:
28192
diff
changeset
|
455 | purple_debug_warning("jabber", "Could not validate caps info from " |
|
39822449ee6a
jabber: Print out the expected/generated caps hashes.
Paul Aurich <darkrain42@pidgin.im>
parents:
28192
diff
changeset
|
456 | "%s. Expected %s, got %s\n", |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
457 | purple_xmlnode_get_attrib(packet, "from"), |
|
28316
39822449ee6a
jabber: Print out the expected/generated caps hashes.
Paul Aurich <darkrain42@pidgin.im>
parents:
28192
diff
changeset
|
458 | userdata->ver, hash ? hash : "(null)"); |
|
19922
6b9cf9463ea4
Some clients don't put the node in the 115 disco response, so send the node to the callback
Sean Egan <seanegan@pidgin.im>
parents:
19919
diff
changeset
|
459 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
460 | userdata->cb(NULL, NULL, userdata->cb_data); |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
461 | jabber_caps_client_info_destroy(info); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
462 | cbplususerdata_unref(userdata); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
463 | g_free(hash); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
464 | return; |
|
24029
b6955f09ca0b
Don't look up caps exts when the initial caps discovery wasn't successful.
Daniel Atallah <datallah@pidgin.im>
parents:
21720
diff
changeset
|
465 | } |
|
b6955f09ca0b
Don't look up caps exts when the initial caps discovery wasn't successful.
Daniel Atallah <datallah@pidgin.im>
parents:
21720
diff
changeset
|
466 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
467 | g_free(hash); |
|
24727
77092d0aaaf0
Whitespace cleanup (no functional changes, just unwrap the huge if block and
Paul Aurich <darkrain42@pidgin.im>
parents:
24726
diff
changeset
|
468 | } |
|
21680
1b52846a0d97
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <datallah@pidgin.im>
parents:
21491
diff
changeset
|
469 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
470 | if (!userdata->hash && userdata->node_exts) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
471 | /* If the ClientInfo doesn't have information about the exts, give them |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
472 | * ours (along with our ref) */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
473 | info->exts = userdata->node_exts; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
474 | userdata->node_exts = NULL; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
475 | } |
|
24715
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
476 | |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
477 | key.node = userdata->node; |
|
24876
5861f7210c6c
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <darkrain42@pidgin.im>
parents:
24742
diff
changeset
|
478 | key.ver = userdata->ver; |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
479 | key.hash = userdata->hash; |
|
21680
1b52846a0d97
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <datallah@pidgin.im>
parents:
21491
diff
changeset
|
480 | |
|
24876
5861f7210c6c
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <darkrain42@pidgin.im>
parents:
24742
diff
changeset
|
481 | /* Use the copy of this data already in the table if it exists or insert |
|
5861f7210c6c
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <darkrain42@pidgin.im>
parents:
24742
diff
changeset
|
482 | * a new one if we need to */ |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
483 | if ((value = g_hash_table_lookup(capstable, &key))) { |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
484 | jabber_caps_client_info_destroy(info); |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
485 | info = value; |
|
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
486 | } else { |
|
39913
ce96d4639dc7
Remove redundant conditions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39897
diff
changeset
|
487 | JabberCapsTuple *n_key = NULL; |
|
35688
3d727b2e6f82
Fix most of libpurple clang scan-build warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35188
diff
changeset
|
488 | |
|
39913
ce96d4639dc7
Remove redundant conditions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39897
diff
changeset
|
489 | if (G_UNLIKELY(info == NULL)) { |
|
35688
3d727b2e6f82
Fix most of libpurple clang scan-build warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35188
diff
changeset
|
490 | g_warn_if_reached(); |
|
3d727b2e6f82
Fix most of libpurple clang scan-build warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35188
diff
changeset
|
491 | return; |
|
3d727b2e6f82
Fix most of libpurple clang scan-build warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35188
diff
changeset
|
492 | } |
|
3d727b2e6f82
Fix most of libpurple clang scan-build warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35188
diff
changeset
|
493 | |
|
39913
ce96d4639dc7
Remove redundant conditions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39897
diff
changeset
|
494 | n_key = (JabberCapsTuple *)&info->tuple; |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
495 | n_key->node = userdata->node; |
|
24876
5861f7210c6c
Rename user_data to cb_data (there were too many 'userdata'/'user_data's).
Paul Aurich <darkrain42@pidgin.im>
parents:
24742
diff
changeset
|
496 | n_key->ver = userdata->ver; |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
497 | n_key->hash = userdata->hash; |
|
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
498 | userdata->node = userdata->ver = userdata->hash = NULL; |
|
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
499 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
500 | /* The capstable gets a reference */ |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
501 | g_hash_table_insert(capstable, n_key, info); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
502 | schedule_caps_save(); |
|
24727
77092d0aaaf0
Whitespace cleanup (no functional changes, just unwrap the huge if block and
Paul Aurich <darkrain42@pidgin.im>
parents:
24726
diff
changeset
|
503 | } |
|
21680
1b52846a0d97
Fix a discovery related crash. I think this still needs better error handling. Fixes #3995.
Daniel Atallah <datallah@pidgin.im>
parents:
21491
diff
changeset
|
504 | |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
505 | userdata->info = info; |
|
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
506 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
507 | if (userdata->extOutstanding == 0) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
508 | jabber_caps_get_info_complete(userdata); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
509 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
510 | cbplususerdata_unref(userdata); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
511 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
512 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
513 | typedef struct { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
514 | const char *name; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
515 | jabber_caps_cbplususerdata *data; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
516 | } ext_iq_data; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
517 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
518 | static void |
| 26708 | 519 | jabber_caps_ext_iqcb(JabberStream *js, const char *from, JabberIqType type, |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
520 | const char *id, PurpleXmlNode *packet, gpointer data) |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
521 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
522 | PurpleXmlNode *query = purple_xmlnode_get_child_with_namespace(packet, "query", |
|
28984
1d84517d56eb
jabber: More namespaces! This is a good stopping point for now.
Paul Aurich <darkrain42@pidgin.im>
parents:
28761
diff
changeset
|
523 | NS_DISCO_INFO); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
524 | PurpleXmlNode *child; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
525 | ext_iq_data *userdata = data; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
526 | GList *features = NULL; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
527 | JabberCapsNodeExts *node_exts; |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
528 | |
| 26708 | 529 | if (!query || type == JABBER_IQ_ERROR) { |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
530 | cbplususerdata_unref(userdata->data); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
531 | g_free(userdata); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
532 | return; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
533 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
534 | |
|
27373
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
535 | node_exts = (userdata->data->info ? userdata->data->info->exts : |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
536 | userdata->data->node_exts); |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
537 | |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
538 | /* TODO: I don't see how this can actually happen, but it crashed khc. */ |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
539 | if (!node_exts) { |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
540 | purple_debug_error("jabber", "Couldn't find JabberCapsNodeExts. If you " |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
541 | "see this, please tell darkrain42 and save your debug log.\n" |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
542 | "JabberCapsClientInfo = %p\n", userdata->data->info); |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
543 | |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
544 | |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
545 | /* Try once more to find the exts and then fail */ |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
546 | node_exts = jabber_caps_find_exts_by_node(userdata->data->node); |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
547 | if (node_exts) { |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
548 | purple_debug_info("jabber", "Found the exts on the second try.\n"); |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
549 | if (userdata->data->info) |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
550 | userdata->data->info->exts = node_exts; |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
551 | else |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
552 | userdata->data->node_exts = node_exts; |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
553 | } else { |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
554 | cbplususerdata_unref(userdata->data); |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
555 | g_free(userdata); |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
556 | g_return_if_reached(); |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
557 | } |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
558 | } |
|
0a157a53beeb
Don't crash when the seemingly impossible occurs.
Paul Aurich <darkrain42@pidgin.im>
parents:
27372
diff
changeset
|
559 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
560 | /* So, we decrement this after checking for an error, which means that |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
561 | * if there *is* an error, we'll never call the callback passed to |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
562 | * jabber_caps_get_info. We will still free all of our data, though. |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
563 | */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
564 | --userdata->data->extOutstanding; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
565 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
566 | for (child = purple_xmlnode_get_child(query, "feature"); child; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
567 | child = purple_xmlnode_get_next_twin(child)) { |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
568 | const char *var = purple_xmlnode_get_attrib(child, "var"); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
569 | if (var) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
570 | features = g_list_prepend(features, g_strdup(var)); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
571 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
572 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
573 | g_hash_table_insert(node_exts->exts, g_strdup(userdata->name), features); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
574 | schedule_caps_save(); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
575 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
576 | /* Are we done? */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
577 | if (userdata->data->info && userdata->data->extOutstanding == 0) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
578 | jabber_caps_get_info_complete(userdata->data); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
579 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
580 | cbplususerdata_unref(userdata->data); |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
581 | g_free(userdata); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
582 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
583 | |
| 24720 | 584 | void jabber_caps_get_info(JabberStream *js, const char *who, const char *node, |
|
27068
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
585 | const char *ver, const char *hash, char **exts, |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
586 | jabber_caps_get_info_cb cb, gpointer user_data) |
| 24720 | 587 | { |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
588 | JabberCapsClientInfo *info; |
|
27067
fa8eb96a2544
Make the JabberCapsTuple (nee Key) available to the rest of the prpl
Paul Aurich <darkrain42@pidgin.im>
parents:
27040
diff
changeset
|
589 | JabberCapsTuple key; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
590 | jabber_caps_cbplususerdata *userdata; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
591 | |
|
27068
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
592 | if (exts && hash) { |
|
28430
14e012d6df66
jabber: Reduce severity of "Ignoring exts..." message.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
593 | purple_debug_misc("jabber", "Ignoring exts in new-style caps from %s\n", |
|
14e012d6df66
jabber: Reduce severity of "Ignoring exts..." message.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
594 | who); |
|
27068
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
595 | g_strfreev(exts); |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
596 | exts = NULL; |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
597 | } |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
598 | |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
599 | /* Using this in a read-only fashion, so the cast is OK */ |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
600 | key.node = (char *)node; |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
601 | key.ver = (char *)ver; |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
602 | key.hash = (char *)hash; |
|
19898
218e4bb04853
Fix mingw build of xmpp prpl
Daniel Atallah <datallah@pidgin.im>
parents:
17836
diff
changeset
|
603 | |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
604 | info = g_hash_table_lookup(capstable, &key); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
605 | if (info && hash) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
606 | /* v1.5 - We already have all the information we care about */ |
|
26992
3a3f6cc07b02
Don't crash when the caps cb is NULL and don't corrupt jabber_identities
Paul Aurich <darkrain42@pidgin.im>
parents:
26973
diff
changeset
|
607 | if (cb) |
|
3a3f6cc07b02
Don't crash when the caps cb is NULL and don't corrupt jabber_identities
Paul Aurich <darkrain42@pidgin.im>
parents:
26973
diff
changeset
|
608 | cb(info, NULL, user_data); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
609 | return; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
610 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
611 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
612 | userdata = g_new0(jabber_caps_cbplususerdata, 1); |
|
27372
571757ab213e
Fix a lost reference when we only fetch an unknown ext.
Paul Aurich <darkrain42@pidgin.im>
parents:
27155
diff
changeset
|
613 | /* We start out with 0 references. Every query takes one */ |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
614 | userdata->cb = cb; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
615 | userdata->cb_data = user_data; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
616 | userdata->who = g_strdup(who); |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
617 | userdata->node = g_strdup(node); |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
618 | userdata->ver = g_strdup(ver); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
619 | userdata->hash = g_strdup(hash); |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
620 | |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
621 | if (info) { |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
622 | userdata->info = info; |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
623 | } else { |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
624 | /* If we don't have the basic information about the client, we need |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
625 | * to fetch it. */ |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
626 | JabberIq *iq; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
627 | PurpleXmlNode *query; |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
628 | char *nodever; |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
629 | |
|
28984
1d84517d56eb
jabber: More namespaces! This is a good stopping point for now.
Paul Aurich <darkrain42@pidgin.im>
parents:
28761
diff
changeset
|
630 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_DISCO_INFO); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
631 | query = purple_xmlnode_get_child_with_namespace(iq->node, "query", |
|
28984
1d84517d56eb
jabber: More namespaces! This is a good stopping point for now.
Paul Aurich <darkrain42@pidgin.im>
parents:
28761
diff
changeset
|
632 | NS_DISCO_INFO); |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
633 | nodever = g_strdup_printf("%s#%s", node, ver); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
634 | purple_xmlnode_set_attrib(query, "node", nodever); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
635 | g_free(nodever); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
636 | purple_xmlnode_set_attrib(iq->node, "to", who); |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
637 | |
|
27372
571757ab213e
Fix a lost reference when we only fetch an unknown ext.
Paul Aurich <darkrain42@pidgin.im>
parents:
27155
diff
changeset
|
638 | cbplususerdata_ref(userdata); |
|
571757ab213e
Fix a lost reference when we only fetch an unknown ext.
Paul Aurich <darkrain42@pidgin.im>
parents:
27155
diff
changeset
|
639 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
640 | jabber_iq_set_callback(iq, jabber_caps_client_iqcb, userdata); |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
641 | jabber_iq_send(iq); |
|
23595
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
642 | } |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
643 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
644 | /* Are there any exts that we don't recognize? */ |
|
27068
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
645 | if (exts) { |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
646 | JabberCapsNodeExts *node_exts; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
647 | int i; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
648 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
649 | if (info) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
650 | if (info->exts) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
651 | node_exts = info->exts; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
652 | else |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
653 | node_exts = info->exts = jabber_caps_find_exts_by_node(node); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
654 | } else |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
655 | /* We'll put it in later once we have the client info */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
656 | node_exts = userdata->node_exts = jabber_caps_find_exts_by_node(node); |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
657 | |
|
27068
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
658 | for (i = 0; exts[i]; ++i) { |
|
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
659 | userdata->exts = g_list_prepend(userdata->exts, exts[i]); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
660 | /* Look it up if we don't already know what it means */ |
|
27068
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
661 | if (!g_hash_table_lookup(node_exts->exts, exts[i])) { |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
662 | JabberIq *iq; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
663 | PurpleXmlNode *query; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
664 | char *nodeext; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
665 | ext_iq_data *cbdata = g_new(ext_iq_data, 1); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
666 | |
|
27068
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
667 | cbdata->name = exts[i]; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
668 | cbdata->data = cbplususerdata_ref(userdata); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
669 | |
|
28984
1d84517d56eb
jabber: More namespaces! This is a good stopping point for now.
Paul Aurich <darkrain42@pidgin.im>
parents:
28761
diff
changeset
|
670 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_DISCO_INFO); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
671 | query = purple_xmlnode_get_child_with_namespace(iq->node, "query", |
|
28984
1d84517d56eb
jabber: More namespaces! This is a good stopping point for now.
Paul Aurich <darkrain42@pidgin.im>
parents:
28761
diff
changeset
|
672 | NS_DISCO_INFO); |
|
27068
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
673 | nodeext = g_strdup_printf("%s#%s", node, exts[i]); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
674 | purple_xmlnode_set_attrib(query, "node", nodeext); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
675 | g_free(nodeext); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
676 | purple_xmlnode_set_attrib(iq->node, "to", who); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
677 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
678 | jabber_iq_set_callback(iq, jabber_caps_ext_iqcb, cbdata); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
679 | jabber_iq_send(iq); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
680 | |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27072
diff
changeset
|
681 | ++userdata->extOutstanding; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
682 | } |
|
27068
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
683 | exts[i] = NULL; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
684 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
685 | /* All the strings are now part of the GList, so don't need |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
686 | * g_strfreev. */ |
|
27068
3353c0f46a1a
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <darkrain42@pidgin.im>
parents:
27067
diff
changeset
|
687 | g_free(exts); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
688 | } |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
689 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
690 | if (userdata->info && userdata->extOutstanding == 0) { |
| 27374 | 691 | /* Start with 1 ref so the below functions are happy */ |
| 692 | userdata->ref = 1; | |
| 693 | ||
|
27372
571757ab213e
Fix a lost reference when we only fetch an unknown ext.
Paul Aurich <darkrain42@pidgin.im>
parents:
27155
diff
changeset
|
694 | /* We have everything we need right now */ |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
695 | jabber_caps_get_info_complete(userdata); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
696 | cbplususerdata_unref(userdata); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
697 | } |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
698 | } |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
699 | |
|
24877
ee51a3be800d
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <darkrain42@pidgin.im>
parents:
24876
diff
changeset
|
700 | static gint |
|
ee51a3be800d
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <darkrain42@pidgin.im>
parents:
24876
diff
changeset
|
701 | jabber_xdata_compare(gconstpointer a, gconstpointer b) |
|
ee51a3be800d
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <darkrain42@pidgin.im>
parents:
24876
diff
changeset
|
702 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
703 | const PurpleXmlNode *aformtypefield = a; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
704 | const PurpleXmlNode *bformtypefield = b; |
|
23589
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
705 | char *aformtype; |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
706 | char *bformtype; |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
707 | int result; |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
708 | |
|
30511
3e43438dbd72
jabber: Move (and harden) a function to xdata.c
Paul Aurich <darkrain42@pidgin.im>
parents:
30509
diff
changeset
|
709 | aformtype = jabber_x_data_get_formtype(aformtypefield); |
|
3e43438dbd72
jabber: Move (and harden) a function to xdata.c
Paul Aurich <darkrain42@pidgin.im>
parents:
30509
diff
changeset
|
710 | bformtype = jabber_x_data_get_formtype(bformtypefield); |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27072
diff
changeset
|
711 | |
|
23589
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
712 | result = strcmp(aformtype, bformtype); |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
713 | g_free(aformtype); |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
714 | g_free(bformtype); |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
715 | return result; |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
716 | } |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
717 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
718 | JabberCapsClientInfo *jabber_caps_parse_client_info(PurpleXmlNode *query) |
|
24732
7d4f758b7b0a
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 <darkrain42@pidgin.im>
parents:
24731
diff
changeset
|
719 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
720 | PurpleXmlNode *child; |
|
24715
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
721 | JabberCapsClientInfo *info; |
|
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
722 | |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
723 | if (!query || !purple_strequal(query->name, "query") || |
|
30507
10c522a4c93a
jabber: Start adding some caps tests
Paul Aurich <darkrain42@pidgin.im>
parents:
29884
diff
changeset
|
724 | !purple_strequal(query->xmlns, NS_DISCO_INFO)) |
|
10c522a4c93a
jabber: Start adding some caps tests
Paul Aurich <darkrain42@pidgin.im>
parents:
29884
diff
changeset
|
725 | return NULL; |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27072
diff
changeset
|
726 | |
|
24715
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
727 | info = g_new0(JabberCapsClientInfo, 1); |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
728 | |
|
23587
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
729 | for(child = query->child; child; child = child->next) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
730 | if (child->type != PURPLE_XMLNODE_TYPE_TAG) |
|
26973
385c3e633e1c
Skip iterating non-node children; thanks to Marcus for crashing me.
Paul Aurich <darkrain42@pidgin.im>
parents:
26905
diff
changeset
|
731 | continue; |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
732 | if (purple_strequal(child->name, "identity")) { |
|
23587
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
733 | /* parse identity */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
734 | const char *category = purple_xmlnode_get_attrib(child, "category"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
735 | const char *type = purple_xmlnode_get_attrib(child, "type"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
736 | const char *name = purple_xmlnode_get_attrib(child, "name"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
737 | const char *lang = purple_xmlnode_get_attrib(child, "lang"); |
|
24726
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
738 | JabberIdentity *id; |
|
23586
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
739 | |
|
24726
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
740 | if (!category || !type) |
|
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
741 | continue; |
|
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
742 | |
|
40137
016690872c6c
Add new and free functions for structs to reduce duplication
qarkai <qarkai@gmail.com>
parents:
40062
diff
changeset
|
743 | id = jabber_identity_new(category, type, lang, name); |
|
23587
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
744 | info->identities = g_list_append(info->identities, id); |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
745 | } else if (purple_strequal(child->name, "feature")) { |
|
23587
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
746 | /* parse feature */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
747 | const char *var = purple_xmlnode_get_attrib(child, "var"); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
748 | if (var) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
749 | info->features = g_list_prepend(info->features, g_strdup(var)); |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
750 | } else if (purple_strequal(child->name, "x")) { |
|
30509
716b12588874
jabber: Minor cleanup (formatting + strcmp->g_str_equal) of caps
Paul Aurich <darkrain42@pidgin.im>
parents:
30508
diff
changeset
|
751 | if (purple_strequal(child->xmlns, "jabber:x:data")) { |
|
23587
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
752 | /* x-data form */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
753 | PurpleXmlNode *dataform = purple_xmlnode_copy(child); |
|
23587
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
754 | info->forms = g_list_append(info->forms, dataform); |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
755 | } |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
756 | } |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
757 | } |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
758 | return info; |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
759 | } |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
760 | |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
761 | static gint jabber_caps_xdata_field_compare(gconstpointer a, gconstpointer b) |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
762 | { |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
763 | const JabberDataFormField *ac = a; |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
764 | const JabberDataFormField *bc = b; |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
765 | |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
766 | return strcmp(ac->var, bc->var); |
|
2ccc80ff0134
* 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:
23589
diff
changeset
|
767 | } |
|
2ccc80ff0134
* 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:
23589
diff
changeset
|
768 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
769 | static GList* jabber_caps_xdata_get_fields(const PurpleXmlNode *x) |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
770 | { |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
771 | GList *fields = NULL; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
772 | PurpleXmlNode *field; |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
773 | |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
774 | if (!x) |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
775 | return NULL; |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
776 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
777 | for (field = purple_xmlnode_get_child(x, "field"); field; field = purple_xmlnode_get_next_twin(field)) { |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
778 | PurpleXmlNode *value; |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
779 | JabberDataFormField *xdatafield = g_new0(JabberDataFormField, 1); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
780 | xdatafield->var = g_strdup(purple_xmlnode_get_attrib(field, "var")); |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
781 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
782 | for (value = purple_xmlnode_get_child(field, "value"); value; value = purple_xmlnode_get_next_twin(value)) { |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
783 | gchar *val = purple_xmlnode_get_data(value); |
|
32757
c904ed620e34
Use g_list_prepend, since we're going to sort this list afterwards.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32277
diff
changeset
|
784 | xdatafield->values = g_list_prepend(xdatafield->values, val); |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
785 | } |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
786 | |
|
24722
4896d0884130
Use strcmp instead of a wrapper
Paul Aurich <darkrain42@pidgin.im>
parents:
24720
diff
changeset
|
787 | xdatafield->values = g_list_sort(xdatafield->values, (GCompareFunc)strcmp); |
|
32757
c904ed620e34
Use g_list_prepend, since we're going to sort this list afterwards.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32277
diff
changeset
|
788 | fields = g_list_prepend(fields, xdatafield); |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
789 | } |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
790 | |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
791 | fields = g_list_sort(fields, jabber_caps_xdata_field_compare); |
|
2ccc80ff0134
* 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:
23589
diff
changeset
|
792 | return fields; |
|
17816
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
793 | } |
|
1b7362b4a7a2
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 <am@adiumx.com>
parents:
diff
changeset
|
794 | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30512
diff
changeset
|
795 | static void |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
796 | append_escaped_string(GChecksum *hash, const gchar *str) |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
797 | { |
|
34567
ea5103f66b0e
Refactor the codebase to use PurpleHash
Ankit Vani <a@nevitus.org>
parents:
34559
diff
changeset
|
798 | g_return_if_fail(hash != NULL); |
|
34556
087db73b115d
Refactored protocols bonjour, gg, jabber to use the GObject-based PurpleCipher
Ankit Vani <a@nevitus.org>
parents:
33909
diff
changeset
|
799 | |
|
30508
80ecb950263a
jabber: Don't crash on caps that include an empty <value/> in the Software Information extended info. Fixes #12292
Paul Aurich <darkrain42@pidgin.im>
parents:
30507
diff
changeset
|
800 | if (str && *str) { |
|
80ecb950263a
jabber: Don't crash on caps that include an empty <value/> in the Software Information extended info. Fixes #12292
Paul Aurich <darkrain42@pidgin.im>
parents:
30507
diff
changeset
|
801 | char *tmp = g_markup_escape_text(str, -1); |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
802 | g_checksum_update(hash, (const guchar *)tmp, -1); |
|
30508
80ecb950263a
jabber: Don't crash on caps that include an empty <value/> in the Software Information extended info. Fixes #12292
Paul Aurich <darkrain42@pidgin.im>
parents:
30507
diff
changeset
|
803 | g_free(tmp); |
|
80ecb950263a
jabber: Don't crash on caps that include an empty <value/> in the Software Information extended info. Fixes #12292
Paul Aurich <darkrain42@pidgin.im>
parents:
30507
diff
changeset
|
804 | } |
|
80ecb950263a
jabber: Don't crash on caps that include an empty <value/> in the Software Information extended info. Fixes #12292
Paul Aurich <darkrain42@pidgin.im>
parents:
30507
diff
changeset
|
805 | |
|
38339
9c9277601d98
Avoid hardcoding buffer sizes passed to g_checksum_update()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38337
diff
changeset
|
806 | g_checksum_update(hash, (const guchar *)"<", -1); |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
807 | } |
|
2ccc80ff0134
* 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:
23589
diff
changeset
|
808 | |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
809 | gchar *jabber_caps_calculate_hash(JabberCapsClientInfo *info, |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
810 | GChecksumType hash_type) |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
811 | { |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
812 | GChecksum *hash; |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
813 | GList *node; |
|
38336
db6beb747e05
jabber: Rework jabber_caps_calculate_hash() to allow any size digest
Mike Ruprecht <cmaiku@gmail.com>
parents:
38335
diff
changeset
|
814 | guint8 *checksum; |
|
db6beb747e05
jabber: Rework jabber_caps_calculate_hash() to allow any size digest
Mike Ruprecht <cmaiku@gmail.com>
parents:
38335
diff
changeset
|
815 | gsize checksum_size; |
|
db6beb747e05
jabber: Rework jabber_caps_calculate_hash() to allow any size digest
Mike Ruprecht <cmaiku@gmail.com>
parents:
38335
diff
changeset
|
816 | gchar *ret; |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
817 | |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
818 | if (!info) |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
819 | return NULL; |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
820 | |
|
23589
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
821 | /* sort identities, features and x-data forms */ |
|
24877
ee51a3be800d
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <darkrain42@pidgin.im>
parents:
24876
diff
changeset
|
822 | info->identities = g_list_sort(info->identities, jabber_identity_compare); |
|
24722
4896d0884130
Use strcmp instead of a wrapper
Paul Aurich <darkrain42@pidgin.im>
parents:
24720
diff
changeset
|
823 | info->features = g_list_sort(info->features, (GCompareFunc)strcmp); |
|
24877
ee51a3be800d
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <darkrain42@pidgin.im>
parents:
24876
diff
changeset
|
824 | info->forms = g_list_sort(info->forms, jabber_xdata_compare); |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
825 | |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
826 | hash = g_checksum_new(hash_type); |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
827 | |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
828 | if (hash == NULL) { |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
829 | return NULL; |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
830 | } |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
831 | |
|
29884
ff188aef0c49
jabber: Space efficiency.
Paul Aurich <darkrain42@pidgin.im>
parents:
28984
diff
changeset
|
832 | /* Add identities to the hash data */ |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
833 | for (node = info->identities; node; node = node->next) { |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
834 | JabberIdentity *id = (JabberIdentity*)node->data; |
|
26996
44abdee116bf
Sadrul pointed me at g_markup_escape_text, thanks!
Paul Aurich <darkrain42@pidgin.im>
parents:
26995
diff
changeset
|
835 | char *category = g_markup_escape_text(id->category, -1); |
|
44abdee116bf
Sadrul pointed me at g_markup_escape_text, thanks!
Paul Aurich <darkrain42@pidgin.im>
parents:
26995
diff
changeset
|
836 | char *type = g_markup_escape_text(id->type, -1); |
|
27015
3d6982f39a5b
Avoid a g_markup_escape_text assertion failure
Paul Aurich <darkrain42@pidgin.im>
parents:
26996
diff
changeset
|
837 | char *lang = NULL; |
|
3d6982f39a5b
Avoid a g_markup_escape_text assertion failure
Paul Aurich <darkrain42@pidgin.im>
parents:
26996
diff
changeset
|
838 | char *name = NULL; |
|
29884
ff188aef0c49
jabber: Space efficiency.
Paul Aurich <darkrain42@pidgin.im>
parents:
28984
diff
changeset
|
839 | char *tmp; |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27072
diff
changeset
|
840 | |
|
27015
3d6982f39a5b
Avoid a g_markup_escape_text assertion failure
Paul Aurich <darkrain42@pidgin.im>
parents:
26996
diff
changeset
|
841 | if (id->lang) |
|
3d6982f39a5b
Avoid a g_markup_escape_text assertion failure
Paul Aurich <darkrain42@pidgin.im>
parents:
26996
diff
changeset
|
842 | lang = g_markup_escape_text(id->lang, -1); |
|
3d6982f39a5b
Avoid a g_markup_escape_text assertion failure
Paul Aurich <darkrain42@pidgin.im>
parents:
26996
diff
changeset
|
843 | if (id->name) |
|
3d6982f39a5b
Avoid a g_markup_escape_text assertion failure
Paul Aurich <darkrain42@pidgin.im>
parents:
26996
diff
changeset
|
844 | name = g_markup_escape_text(id->name, -1); |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
845 | |
|
29884
ff188aef0c49
jabber: Space efficiency.
Paul Aurich <darkrain42@pidgin.im>
parents:
28984
diff
changeset
|
846 | tmp = g_strconcat(category, "/", type, "/", lang ? lang : "", |
|
ff188aef0c49
jabber: Space efficiency.
Paul Aurich <darkrain42@pidgin.im>
parents:
28984
diff
changeset
|
847 | "/", name ? name : "", "<", NULL); |
|
26995
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
848 | |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
849 | g_checksum_update(hash, (const guchar *)tmp, -1); |
|
29884
ff188aef0c49
jabber: Space efficiency.
Paul Aurich <darkrain42@pidgin.im>
parents:
28984
diff
changeset
|
850 | |
|
ff188aef0c49
jabber: Space efficiency.
Paul Aurich <darkrain42@pidgin.im>
parents:
28984
diff
changeset
|
851 | g_free(tmp); |
|
26995
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
852 | g_free(category); |
|
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
853 | g_free(type); |
|
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
854 | g_free(lang); |
|
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
855 | g_free(name); |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
856 | } |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
857 | |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
858 | /* concat features to the verification string */ |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
859 | for (node = info->features; node; node = node->next) { |
|
34556
087db73b115d
Refactored protocols bonjour, gg, jabber to use the GObject-based PurpleCipher
Ankit Vani <a@nevitus.org>
parents:
33909
diff
changeset
|
860 | append_escaped_string(hash, node->data); |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
861 | } |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
862 | |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
863 | /* concat x-data forms to the verification string */ |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
864 | for(node = info->forms; node; node = node->next) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
865 | PurpleXmlNode *data = (PurpleXmlNode *)node->data; |
|
30511
3e43438dbd72
jabber: Move (and harden) a function to xdata.c
Paul Aurich <darkrain42@pidgin.im>
parents:
30509
diff
changeset
|
866 | gchar *formtype = jabber_x_data_get_formtype(data); |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
867 | GList *fields = jabber_caps_xdata_get_fields(data); |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
868 | |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
869 | /* append FORM_TYPE's field value to the verification string */ |
|
34556
087db73b115d
Refactored protocols bonjour, gg, jabber to use the GObject-based PurpleCipher
Ankit Vani <a@nevitus.org>
parents:
33909
diff
changeset
|
870 | append_escaped_string(hash, formtype); |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
871 | g_free(formtype); |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
872 | |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
873 | while (fields) { |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27072
diff
changeset
|
874 | JabberDataFormField *field = (JabberDataFormField*)fields->data; |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
875 | |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31797
diff
changeset
|
876 | if (!purple_strequal(field->var, "FORM_TYPE")) { |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
877 | /* Append the "var" attribute */ |
|
34556
087db73b115d
Refactored protocols bonjour, gg, jabber to use the GObject-based PurpleCipher
Ankit Vani <a@nevitus.org>
parents:
33909
diff
changeset
|
878 | append_escaped_string(hash, field->var); |
|
24877
ee51a3be800d
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <darkrain42@pidgin.im>
parents:
24876
diff
changeset
|
879 | /* Append <value/> elements' cdata */ |
|
32758
33d63f2da957
Fix some leaks in XMPP caps hashing, as pointed out by max ulidtko.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32757
diff
changeset
|
880 | while (field->values) { |
|
34556
087db73b115d
Refactored protocols bonjour, gg, jabber to use the GObject-based PurpleCipher
Ankit Vani <a@nevitus.org>
parents:
33909
diff
changeset
|
881 | append_escaped_string(hash, field->values->data); |
|
32758
33d63f2da957
Fix some leaks in XMPP caps hashing, as pointed out by max ulidtko.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32757
diff
changeset
|
882 | g_free(field->values->data); |
|
33d63f2da957
Fix some leaks in XMPP caps hashing, as pointed out by max ulidtko.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32757
diff
changeset
|
883 | field->values = g_list_delete_link(field->values, |
|
33d63f2da957
Fix some leaks in XMPP caps hashing, as pointed out by max ulidtko.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32757
diff
changeset
|
884 | field->values); |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
885 | } |
|
32758
33d63f2da957
Fix some leaks in XMPP caps hashing, as pointed out by max ulidtko.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32757
diff
changeset
|
886 | } else { |
|
39897
16b440d4ab36
Use g_list_free_full instead of g_list_foreach+g_list_free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39556
diff
changeset
|
887 | g_list_free_full(field->values, g_free); |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
888 | } |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
889 | |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
890 | g_free(field->var); |
|
32758
33d63f2da957
Fix some leaks in XMPP caps hashing, as pointed out by max ulidtko.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32757
diff
changeset
|
891 | g_free(field); |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
892 | |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
893 | fields = g_list_delete_link(fields, fields); |
|
23590
2ccc80ff0134
* 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:
23589
diff
changeset
|
894 | } |
|
2ccc80ff0134
* 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:
23589
diff
changeset
|
895 | } |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
896 | |
|
38336
db6beb747e05
jabber: Rework jabber_caps_calculate_hash() to allow any size digest
Mike Ruprecht <cmaiku@gmail.com>
parents:
38335
diff
changeset
|
897 | checksum_size = g_checksum_type_get_length(hash_type); |
|
db6beb747e05
jabber: Rework jabber_caps_calculate_hash() to allow any size digest
Mike Ruprecht <cmaiku@gmail.com>
parents:
38335
diff
changeset
|
898 | checksum = g_new(guint8, checksum_size); |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
899 | |
|
23593
149bce500f4e
* support for calculating both hashes, sha-1 and md5
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23591
diff
changeset
|
900 | /* generate hash */ |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
901 | g_checksum_get_digest(hash, checksum, &checksum_size); |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
902 | |
|
38341
3da74e727e78
Remove purple_base64_encode/decode() wrappers
Mike Ruprecht <cmaiku@gmail.com>
parents:
38339
diff
changeset
|
903 | ret = g_base64_encode(checksum, checksum_size); |
|
38336
db6beb747e05
jabber: Rework jabber_caps_calculate_hash() to allow any size digest
Mike Ruprecht <cmaiku@gmail.com>
parents:
38335
diff
changeset
|
904 | g_free(checksum); |
|
40264
d253f767f6cc
fix various memory leaks
Fabrice Bellet <fabrice@bellet.info>
parents:
40137
diff
changeset
|
905 | g_checksum_free(hash); |
|
38336
db6beb747e05
jabber: Rework jabber_caps_calculate_hash() to allow any size digest
Mike Ruprecht <cmaiku@gmail.com>
parents:
38335
diff
changeset
|
906 | |
|
db6beb747e05
jabber: Rework jabber_caps_calculate_hash() to allow any size digest
Mike Ruprecht <cmaiku@gmail.com>
parents:
38335
diff
changeset
|
907 | return ret; |
|
23587
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
908 | } |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
909 | |
|
23595
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
910 | void jabber_caps_calculate_own_hash(JabberStream *js) { |
|
24734
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
911 | JabberCapsClientInfo info; |
|
37390
209a1350d87f
Assign pointers to NULL rather than 0.
Michael McConville <mmcconville@mykolab.com>
parents:
37133
diff
changeset
|
912 | GList *iter = NULL; |
|
209a1350d87f
Assign pointers to NULL rather than 0.
Michael McConville <mmcconville@mykolab.com>
parents:
37133
diff
changeset
|
913 | GList *features = NULL; |
|
23586
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
914 | |
|
24734
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
915 | if (!jabber_identities && !jabber_features) { |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
916 | /* This really shouldn't ever happen */ |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
917 | purple_debug_warning("jabber", "No features or identities, cannot calculate own caps hash.\n"); |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
918 | g_free(js->caps_hash); |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
919 | js->caps_hash = NULL; |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
920 | return; |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
921 | } |
|
23599
ac402ffdcbec
* removing several warnings
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23597
diff
changeset
|
922 | |
|
24734
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
923 | /* build the currently-supported list of features */ |
|
23595
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
924 | if (jabber_features) { |
|
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
925 | for (iter = jabber_features; iter; iter = iter->next) { |
|
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
926 | JabberFeature *feat = iter->data; |
|
24734
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
927 | if(!feat->is_enabled || feat->is_enabled(js, feat->namespace)) { |
|
23595
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
928 | features = g_list_append(features, feat->namespace); |
|
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
929 | } |
|
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
930 | } |
|
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
931 | } |
|
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
932 | |
|
24734
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
933 | info.features = features; |
|
30512
f0f51b3a3f30
jabber: Move another function out of caps.c...
Paul Aurich <darkrain42@pidgin.im>
parents:
30511
diff
changeset
|
934 | /* TODO: This copy can go away, I think, since jabber_identities |
|
f0f51b3a3f30
jabber: Move another function out of caps.c...
Paul Aurich <darkrain42@pidgin.im>
parents:
30511
diff
changeset
|
935 | * is pre-sorted, so the sort in calculate_hash should be idempotent. |
|
f0f51b3a3f30
jabber: Move another function out of caps.c...
Paul Aurich <darkrain42@pidgin.im>
parents:
30511
diff
changeset
|
936 | * However, I want to test that. --darkrain |
|
f0f51b3a3f30
jabber: Move another function out of caps.c...
Paul Aurich <darkrain42@pidgin.im>
parents:
30511
diff
changeset
|
937 | */ |
|
26992
3a3f6cc07b02
Don't crash when the caps cb is NULL and don't corrupt jabber_identities
Paul Aurich <darkrain42@pidgin.im>
parents:
26973
diff
changeset
|
938 | info.identities = g_list_copy(jabber_identities); |
|
24734
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
939 | info.forms = NULL; |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
940 | |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
941 | g_free(js->caps_hash); |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
37390
diff
changeset
|
942 | js->caps_hash = jabber_caps_calculate_hash(&info, G_CHECKSUM_SHA1); |
|
26992
3a3f6cc07b02
Don't crash when the caps cb is NULL and don't corrupt jabber_identities
Paul Aurich <darkrain42@pidgin.im>
parents:
26973
diff
changeset
|
943 | g_list_free(info.identities); |
|
28761
e961b3237237
jabber: Plug another leak.
Paul Aurich <darkrain42@pidgin.im>
parents:
28430
diff
changeset
|
944 | g_list_free(info.features); |
|
23586
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
945 | } |
|
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
946 | |
|
24716
047f5075ca58
Entity Capabilities must be per-JabberStream
Paul Aurich <darkrain42@pidgin.im>
parents:
24715
diff
changeset
|
947 | const gchar* jabber_caps_get_own_hash(JabberStream *js) |
|
047f5075ca58
Entity Capabilities must be per-JabberStream
Paul Aurich <darkrain42@pidgin.im>
parents:
24715
diff
changeset
|
948 | { |
|
047f5075ca58
Entity Capabilities must be per-JabberStream
Paul Aurich <darkrain42@pidgin.im>
parents:
24715
diff
changeset
|
949 | if (!js->caps_hash) |
|
047f5075ca58
Entity Capabilities must be per-JabberStream
Paul Aurich <darkrain42@pidgin.im>
parents:
24715
diff
changeset
|
950 | jabber_caps_calculate_own_hash(js); |
|
047f5075ca58
Entity Capabilities must be per-JabberStream
Paul Aurich <darkrain42@pidgin.im>
parents:
24715
diff
changeset
|
951 | |
|
047f5075ca58
Entity Capabilities must be per-JabberStream
Paul Aurich <darkrain42@pidgin.im>
parents:
24715
diff
changeset
|
952 | return js->caps_hash; |
|
23586
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
953 | } |
|
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
954 | |
|
24717
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
955 | void jabber_caps_broadcast_change() |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
956 | { |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
957 | GList *node, *accounts = purple_accounts_get_all_active(); |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
958 | |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
959 | for (node = accounts; node; node = node->next) { |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
960 | PurpleAccount *account = node->data; |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
34567
diff
changeset
|
961 | const char *protocol_id = purple_account_get_protocol_id(account); |
| 38358 | 962 | if (purple_strequal("prpl-jabber", protocol_id) && purple_account_is_connected(account)) { |
|
24717
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
963 | PurpleConnection *gc = purple_account_get_connection(account); |
|
32277
97f16af01a05
Convert jabber prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents:
31797
diff
changeset
|
964 | jabber_presence_send(purple_connection_get_protocol_data(gc), TRUE); |
|
23601
f7e44345f4b9
* implemented jabber_caps_broadcast_change() and finished jabber_ipc_add_feature() IPC function
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23600
diff
changeset
|
965 | } |
|
f7e44345f4b9
* implemented jabber_caps_broadcast_change() and finished jabber_ipc_add_feature() IPC function
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23600
diff
changeset
|
966 | } |
|
24717
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
967 | |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
968 | g_list_free(accounts); |
|
23601
f7e44345f4b9
* implemented jabber_caps_broadcast_change() and finished jabber_ipc_add_feature() IPC function
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23600
diff
changeset
|
969 | } |
|
f7e44345f4b9
* implemented jabber_caps_broadcast_change() and finished jabber_ipc_add_feature() IPC function
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23600
diff
changeset
|
970 |