Sun, 03 May 2009 06:36:05 +0000
Avoid a g_markup_escape_text assertion failure
|
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 | * |
|
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
|
4 | * Copyright (C) 2007, Andreas Monitzer <andy@monitzer.com> |
|
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
|
5 | * |
|
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
|
6 | * 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
|
7 | * 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
|
8 | * 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
|
9 | * (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
|
10 | * |
|
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 | * 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
|
12 | * 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
|
13 | * 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
|
14 | * 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
|
15 | * |
|
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 | * 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
|
17 | * along with this program; if not, write to the Free Software |
|
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 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
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 | * |
|
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
|
20 | */ |
|
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 | |
|
19898
218e4bb04853
Fix mingw build of xmpp prpl
Daniel Atallah <datallah@pidgin.im>
parents:
17836
diff
changeset
|
22 | #include "internal.h" |
|
218e4bb04853
Fix mingw build of xmpp prpl
Daniel Atallah <datallah@pidgin.im>
parents:
17836
diff
changeset
|
23 | |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
24 | #include "debug.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
|
25 | #include "caps.h" |
|
23586
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
26 | #include "cipher.h" |
|
24715
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
27 | #include "iq.h" |
|
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
28 | #include "presence.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
|
29 | #include "util.h" |
|
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
|
30 | |
|
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
|
31 | #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
|
32 | |
|
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
|
33 | typedef struct _JabberDataFormField { |
|
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
|
34 | 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
|
35 | 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
|
36 | } 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
|
37 | |
|
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
|
38 | typedef struct _JabberCapsKey { |
|
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 | 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
|
40 | char *ver; |
|
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
|
41 | char *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
|
42 | } JabberCapsKey; |
|
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 | |
|
24736
42ffd8ecdb6e
Make capstable caps.c-only and add a jabber_caps_uninit() function
Paul Aurich <darkrain42@pidgin.im>
parents:
24735
diff
changeset
|
44 | static GHashTable *capstable = NULL; /* JabberCapsKey -> JabberCapsClientInfo */ |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
45 | 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
|
46 | 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
|
47 | |
|
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
|
48 | /** |
|
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
|
49 | * Processes a query-node and returns a JabberCapsClientInfo object with all relevant info. |
|
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
|
50 | * |
|
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
|
51 | * @param query A query object. |
|
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
|
52 | * @return A JabberCapsClientInfo object. |
|
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
|
53 | */ |
|
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
|
54 | static JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query); |
|
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
|
55 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
56 | /* 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
|
57 | static void |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
58 | 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
|
59 | { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
60 | g_list_foreach(list, (GFunc)g_free, NULL); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
61 | g_list_free(list); |
|
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 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
64 | static JabberCapsNodeExts* |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
65 | 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
|
66 | { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
67 | 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
|
68 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
69 | ++exts->ref; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
70 | return exts; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
71 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
72 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
73 | static void |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
74 | 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
|
75 | { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
76 | if (exts == NULL) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
77 | return; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
78 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
79 | 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
|
80 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
81 | 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
|
82 | return; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
83 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
84 | 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
|
85 | g_free(exts); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
86 | } |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24029
diff
changeset
|
87 | |
|
24879
823943d2f2b9
Rename a few variables
Paul Aurich <darkrain42@pidgin.im>
parents:
24878
diff
changeset
|
88 | static guint jabber_caps_hash(gconstpointer data) { |
|
823943d2f2b9
Rename a few variables
Paul Aurich <darkrain42@pidgin.im>
parents:
24878
diff
changeset
|
89 | const JabberCapsKey *key = data; |
|
823943d2f2b9
Rename a few variables
Paul Aurich <darkrain42@pidgin.im>
parents:
24878
diff
changeset
|
90 | 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
|
91 | 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
|
92 | /* |
|
61eac5fd16fe
Use purple_strequal and g_str_equal
Paul Aurich <darkrain42@pidgin.im>
parents:
26708
diff
changeset
|
93 | * '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
|
94 | * 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
|
95 | * a Deku Shrub... |
|
61eac5fd16fe
Use purple_strequal and g_str_equal
Paul Aurich <darkrain42@pidgin.im>
parents:
26708
diff
changeset
|
96 | */ |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
97 | 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
|
98 | 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
|
99 | } |
|
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
|
100 | |
|
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
|
101 | static gboolean jabber_caps_compare(gconstpointer v1, gconstpointer v2) { |
|
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
|
102 | const JabberCapsKey *name1 = v1; |
|
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
|
103 | const JabberCapsKey *name2 = v2; |
|
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
|
104 | |
|
26905
61eac5fd16fe
Use purple_strequal and g_str_equal
Paul Aurich <darkrain42@pidgin.im>
parents:
26708
diff
changeset
|
105 | return g_str_equal(name1->node, name2->node) && |
|
61eac5fd16fe
Use purple_strequal and g_str_equal
Paul Aurich <darkrain42@pidgin.im>
parents:
26708
diff
changeset
|
106 | g_str_equal(name1->ver, name2->ver) && |
|
61eac5fd16fe
Use purple_strequal and g_str_equal
Paul Aurich <darkrain42@pidgin.im>
parents:
26708
diff
changeset
|
107 | 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
|
108 | } |
|
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
|
109 | |
|
24879
823943d2f2b9
Rename a few variables
Paul Aurich <darkrain42@pidgin.im>
parents:
24878
diff
changeset
|
110 | void jabber_caps_destroy_key(gpointer data) { |
|
823943d2f2b9
Rename a few variables
Paul Aurich <darkrain42@pidgin.im>
parents:
24878
diff
changeset
|
111 | JabberCapsKey *key = data; |
|
823943d2f2b9
Rename a few variables
Paul Aurich <darkrain42@pidgin.im>
parents:
24878
diff
changeset
|
112 | g_free(key->node); |
|
823943d2f2b9
Rename a few variables
Paul Aurich <darkrain42@pidgin.im>
parents:
24878
diff
changeset
|
113 | g_free(key->ver); |
|
823943d2f2b9
Rename a few variables
Paul Aurich <darkrain42@pidgin.im>
parents:
24878
diff
changeset
|
114 | g_free(key->hash); |
|
823943d2f2b9
Rename a few variables
Paul Aurich <darkrain42@pidgin.im>
parents:
24878
diff
changeset
|
115 | g_free(key); |
|
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 | |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
118 | static void |
|
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
119 | jabber_caps_client_info_destroy(JabberCapsClientInfo *info) |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
120 | { |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
121 | if (info == NULL) |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
122 | return; |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
123 | |
|
24731
c0a5e4f2bed5
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <darkrain42@pidgin.im>
parents:
24730
diff
changeset
|
124 | while(info->identities) { |
|
c0a5e4f2bed5
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <darkrain42@pidgin.im>
parents:
24730
diff
changeset
|
125 | JabberIdentity *id = info->identities->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
|
126 | g_free(id->category); |
|
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
|
127 | g_free(id->type); |
|
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
|
128 | g_free(id->name); |
|
24725
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
129 | g_free(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
|
130 | g_free(id); |
|
24731
c0a5e4f2bed5
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <darkrain42@pidgin.im>
parents:
24730
diff
changeset
|
131 | info->identities = g_list_delete_link(info->identities, info->identities); |
|
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
|
132 | } |
|
24731
c0a5e4f2bed5
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <darkrain42@pidgin.im>
parents:
24730
diff
changeset
|
133 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
134 | free_string_glist(info->features); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
135 | free_string_glist(info->forms); |
|
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
|
136 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
137 | 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
|
138 | |
|
c0a5e4f2bed5
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <darkrain42@pidgin.im>
parents:
24730
diff
changeset
|
139 | 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
|
140 | } |
|
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
|
141 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
142 | /* 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
|
143 | * keep it around. */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
144 | static JabberCapsNodeExts* |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
145 | 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
|
146 | { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
147 | JabberCapsNodeExts *exts; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
148 | 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
|
149 | 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
|
150 | 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
|
151 | (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
|
152 | 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
|
153 | } |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
154 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
155 | 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
|
156 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
157 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
158 | 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
|
159 | 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
|
160 | { |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
161 | 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
|
162 | const GList *features = value, *node; |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
163 | xmlnode *client = user_data, *ext, *feature; |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
164 | |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
165 | ext = xmlnode_new_child(client, "ext"); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
166 | xmlnode_set_attrib(ext, "identifier", identifier); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
167 | |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
168 | for (node = features; node; node = node->next) { |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
169 | feature = xmlnode_new_child(ext, "feature"); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
170 | 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
|
171 | } |
|
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
|
172 | } |
|
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
|
173 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
174 | static void jabber_caps_store_client(gpointer key, gpointer 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
|
175 | JabberCapsKey *clientinfo = key; |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
176 | JabberCapsClientInfo *props = value; |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
177 | xmlnode *root = 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
|
178 | xmlnode *client = xmlnode_new_child(root, "client"); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
179 | 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
|
180 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
181 | xmlnode_set_attrib(client, "node", clientinfo->node); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
182 | xmlnode_set_attrib(client, "ver", clientinfo->ver); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
183 | if (clientinfo->hash) |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
184 | xmlnode_set_attrib(client, "hash", clientinfo->hash); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
185 | 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
|
186 | JabberIdentity *id = iter->data; |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
187 | xmlnode *identity = xmlnode_new_child(client, "identity"); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
188 | xmlnode_set_attrib(identity, "category", id->category); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
189 | xmlnode_set_attrib(identity, "type", id->type); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
190 | if (id->name) |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
191 | xmlnode_set_attrib(identity, "name", id->name); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
192 | if (id->lang) |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
193 | 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
|
194 | } |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
195 | |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
196 | 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
|
197 | const char *feat = iter->data; |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
198 | xmlnode *feature = xmlnode_new_child(client, "feature"); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
199 | 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
|
200 | } |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
201 | |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
202 | 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
|
203 | /* FIXME: See #7814 */ |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
204 | xmlnode *xdata = iter->data; |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
205 | xmlnode_insert_child(client, xmlnode_copy(xdata)); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
206 | } |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
207 | |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
208 | /* 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
|
209 | 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
|
210 | 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
|
211 | } |
|
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
|
212 | |
|
24881
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 gboolean |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
214 | 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
|
215 | { |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
216 | 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
|
217 | int length = 0; |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
218 | xmlnode *root = xmlnode_new("capabilities"); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
219 | g_hash_table_foreach(capstable, jabber_caps_store_client, root); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
220 | str = xmlnode_to_formatted_str(root, &length); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
221 | xmlnode_free(root); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
222 | purple_util_write_data_to_file(JABBER_CAPS_FILENAME, str, length); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
223 | 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
|
224 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
225 | 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
|
226 | 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
|
227 | } |
|
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
|
228 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
229 | 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
|
230 | 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
|
231 | { |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
232 | if (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
|
233 | save_timer = purple_timeout_add_seconds(5, do_jabber_caps_store, NULL); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
234 | } |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
235 | |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
236 | 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
|
237 | 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
|
238 | { |
|
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
|
239 | xmlnode *capsdata = purple_util_read_xml_from_file(JABBER_CAPS_FILENAME, "XMPP capabilities cache"); |
|
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
|
240 | xmlnode *client; |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
241 | |
|
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
242 | 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
|
243 | return; |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
244 | |
|
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
245 | if (strcmp(capsdata->name, "capabilities") != 0) { |
|
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
246 | xmlnode_free(capsdata); |
|
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
247 | return; |
|
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
248 | } |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24029
diff
changeset
|
249 | |
|
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
|
250 | for(client = capsdata->child; client; client = client->next) { |
|
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
|
251 | if(client->type != XMLNODE_TYPE_TAG) |
|
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
|
252 | 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
|
253 | if(!strcmp(client->name, "client")) { |
|
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
|
254 | JabberCapsKey *key = g_new0(JabberCapsKey, 1); |
|
24731
c0a5e4f2bed5
Rename some structs and the JabberCapsClientInfo destruction function
Paul Aurich <darkrain42@pidgin.im>
parents:
24730
diff
changeset
|
255 | JabberCapsClientInfo *value = g_new0(JabberCapsClientInfo, 1); |
|
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
|
256 | xmlnode *child; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
257 | JabberCapsNodeExts *exts = 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
|
258 | key->node = g_strdup(xmlnode_get_attrib(client,"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
|
259 | key->ver = g_strdup(xmlnode_get_attrib(client,"ver")); |
|
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
|
260 | key->hash = g_strdup(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
|
261 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
262 | /* v1.3 capabilities */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
263 | 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
|
264 | 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
|
265 | |
|
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
|
266 | for(child = client->child; child; child = child->next) { |
|
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
|
267 | if(child->type != XMLNODE_TYPE_TAG) |
|
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
|
268 | 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
|
269 | if(!strcmp(child->name,"feature")) { |
|
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
|
270 | const char *var = xmlnode_get_attrib(child, "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
|
271 | 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
|
272 | 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
|
273 | value->features = g_list_append(value->features,g_strdup(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
|
274 | } else if(!strcmp(child->name,"identity")) { |
|
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
|
275 | const char *category = xmlnode_get_attrib(child, "category"); |
|
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
|
276 | const char *type = xmlnode_get_attrib(child, "type"); |
|
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
|
277 | const char *name = xmlnode_get_attrib(child, "name"); |
|
24725
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
278 | const char *lang = xmlnode_get_attrib(child, "lang"); |
|
24726
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
279 | 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
|
280 | |
|
24726
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
281 | if (!category || !type) |
|
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
282 | continue; |
|
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
283 | |
|
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
284 | id = g_new0(JabberIdentity, 1); |
|
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
|
285 | id->category = g_strdup(category); |
|
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
|
286 | id->type = g_strdup(type); |
|
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
|
287 | id->name = g_strdup(name); |
|
24725
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
288 | id->lang = g_strdup(lang); |
|
26995
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
289 | |
|
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
|
290 | value->identities = g_list_append(value->identities,id); |
|
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
|
291 | } else if(!strcmp(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
|
292 | /* 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
|
293 | * 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
|
294 | * work properly, that bug needs to be fixed in |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
295 | * xmlnode_from_str, not the output version... */ |
|
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
|
296 | value->forms = g_list_append(value->forms, xmlnode_copy(child)); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
297 | } else if (!strcmp(child->name, "ext") && key->hash != NULL) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
298 | purple_debug_warning("jabber", "Ignoring exts when reading new-style caps\n"); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
299 | } else if (!strcmp(child->name, "ext")) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
300 | /* TODO: Do we care about reading in the identities listed here? */ |
|
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
|
301 | const char *identifier = xmlnode_get_attrib(child, "identifier"); |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
302 | xmlnode *node; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
303 | GList *features = NULL; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
304 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
305 | if (!identifier) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
306 | continue; |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24029
diff
changeset
|
307 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
308 | for (node = child->child; node; node = node->next) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
309 | if (node->type != XMLNODE_TYPE_TAG) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
310 | continue; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
311 | if (!strcmp(node->name, "feature")) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
312 | const char *var = xmlnode_get_attrib(node, "var"); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
313 | if (!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
|
314 | continue; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
315 | 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
|
316 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
317 | } |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24029
diff
changeset
|
318 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
319 | if (features) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
320 | g_hash_table_insert(exts->exts, g_strdup(identifier), |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
321 | features); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
322 | } else |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
323 | purple_debug_warning("jabber", "Caps ext %s had no features.\n", |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
324 | identifier); |
|
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
|
325 | } |
|
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
|
326 | } |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
327 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
328 | 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
|
329 | 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
|
330 | |
|
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
|
331 | } |
|
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
|
332 | } |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
333 | 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
|
334 | } |
|
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
|
335 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
336 | 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
|
337 | { |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
338 | nodetable = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)jabber_caps_node_exts_unref); |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
339 | capstable = g_hash_table_new_full(jabber_caps_hash, jabber_caps_compare, jabber_caps_destroy_key, (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
|
340 | 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
|
341 | } |
|
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
|
342 | |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
343 | 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
|
344 | { |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
345 | if (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
|
346 | purple_timeout_remove(save_timer); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
347 | 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
|
348 | 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
|
349 | } |
|
24881
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
350 | 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
|
351 | g_hash_table_destroy(nodetable); |
|
7a3aa84f6e57
Remove the old if 0'd out caps code and reorder some functions.
Paul Aurich <darkrain42@pidgin.im>
parents:
24880
diff
changeset
|
352 | capstable = 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
|
353 | } |
|
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 | |
|
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
|
355 | typedef struct _jabber_caps_cbplususerdata { |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
356 | guint ref; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
357 | |
|
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
|
358 | 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
|
359 | 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
|
360 | |
|
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
|
361 | 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
|
362 | 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
|
363 | char *ver; |
|
23591
ba1e3ed78d40
* pass hash type to the caps handling functions
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23590
diff
changeset
|
364 | char *hash; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
365 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
366 | JabberCapsClientInfo *info; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
367 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
368 | GList *exts; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
369 | guint extOutstanding; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
370 | 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
|
371 | } 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
|
372 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
373 | 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
|
374 | 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
|
375 | { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
376 | 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
|
377 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
378 | ++data->ref; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
379 | 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
|
380 | } |
|
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
|
381 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
382 | static void |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
383 | 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
|
384 | { |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
385 | if (data == NULL) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
386 | 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
|
387 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
388 | g_return_if_fail(data->ref != 0); |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
389 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
390 | 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
|
391 | return; |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
392 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
393 | 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
|
394 | 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
|
395 | 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
|
396 | 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
|
397 | |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
398 | /* 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
|
399 | if (data->exts) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
400 | 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
|
401 | 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
|
402 | 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
|
403 | 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
|
404 | } |
|
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
|
405 | |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
406 | static void |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
407 | 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
|
408 | { |
|
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
|
409 | 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
|
410 | 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
|
411 | 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
|
412 | 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
|
413 | } |
|
24880
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 | 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
|
416 | 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
|
417 | userdata->ref); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
418 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
419 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
420 | static void |
| 26708 | 421 | jabber_caps_client_iqcb(JabberStream *js, const char *from, JabberIqType type, |
| 422 | const char *id, xmlnode *packet, gpointer data) | |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
423 | { |
|
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
|
424 | xmlnode *query = xmlnode_get_child_with_namespace(packet, "query", |
|
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 | "http://jabber.org/protocol/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
|
426 | 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
|
427 | JabberCapsClientInfo *info = NULL, *value; |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
428 | JabberCapsKey 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
|
429 | |
| 26708 | 430 | 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
|
431 | /* 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
|
432 | 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
|
433 | cbplususerdata_unref(userdata); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
434 | return; |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
435 | } |
|
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
|
436 | |
|
24727
77092d0aaaf0
Whitespace cleanup (no functional changes, just unwrap the huge if block and
Paul Aurich <darkrain42@pidgin.im>
parents:
24726
diff
changeset
|
437 | /* check hash */ |
|
77092d0aaaf0
Whitespace cleanup (no functional changes, just unwrap the huge if block and
Paul Aurich <darkrain42@pidgin.im>
parents:
24726
diff
changeset
|
438 | 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
|
439 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
440 | /* 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
|
441 | if (userdata->hash) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
442 | gchar *hash = NULL; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
443 | if (!strcmp(userdata->hash, "sha-1")) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
444 | hash = jabber_caps_calculate_hash(info, "sha1"); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
445 | } else if (!strcmp(userdata->hash, "md5")) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
446 | hash = jabber_caps_calculate_hash(info, "md5"); |
|
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
|
447 | } |
|
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
|
448 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
449 | if (!hash || strcmp(hash, userdata->ver)) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
450 | purple_debug_warning("jabber", "Could not validate caps info from %s\n", |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
451 | xmlnode_get_attrib(packet, "from")); |
|
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
|
452 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
453 | userdata->cb(NULL, NULL, userdata->cb_data); |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
454 | 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
|
455 | cbplususerdata_unref(userdata); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
456 | g_free(hash); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
457 | 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
|
458 | } |
|
b6955f09ca0b
Don't look up caps exts when the initial caps discovery wasn't successful.
Daniel Atallah <datallah@pidgin.im>
parents:
21720
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 | 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
|
461 | } |
|
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
|
462 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
463 | 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
|
464 | /* 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
|
465 | * 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
|
466 | 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
|
467 | 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
|
468 | } |
|
24715
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
469 | |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
470 | 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
|
471 | key.ver = userdata->ver; |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
472 | 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
|
473 | |
|
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
|
474 | /* 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
|
475 | * a new one if we need to */ |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
476 | if ((value = g_hash_table_lookup(capstable, &key))) { |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
477 | jabber_caps_client_info_destroy(info); |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
478 | info = value; |
|
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
479 | } else { |
|
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
480 | JabberCapsKey *n_key = g_new(JabberCapsKey, 1); |
|
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
481 | 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
|
482 | n_key->ver = userdata->ver; |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
483 | n_key->hash = userdata->hash; |
|
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
484 | userdata->node = userdata->ver = userdata->hash = NULL; |
|
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
485 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
486 | /* The capstable gets a reference */ |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
487 | 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
|
488 | 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
|
489 | } |
|
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
|
490 | |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
491 | userdata->info = info; |
|
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
492 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
493 | 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
|
494 | 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
|
495 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
496 | 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
|
497 | } |
|
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
|
498 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
499 | typedef struct { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
500 | const char *name; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
501 | 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
|
502 | } ext_iq_data; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
503 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
504 | static void |
| 26708 | 505 | jabber_caps_ext_iqcb(JabberStream *js, const char *from, JabberIqType type, |
| 506 | const char *id, xmlnode *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
|
507 | { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
508 | xmlnode *query = xmlnode_get_child_with_namespace(packet, "query", |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
509 | "http://jabber.org/protocol/disco#info"); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
510 | xmlnode *child; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
511 | 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
|
512 | GList *features = NULL; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
513 | JabberCapsNodeExts *node_exts; |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
514 | |
| 26708 | 515 | 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
|
516 | 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
|
517 | g_free(userdata); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
518 | return; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
519 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
520 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
521 | /* 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
|
522 | * 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
|
523 | * 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
|
524 | */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
525 | --userdata->data->extOutstanding; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
526 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
527 | for (child = xmlnode_get_child(query, "feature"); child; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
528 | child = xmlnode_get_next_twin(child)) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
529 | const char *var = xmlnode_get_attrib(child, "var"); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
530 | if (var) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
531 | 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
|
532 | } |
|
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 | node_exts = (userdata->data->info ? userdata->data->info->exts : |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
535 | userdata->data->node_exts); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
536 | 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
|
537 | schedule_caps_save(); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
538 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
539 | /* Are we done? */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
540 | 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
|
541 | 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
|
542 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
543 | cbplususerdata_unref(userdata->data); |
|
24728
4447de55fdf6
Clean up jabber_caps_client_iqcb
Paul Aurich <darkrain42@pidgin.im>
parents:
24727
diff
changeset
|
544 | 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
|
545 | } |
|
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
|
546 | |
| 24720 | 547 | void jabber_caps_get_info(JabberStream *js, const char *who, const char *node, |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
548 | const char *ver, const char *hash, const char *ext, |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
549 | jabber_caps_get_info_cb cb, gpointer user_data) |
| 24720 | 550 | { |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
551 | JabberCapsClientInfo *info; |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
552 | JabberCapsKey key; |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
553 | 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
|
554 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
555 | if (ext && *ext && hash) |
|
26668
ef06285f3b64
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <darkrain42@pidgin.im>
parents:
26658
diff
changeset
|
556 | purple_debug_info("jabber", "Ignoring exts in new-style caps from %s\n", |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
557 | who); |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
558 | |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
559 | /* 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
|
560 | key.node = (char *)node; |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
561 | key.ver = (char *)ver; |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
562 | key.hash = (char *)hash; |
|
19898
218e4bb04853
Fix mingw build of xmpp prpl
Daniel Atallah <datallah@pidgin.im>
parents:
17836
diff
changeset
|
563 | |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
564 | 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
|
565 | if (info && hash) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
566 | /* 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
|
567 | 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
|
568 | 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
|
569 | return; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
570 | } |
|
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 | userdata = g_new0(jabber_caps_cbplususerdata, 1); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
573 | /* This ref is given to fetching the basic node#ver info if we need it |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
574 | * or unrefed at the bottom of this function */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
575 | cbplususerdata_ref(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
|
576 | 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
|
577 | 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
|
578 | 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
|
579 | 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
|
580 | 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
|
581 | userdata->hash = g_strdup(hash); |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
582 | |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
583 | if (info) { |
|
24882
7e842d8123e8
Partial disapproval of 19969457944c4807924bcde3090063b23d35ba17
Paul Aurich <darkrain42@pidgin.im>
parents:
24881
diff
changeset
|
584 | userdata->info = info; |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
585 | } else { |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
586 | /* 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
|
587 | * to fetch it. */ |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
588 | JabberIq *iq; |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
589 | xmlnode *query; |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
590 | char *nodever; |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
591 | |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
592 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
593 | "http://jabber.org/protocol/disco#info"); |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
594 | query = xmlnode_get_child_with_namespace(iq->node, "query", |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
595 | "http://jabber.org/protocol/disco#info"); |
|
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
596 | nodever = g_strdup_printf("%s#%s", node, ver); |
|
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
|
597 | xmlnode_set_attrib(query, "node", nodever); |
|
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
|
598 | g_free(nodever); |
|
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
|
599 | xmlnode_set_attrib(iq->node, "to", who); |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
600 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
601 | 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
|
602 | 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
|
603 | } |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
604 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
605 | /* Are there any exts that we don't recognize? */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
606 | if (ext && *ext && !hash) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
607 | JabberCapsNodeExts *node_exts; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
608 | gchar **splat = g_strsplit(ext, " ", 0); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
609 | int i; |
|
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 | if (info) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
612 | if (info->exts) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
613 | 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
|
614 | else |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
615 | 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
|
616 | } else |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
617 | /* 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
|
618 | 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
|
619 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
620 | for (i = 0; splat[i]; ++i) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
621 | userdata->exts = g_list_prepend(userdata->exts, splat[i]); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
622 | /* Look it up if we don't already know what it means */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
623 | if (!g_hash_table_lookup(node_exts->exts, splat[i])) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
624 | JabberIq *iq; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
625 | xmlnode *query; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
626 | char *nodeext; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
627 | 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
|
628 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
629 | cbdata->name = splat[i]; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
630 | 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
|
631 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
632 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
633 | "http://jabber.org/protocol/disco#info"); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
634 | query = xmlnode_get_child_with_namespace(iq->node, "query", |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
635 | "http://jabber.org/protocol/disco#info"); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
636 | nodeext = g_strdup_printf("%s#%s", node, splat[i]); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
637 | xmlnode_set_attrib(query, "node", nodeext); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
638 | g_free(nodeext); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
639 | xmlnode_set_attrib(iq->node, "to", who); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
640 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
641 | 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
|
642 | 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
|
643 | |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
644 | ++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
|
645 | } |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
646 | splat[i] = NULL; |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
647 | } |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
648 | /* 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
|
649 | * g_strfreev. */ |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
650 | g_free(splat); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
651 | } |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
652 | |
|
24880
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
653 | if (userdata->info && userdata->extOutstanding == 0) { |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
654 | 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
|
655 | cbplususerdata_unref(userdata); |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
656 | } |
|
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
|
657 | } |
|
19930
95cb4da7241e
Various leakfixes and preventing unnecessary allocations.
Daniel Atallah <datallah@pidgin.im>
parents:
19929
diff
changeset
|
658 | |
|
24877
ee51a3be800d
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <darkrain42@pidgin.im>
parents:
24876
diff
changeset
|
659 | 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
|
660 | jabber_identity_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
|
661 | { |
|
23586
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
662 | const JabberIdentity *ac; |
|
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
663 | const JabberIdentity *bc; |
|
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
664 | gint cat_cmp; |
|
23588
9b2741bcecf2
* jabber_caps_jabber_identity_compare() compares xml:lang too, now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23587
diff
changeset
|
665 | gint typ_cmp; |
|
23586
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
666 | |
|
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
667 | ac = a; |
|
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
668 | bc = b; |
|
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
|
669 | |
|
23586
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
670 | if ((cat_cmp = strcmp(ac->category, bc->category)) == 0) { |
|
23588
9b2741bcecf2
* jabber_caps_jabber_identity_compare() compares xml:lang too, now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23587
diff
changeset
|
671 | if ((typ_cmp = strcmp(ac->type, bc->type)) == 0) { |
|
24725
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
672 | if (!ac->lang && !bc->lang) { |
|
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
673 | return 0; |
|
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
674 | } else if (ac->lang && !bc->lang) { |
|
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
675 | return 1; |
|
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
676 | } else if (!ac->lang && bc->lang) { |
|
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
677 | return -1; |
|
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
678 | } else { |
|
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
679 | return strcmp(ac->lang, bc->lang); |
|
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
680 | } |
|
23588
9b2741bcecf2
* jabber_caps_jabber_identity_compare() compares xml:lang too, now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23587
diff
changeset
|
681 | } else { |
|
9b2741bcecf2
* jabber_caps_jabber_identity_compare() compares xml:lang too, now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23587
diff
changeset
|
682 | return typ_cmp; |
|
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
|
683 | } |
|
23586
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
684 | } else { |
|
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
685 | return cat_cmp; |
|
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
|
686 | } |
|
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
|
687 | } |
|
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
|
688 | |
|
24715
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
689 | static gchar *jabber_caps_get_formtype(const xmlnode *x) { |
|
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
|
690 | xmlnode *formtypefield; |
|
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
|
691 | formtypefield = xmlnode_get_child(x, "field"); |
|
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
|
692 | while (formtypefield && strcmp(xmlnode_get_attrib(formtypefield, "var"), "FORM_TYPE")) formtypefield = xmlnode_get_next_twin(formtypefield); |
|
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
|
693 | formtypefield = xmlnode_get_child(formtypefield, "value"); |
|
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
|
694 | return xmlnode_get_data(formtypefield);; |
|
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
|
695 | } |
|
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
|
696 | |
|
24877
ee51a3be800d
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <darkrain42@pidgin.im>
parents:
24876
diff
changeset
|
697 | 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
|
698 | 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
|
699 | { |
|
23599
ac402ffdcbec
* removing several warnings
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23597
diff
changeset
|
700 | const xmlnode *aformtypefield = a; |
|
ac402ffdcbec
* removing several warnings
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23597
diff
changeset
|
701 | const xmlnode *bformtypefield = b; |
|
23589
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
702 | char *aformtype; |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
703 | char *bformtype; |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
704 | 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
|
705 | |
|
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
|
706 | aformtype = jabber_caps_get_formtype(aformtypefield); |
|
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
|
707 | bformtype = jabber_caps_get_formtype(bformtypefield); |
|
23589
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
708 | |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
709 | result = strcmp(aformtype, bformtype); |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
710 | g_free(aformtype); |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
711 | g_free(bformtype); |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
712 | return result; |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
713 | } |
|
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
714 | |
|
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
|
715 | static JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query) |
|
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
|
716 | { |
|
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
|
717 | xmlnode *child; |
|
24715
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
718 | JabberCapsClientInfo *info; |
|
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
719 | |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
720 | if (!query || strcmp(query->xmlns, "http://jabber.org/protocol/disco#info")) |
|
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
721 | return 0; |
|
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
|
722 | |
|
24715
69aaae59e205
Fix compilation errors and many warnings
Paul Aurich <darkrain42@pidgin.im>
parents:
24714
diff
changeset
|
723 | info = g_new0(JabberCapsClientInfo, 1); |
|
24878
19969457944c
Reference-count JabberCapsClientInfo and fix bug.
Paul Aurich <darkrain42@pidgin.im>
parents:
24877
diff
changeset
|
724 | |
|
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
|
725 | for(child = query->child; child; child = child->next) { |
|
26973
385c3e633e1c
Skip iterating non-node children; thanks to Marcus for crashing me.
Paul Aurich <darkrain42@pidgin.im>
parents:
26905
diff
changeset
|
726 | if (child->type != XMLNODE_TYPE_TAG) |
|
385c3e633e1c
Skip iterating non-node children; thanks to Marcus for crashing me.
Paul Aurich <darkrain42@pidgin.im>
parents:
26905
diff
changeset
|
727 | continue; |
|
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
|
728 | if (!strcmp(child->name,"identity")) { |
|
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 | /* parse identity */ |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
730 | const char *category = xmlnode_get_attrib(child, "category"); |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
731 | const char *type = xmlnode_get_attrib(child, "type"); |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
732 | const char *name = xmlnode_get_attrib(child, "name"); |
|
24725
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
733 | const char *lang = xmlnode_get_attrib(child, "lang"); |
|
24726
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
734 | JabberIdentity *id; |
|
23586
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
735 | |
|
24726
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
736 | if (!category || !type) |
|
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
737 | continue; |
|
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
738 | |
|
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
739 | id = g_new0(JabberIdentity, 1); |
|
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
|
740 | id->category = g_strdup(category); |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
741 | id->type = g_strdup(type); |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
742 | id->name = g_strdup(name); |
|
24725
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
743 | id->lang = g_strdup(lang); |
|
c72ba845a930
Don't crash if the lang attribute of an identity is NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
24724
diff
changeset
|
744 | |
|
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
|
745 | info->identities = g_list_append(info->identities, id); |
|
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 | } else if (!strcmp(child->name, "feature")) { |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
747 | /* parse feature */ |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
748 | const char *var = 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
|
749 | if (var) |
|
ae4e8598d0bf
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <darkrain42@pidgin.im>
parents:
24879
diff
changeset
|
750 | info->features = g_list_prepend(info->features, g_strdup(var)); |
|
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
|
751 | } else if (!strcmp(child->name, "x")) { |
|
24726
6d087b9604e5
Error checking and use g_list_foreach
Paul Aurich <darkrain42@pidgin.im>
parents:
24725
diff
changeset
|
752 | if (child->xmlns && !strcmp(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
|
753 | /* x-data form */ |
|
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 | xmlnode *dataform = xmlnode_copy(child); |
|
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 | 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
|
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 | } |
|
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 | 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
|
760 | } |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
761 | |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
762 | 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
|
763 | { |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
764 | const JabberDataFormField *ac = a; |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
765 | const JabberDataFormField *bc = b; |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
766 | |
|
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
|
767 | 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
|
768 | } |
|
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
|
769 | |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
770 | static GList* jabber_caps_xdata_get_fields(const xmlnode *x) |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
771 | { |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
772 | GList *fields = NULL; |
|
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
|
773 | xmlnode *field; |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
774 | |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
775 | if (!x) |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
776 | return NULL; |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
777 | |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
778 | for (field = xmlnode_get_child(x, "field"); field; field = xmlnode_get_next_twin(field)) { |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
779 | xmlnode *value; |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
780 | JabberDataFormField *xdatafield = g_new0(JabberDataFormField, 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
|
781 | xdatafield->var = g_strdup(xmlnode_get_attrib(field, "var")); |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
782 | |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
783 | for (value = xmlnode_get_child(field, "value"); value; value = xmlnode_get_next_twin(value)) { |
|
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
|
784 | gchar *val = xmlnode_get_data(value); |
|
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 | xdatafield->values = g_list_append(xdatafield->values, val); |
|
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
|
786 | } |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
787 | |
|
24722
4896d0884130
Use strcmp instead of a wrapper
Paul Aurich <darkrain42@pidgin.im>
parents:
24720
diff
changeset
|
788 | xdatafield->values = g_list_sort(xdatafield->values, (GCompareFunc)strcmp); |
|
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
|
789 | fields = g_list_append(fields, xdatafield); |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
790 | } |
|
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
791 | |
|
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
|
792 | 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
|
793 | 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
|
794 | } |
|
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
|
795 | |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
796 | static GString* |
|
26995
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
797 | jabber_caps_verification_append(GString *verification, const gchar *str) |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
798 | { |
|
26996
44abdee116bf
Sadrul pointed me at g_markup_escape_text, thanks!
Paul Aurich <darkrain42@pidgin.im>
parents:
26995
diff
changeset
|
799 | char *tmp = g_markup_escape_text(str, -1); |
|
26995
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
800 | verification = g_string_append(verification, tmp); |
|
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
801 | g_free(tmp); |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
802 | return g_string_append_c(verification, '<'); |
|
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
|
803 | } |
|
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
|
804 | |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
805 | gchar *jabber_caps_calculate_hash(JabberCapsClientInfo *info, const char *hash) |
|
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
806 | { |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
807 | GList *node; |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
808 | GString *verification; |
|
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
|
809 | PurpleCipherContext *context; |
|
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
|
810 | guint8 checksum[20]; |
|
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
|
811 | gsize checksum_size = 20; |
|
24877
ee51a3be800d
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <darkrain42@pidgin.im>
parents:
24876
diff
changeset
|
812 | gboolean success; |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
813 | |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
814 | if (!info || !(context = purple_cipher_context_new_by_name(hash, NULL))) |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
815 | return NULL; |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
816 | |
|
23589
91775cc26843
* defined JabberCapsIdentity as struct _JabberIdentity
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23588
diff
changeset
|
817 | /* 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
|
818 | 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
|
819 | 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
|
820 | info->forms = g_list_sort(info->forms, jabber_xdata_compare); |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
821 | |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
822 | verification = g_string_new(""); |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
823 | |
|
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
|
824 | /* concat identities to the verification string */ |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
825 | for (node = info->identities; node; node = node->next) { |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
826 | 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
|
827 | 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
|
828 | 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
|
829 | char *lang = NULL; |
|
3d6982f39a5b
Avoid a g_markup_escape_text assertion failure
Paul Aurich <darkrain42@pidgin.im>
parents:
26996
diff
changeset
|
830 | char *name = NULL; |
|
3d6982f39a5b
Avoid a g_markup_escape_text assertion failure
Paul Aurich <darkrain42@pidgin.im>
parents:
26996
diff
changeset
|
831 | |
|
3d6982f39a5b
Avoid a g_markup_escape_text assertion failure
Paul Aurich <darkrain42@pidgin.im>
parents:
26996
diff
changeset
|
832 | if (id->lang) |
|
3d6982f39a5b
Avoid a g_markup_escape_text assertion failure
Paul Aurich <darkrain42@pidgin.im>
parents:
26996
diff
changeset
|
833 | 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
|
834 | if (id->name) |
|
3d6982f39a5b
Avoid a g_markup_escape_text assertion failure
Paul Aurich <darkrain42@pidgin.im>
parents:
26996
diff
changeset
|
835 | name = g_markup_escape_text(id->name, -1); |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
836 | |
|
26995
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
837 | g_string_append_printf(verification, "%s/%s/%s/%s<", category, |
|
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
838 | type, lang ? lang : "", name ? name : ""); |
|
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
839 | |
|
ef76b70d0078
Escape all the values when appending them to the Entity Caps verification str.
Paul Aurich <darkrain42@pidgin.im>
parents:
26992
diff
changeset
|
840 | 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
|
841 | 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
|
842 | 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
|
843 | 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
|
844 | } |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
845 | |
|
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
|
846 | /* concat features to the verification string */ |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
847 | for (node = info->features; node; node = node->next) { |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
848 | verification = jabber_caps_verification_append(verification, 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
|
849 | } |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
850 | |
|
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
|
851 | /* concat x-data forms to the verification string */ |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
852 | for(node = info->forms; node; node = node->next) { |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
853 | xmlnode *data = (xmlnode *)node->data; |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
854 | gchar *formtype = jabber_caps_get_formtype(data); |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
855 | GList *fields = jabber_caps_xdata_get_fields(data); |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
856 | |
|
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
|
857 | /* append FORM_TYPE's field value to the verification string */ |
|
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 | verification = jabber_caps_verification_append(verification, formtype); |
|
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
|
859 | g_free(formtype); |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
860 | |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
861 | while (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
|
862 | GList *value; |
|
23591
ba1e3ed78d40
* pass hash type to the caps handling functions
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23590
diff
changeset
|
863 | JabberDataFormField *field = (JabberDataFormField*)fields->data; |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
864 | |
|
24730
3037dfb744ef
Whitespace and formatting changes
Paul Aurich <darkrain42@pidgin.im>
parents:
24729
diff
changeset
|
865 | if (strcmp(field->var, "FORM_TYPE")) { |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
866 | /* Append the "var" attribute */ |
|
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
|
867 | verification = jabber_caps_verification_append(verification, 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
|
868 | /* Append <value/> elements' cdata */ |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
869 | for(value = field->values; value; value = value->next) { |
|
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
|
870 | verification = jabber_caps_verification_append(verification, value->data); |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
871 | g_free(value->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
|
872 | } |
|
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
|
873 | } |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
874 | |
|
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
|
875 | g_free(field->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
|
876 | g_list_free(field->values); |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
877 | |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
878 | 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
|
879 | } |
|
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
|
880 | } |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
881 | |
|
23593
149bce500f4e
* support for calculating both hashes, sha-1 and md5
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23591
diff
changeset
|
882 | /* generate hash */ |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
883 | purple_cipher_context_append(context, (guchar*)verification->str, verification->len); |
|
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
884 | |
|
24877
ee51a3be800d
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <darkrain42@pidgin.im>
parents:
24876
diff
changeset
|
885 | success = purple_cipher_context_digest(context, verification->len, |
|
ee51a3be800d
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <darkrain42@pidgin.im>
parents:
24876
diff
changeset
|
886 | checksum, &checksum_size); |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
887 | |
|
24729
7ceae14935f8
Rework jabber_caps_calculate_hash
Paul Aurich <darkrain42@pidgin.im>
parents:
24728
diff
changeset
|
888 | g_string_free(verification, TRUE); |
|
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
|
889 | purple_cipher_context_destroy(context); |
|
24723
e3ec27a26ea6
Whitespace, formatting, and // -> /* */
Paul Aurich <darkrain42@pidgin.im>
parents:
24722
diff
changeset
|
890 | |
|
24877
ee51a3be800d
Rename a few functions and clean up the exit cleanup of a function
Paul Aurich <darkrain42@pidgin.im>
parents:
24876
diff
changeset
|
891 | return (success ? purple_base64_encode(checksum, checksum_size) : NULL); |
|
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
|
892 | } |
|
1691c5361029
* changed name of jabber_caps_calculate_hash() to jabber_caps_calculate_own_hash()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23586
diff
changeset
|
893 | |
|
23595
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
894 | 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
|
895 | JabberCapsClientInfo info; |
|
23595
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
896 | GList *iter = 0; |
|
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
897 | GList *features = 0; |
|
23586
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
898 | |
|
24734
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
899 | if (!jabber_identities && !jabber_features) { |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
900 | /* 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
|
901 | 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
|
902 | g_free(js->caps_hash); |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
903 | js->caps_hash = NULL; |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
904 | return; |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
905 | } |
|
23599
ac402ffdcbec
* removing several warnings
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23597
diff
changeset
|
906 | |
|
24734
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
907 | /* 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
|
908 | 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
|
909 | 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
|
910 | JabberFeature *feat = iter->data; |
|
24734
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
911 | 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
|
912 | 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
|
913 | } |
|
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
914 | } |
|
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
915 | } |
|
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
916 | |
|
24734
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
917 | info.features = features; |
|
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
|
918 | 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
|
919 | info.forms = NULL; |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
920 | |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
921 | g_free(js->caps_hash); |
|
780b8ad67c22
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <darkrain42@pidgin.im>
parents:
24732
diff
changeset
|
922 | js->caps_hash = jabber_caps_calculate_hash(&info, "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
|
923 | g_list_free(info.identities); |
|
23595
728a8a576f11
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23594
diff
changeset
|
924 | g_list_free(features); |
|
23586
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
925 | } |
|
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
926 | |
|
24716
047f5075ca58
Entity Capabilities must be per-JabberStream
Paul Aurich <darkrain42@pidgin.im>
parents:
24715
diff
changeset
|
927 | 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
|
928 | { |
|
047f5075ca58
Entity Capabilities must be per-JabberStream
Paul Aurich <darkrain42@pidgin.im>
parents:
24715
diff
changeset
|
929 | if (!js->caps_hash) |
|
047f5075ca58
Entity Capabilities must be per-JabberStream
Paul Aurich <darkrain42@pidgin.im>
parents:
24715
diff
changeset
|
930 | jabber_caps_calculate_own_hash(js); |
|
047f5075ca58
Entity Capabilities must be per-JabberStream
Paul Aurich <darkrain42@pidgin.im>
parents:
24715
diff
changeset
|
931 | |
|
047f5075ca58
Entity Capabilities must be per-JabberStream
Paul Aurich <darkrain42@pidgin.im>
parents:
24715
diff
changeset
|
932 | 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
|
933 | } |
|
e495a4623f76
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21720
diff
changeset
|
934 | |
|
24717
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
935 | void jabber_caps_broadcast_change() |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
936 | { |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
937 | GList *node, *accounts = purple_accounts_get_all_active(); |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
938 | |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
939 | for (node = accounts; node; node = node->next) { |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
940 | PurpleAccount *account = node->data; |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
941 | const char *prpl_id = purple_account_get_protocol_id(account); |
|
24718
8507ef880d6d
Fix a null dereference on non-connected accounts
Paul Aurich <darkrain42@pidgin.im>
parents:
24717
diff
changeset
|
942 | if (!strcmp("prpl-jabber", prpl_id) && purple_account_is_connected(account)) { |
|
24717
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
943 | PurpleConnection *gc = purple_account_get_connection(account); |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
944 | jabber_presence_send(gc->proto_data, 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
|
945 | } |
|
f7e44345f4b9
* implemented jabber_caps_broadcast_change() and finished jabber_ipc_add_feature() IPC function
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23600
diff
changeset
|
946 | } |
|
24717
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
947 | |
|
13c7497f44f8
Clean up jabber_presence_send
Paul Aurich <darkrain42@pidgin.im>
parents:
24716
diff
changeset
|
948 | 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
|
949 | } |
|
f7e44345f4b9
* implemented jabber_caps_broadcast_change() and finished jabber_ipc_add_feature() IPC function
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23600
diff
changeset
|
950 |