Mon, 22 Mar 2010 22:26:14 +0000
Fixup merge
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
1 | /* |
|
28321
c8d617c408ab
Update various header copyrights thanks to licensecheck.
Paul Aurich <darkrain42@pidgin.im>
parents:
27155
diff
changeset
|
2 | * Purple is the legal property of its developers, whose names are too numerous |
|
c8d617c408ab
Update various header copyrights thanks to licensecheck.
Paul Aurich <darkrain42@pidgin.im>
parents:
27155
diff
changeset
|
3 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
c8d617c408ab
Update various header copyrights thanks to licensecheck.
Paul Aurich <darkrain42@pidgin.im>
parents:
27155
diff
changeset
|
4 | * source distribution. |
|
c8d617c408ab
Update various header copyrights thanks to licensecheck.
Paul Aurich <darkrain42@pidgin.im>
parents:
27155
diff
changeset
|
5 | * |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
6 | * This program is free software; you can redistribute it and/or modify |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
7 | * it under the terms of the GNU General Public License as published by |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
8 | * the Free Software Foundation; either version 2 of the License, or |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
9 | * (at your option) any later version. |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24386
diff
changeset
|
10 | * |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
11 | * This program is distributed in the hope that it will be useful, |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
14 | * GNU Library General Public License for more details. |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24386
diff
changeset
|
15 | * |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
16 | * You should have received a copy of the GNU General Public License |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
17 | * along with this program; if not, write to the Free Software |
|
28345
57a838c454b0
Oops, Elliott correctly pointed out this was wrong...
Paul Aurich <darkrain42@pidgin.im>
parents:
28321
diff
changeset
|
18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
19 | */ |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24386
diff
changeset
|
20 | |
|
28981
4e3922ab4844
Include 'internal.h' before all other headers to make some non-gcc compilers happy.
Paul Aurich <darkrain42@pidgin.im>
parents:
28979
diff
changeset
|
21 | #include "internal.h" |
|
4e3922ab4844
Include 'internal.h' before all other headers to make some non-gcc compilers happy.
Paul Aurich <darkrain42@pidgin.im>
parents:
28979
diff
changeset
|
22 | |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
23 | #include <stdlib.h> |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
24 | #include <glib.h> |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
25 | #include <string.h> |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
26 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
27 | #include "data.h" |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
28 | #include "debug.h" |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
29 | #include "xmlnode.h" |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
30 | #include "util.h" |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
31 | #include "iq.h" |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
32 | |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
33 | static GHashTable *local_data_by_alt = NULL; |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
34 | static GHashTable *local_data_by_cid = NULL; |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
35 | static GHashTable *remote_data_by_cid = NULL; |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
36 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
37 | JabberData * |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
38 | jabber_data_create_from_data(gconstpointer rawdata, gsize size, const char *type, |
|
27423
36dfce0b39e9
Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents:
27422
diff
changeset
|
39 | gboolean ephemeral, JabberStream *js) |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
40 | { |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
41 | JabberData *data = g_new0(JabberData, 1); |
|
29910
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
42 | gchar *checksum = jabber_calculate_data_hash(rawdata, size, "sha1"); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
43 | gchar cid[256]; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
44 | |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
45 | g_snprintf(cid, sizeof(cid), "sha1+%s@bob.xmpp.org", checksum); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
46 | g_free(checksum); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
47 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
48 | data->cid = g_strdup(cid); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
49 | data->type = g_strdup(type); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
50 | data->size = size; |
|
27423
36dfce0b39e9
Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents:
27422
diff
changeset
|
51 | data->ephemeral = ephemeral; |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
52 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
53 | data->data = g_memdup(rawdata, size); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
54 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
55 | return data; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
56 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
57 | |
|
29910
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
58 | |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
59 | static gboolean |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
60 | jabber_data_has_valid_hash(const JabberData *data) |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
61 | { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
62 | const gchar *cid = jabber_data_get_cid(data); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
63 | gchar **cid_parts = g_strsplit(cid, "@", -1); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
64 | gchar **iter; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
65 | int num_parts = 0; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
66 | |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
67 | purple_debug_info("jabber", "validating BoB hash %s\n", cid); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
68 | |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
69 | for (iter = cid_parts; *iter != NULL ; iter++) { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
70 | num_parts++; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
71 | } |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
72 | |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
73 | if (num_parts == 2 && purple_strequal(cid_parts[1], "bob.xmpp.org")) { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
74 | gchar **sub_parts = g_strsplit(cid_parts[0], "+", -1); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
75 | |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
76 | num_parts = 0; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
77 | for (iter = sub_parts ; *iter != NULL ; iter++) { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
78 | num_parts++; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
79 | } |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
80 | |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
81 | if (num_parts == 2) { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
82 | const gchar *hash_algo = sub_parts[0]; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
83 | const gchar *hash_value = sub_parts[1]; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
84 | gchar *digest = |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
85 | jabber_calculate_data_hash(jabber_data_get_data(data), |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
86 | jabber_data_get_size(data), hash_algo); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
87 | |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
88 | purple_debug_info("jabber", "BoB expecting hash: %s\n", digest); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
89 | |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
90 | if (digest) { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
91 | gboolean result = purple_strequal(digest, hash_value); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
92 | |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
93 | if (!result) { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
94 | purple_debug_error("jabber", "invalid BoB hash\n"); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
95 | } |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
96 | g_free(digest); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
97 | return result; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
98 | } else { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
99 | purple_debug_info("jabber", "unknown BoB hash algo\n"); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
100 | return FALSE; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
101 | } |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
102 | } else { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
103 | return TRUE; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
104 | } |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
105 | } else { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
106 | return TRUE; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
107 | } |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
108 | } |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
109 | |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
110 | static void |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
111 | jabber_data_delete(gpointer cbdata) |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
112 | { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
113 | JabberData *data = cbdata; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
114 | g_free(data->cid); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
115 | g_free(data->type); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
116 | g_free(data->data); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
117 | g_free(data); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
118 | } |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
119 | |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
120 | |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
121 | JabberData * |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
122 | jabber_data_create_from_xml(xmlnode *tag) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
123 | { |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
124 | JabberData *data; |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
125 | gchar *raw_data = NULL; |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
126 | const gchar *cid, *type; |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
127 | |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
128 | /* check if this is a "data" tag */ |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
129 | if (strcmp(tag->name, "data") != 0) { |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
130 | purple_debug_error("jabber", "Invalid data element\n"); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
131 | return NULL; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
132 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
133 | |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
134 | cid = xmlnode_get_attrib(tag, "cid"); |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
135 | type = xmlnode_get_attrib(tag, "type"); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
136 | |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
137 | if (!cid || !type) { |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
138 | purple_debug_error("jabber", "cid or type missing\n"); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
139 | return NULL; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
140 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
141 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
142 | raw_data = xmlnode_get_data(tag); |
|
28442
2da956f23839
Don't crash when receiving an error iq response when trying fetch a custom
Marcus Lundblad <malu@pidgin.im>
parents:
28345
diff
changeset
|
143 | |
|
28447
1c533c2efd06
Minor merge duplication.
Paul Aurich <darkrain42@pidgin.im>
parents:
28444
diff
changeset
|
144 | if (raw_data == NULL || *raw_data == '\0') { |
|
28442
2da956f23839
Don't crash when receiving an error iq response when trying fetch a custom
Marcus Lundblad <malu@pidgin.im>
parents:
28345
diff
changeset
|
145 | purple_debug_error("jabber", "data element was empty"); |
|
28450
19c55a6cca66
Eighth^WNinth time's the charm...
Paul Aurich <darkrain42@pidgin.im>
parents:
28447
diff
changeset
|
146 | g_free(raw_data); |
|
28442
2da956f23839
Don't crash when receiving an error iq response when trying fetch a custom
Marcus Lundblad <malu@pidgin.im>
parents:
28345
diff
changeset
|
147 | return NULL; |
|
2da956f23839
Don't crash when receiving an error iq response when trying fetch a custom
Marcus Lundblad <malu@pidgin.im>
parents:
28345
diff
changeset
|
148 | } |
|
2da956f23839
Don't crash when receiving an error iq response when trying fetch a custom
Marcus Lundblad <malu@pidgin.im>
parents:
28345
diff
changeset
|
149 | |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
150 | data = g_new0(JabberData, 1); |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
151 | data->data = purple_base64_decode(raw_data, &data->size); |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
152 | g_free(raw_data); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
153 | |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
154 | if (data->data == NULL) { |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
155 | purple_debug_error("jabber", "Malformed base64 data\n"); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
156 | g_free(data); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
157 | return NULL; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
158 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
159 | |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
160 | data->cid = g_strdup(cid); |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
161 | data->type = g_strdup(type); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
162 | |
|
29910
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
163 | if (!jabber_data_has_valid_hash(data)) { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
164 | jabber_data_delete(data); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
165 | return NULL; |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
166 | } |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
167 | |
|
29910
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
168 | return data; |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
169 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
170 | |
|
27422
e073924c74db
Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents:
27421
diff
changeset
|
171 | void |
|
e073924c74db
Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents:
27421
diff
changeset
|
172 | jabber_data_destroy(JabberData *data) |
|
e073924c74db
Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents:
27421
diff
changeset
|
173 | { |
|
e073924c74db
Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents:
27421
diff
changeset
|
174 | jabber_data_delete(data); |
|
e073924c74db
Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents:
27421
diff
changeset
|
175 | } |
|
e073924c74db
Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents:
27421
diff
changeset
|
176 | |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
177 | const char * |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
178 | jabber_data_get_cid(const JabberData *data) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
179 | { |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
180 | return data->cid; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
181 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
182 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
183 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
184 | const char * |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
185 | jabber_data_get_type(const JabberData *data) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
186 | { |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
187 | return data->type; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
188 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
189 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
190 | gsize |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
191 | jabber_data_get_size(const JabberData *data) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
192 | { |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
193 | return data->size; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
194 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
195 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
196 | gpointer |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
197 | jabber_data_get_data(const JabberData *data) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
198 | { |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
199 | return data->data; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
200 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
201 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
202 | xmlnode * |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
203 | jabber_data_get_xml_definition(const JabberData *data) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
204 | { |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
205 | xmlnode *tag = xmlnode_new("data"); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
206 | char *base64data = purple_base64_encode(data->data, data->size); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
207 | |
|
28979
191942cc7747
jabber: Start putting all the namespaces in one location with consistent naming.
Paul Aurich <darkrain42@pidgin.im>
parents:
28450
diff
changeset
|
208 | xmlnode_set_namespace(tag, NS_BOB); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
209 | xmlnode_set_attrib(tag, "cid", data->cid); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
210 | xmlnode_set_attrib(tag, "type", data->type); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
211 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
212 | xmlnode_insert_data(tag, base64data, -1); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
213 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
214 | g_free(base64data); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
215 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
216 | return tag; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
217 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
218 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
219 | xmlnode * |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
220 | jabber_data_get_xhtml_im(const JabberData *data, const gchar *alt) |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
221 | { |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
222 | xmlnode *img = xmlnode_new("img"); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
223 | char src[128]; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
224 | |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
225 | xmlnode_set_attrib(img, "alt", alt); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
226 | g_snprintf(src, sizeof(src), "cid:%s", data->cid); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
227 | xmlnode_set_attrib(img, "src", src); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
228 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
229 | return img; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
230 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
231 | |
|
29906
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
232 | static xmlnode * |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
233 | jabber_data_get_xml_request(const gchar *cid) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
234 | { |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
235 | xmlnode *tag = xmlnode_new("data"); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
236 | |
|
28979
191942cc7747
jabber: Start putting all the namespaces in one location with consistent naming.
Paul Aurich <darkrain42@pidgin.im>
parents:
28450
diff
changeset
|
237 | xmlnode_set_namespace(tag, NS_BOB); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
238 | xmlnode_set_attrib(tag, "cid", cid); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
239 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
240 | return tag; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
241 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
242 | |
|
29906
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
243 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
244 | typedef struct { |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
245 | gpointer userdata; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
246 | gchar *alt; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
247 | gboolean ephemeral; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
248 | JabberDataRequestCallback *cb; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
249 | } JabberDataRequestData; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
250 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
251 | static void |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
252 | jabber_data_request_cb(JabberStream *js, const char *from, |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
253 | JabberIqType type, const char *id, xmlnode *packet, gpointer data) |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
254 | { |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
255 | JabberDataRequestData *request_data = (JabberDataRequestData *) data; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
256 | gpointer userdata = request_data->userdata; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
257 | gchar *alt = request_data->alt; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
258 | gboolean ephemeral = request_data->ephemeral; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
259 | JabberDataRequestCallback *cb = request_data->cb; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
260 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
261 | xmlnode *data_element = xmlnode_get_child(packet, "data"); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
262 | xmlnode *item_not_found = xmlnode_get_child(packet, "item-not-found"); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
263 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
264 | /* did we get a data element as result? */ |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
265 | if (data_element && type == JABBER_IQ_RESULT) { |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
266 | JabberData *data = jabber_data_create_from_xml(data_element); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
267 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
268 | if (data) { |
|
29907
5b6668335968
jabber: Ofcourse we should only associate non-ephemeral BoBs, not the other
Marcus Lundblad <malu@pidgin.im>
parents:
29906
diff
changeset
|
269 | if (!ephemeral) { |
|
29906
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
270 | jabber_data_associate_remote(data); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
271 | } |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
272 | cb(data, alt, userdata); |
|
29910
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
273 | } else { |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
274 | /* could not validate hash when creating data from XML */ |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
275 | purple_debug_info("jabber", |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
276 | "hash validation failed on requested BoB object\n"); |
|
f1c6e586e5c1
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents:
29907
diff
changeset
|
277 | cb(NULL, alt, userdata); |
|
29906
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
278 | } |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
279 | } else if (item_not_found) { |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
280 | purple_debug_info("jabber", |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
281 | "Responder didn't recognize requested data\n"); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
282 | cb(NULL, alt, userdata); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
283 | } else { |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
284 | purple_debug_error("jabber", "Unknown response to data request\n"); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
285 | cb(NULL, alt, userdata); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
286 | } |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
287 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
288 | g_free(request_data); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
289 | } |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
290 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
291 | void |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
292 | jabber_data_request(JabberStream *js, const gchar *cid, const gchar *who, |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
293 | gchar *alt, gboolean ephemeral, JabberDataRequestCallback cb, |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
294 | gpointer userdata) |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
295 | { |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
296 | JabberIq *request = jabber_iq_new(js, JABBER_IQ_GET); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
297 | xmlnode *data_request = jabber_data_get_xml_request(cid); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
298 | JabberDataRequestData *data = g_new0(JabberDataRequestData, 1); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
299 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
300 | data->userdata = userdata; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
301 | data->alt = alt; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
302 | data->ephemeral = ephemeral; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
303 | data->cb = cb; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
304 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
305 | xmlnode_set_attrib(request->node, "to", who); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
306 | jabber_iq_set_callback(request, jabber_data_request_cb, data); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
307 | xmlnode_insert_child(request->node, data_request); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
308 | jabber_iq_send(request); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
309 | } |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
310 | |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
311 | const JabberData * |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
312 | jabber_data_find_local_by_alt(const gchar *alt) |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
313 | { |
|
27426
bf461113e8be
Change debug outputs to say "data object" instead of "smiley", since BoB is not
Marcus Lundblad <malu@pidgin.im>
parents:
27425
diff
changeset
|
314 | purple_debug_info("jabber", "looking up local data object with alt = %s\n", alt); |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
315 | return g_hash_table_lookup(local_data_by_alt, alt); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
316 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
317 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
318 | const JabberData * |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
319 | jabber_data_find_local_by_cid(const gchar *cid) |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
320 | { |
|
27426
bf461113e8be
Change debug outputs to say "data object" instead of "smiley", since BoB is not
Marcus Lundblad <malu@pidgin.im>
parents:
27425
diff
changeset
|
321 | purple_debug_info("jabber", "lookup local data object with cid = %s\n", cid); |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
322 | return g_hash_table_lookup(local_data_by_cid, cid); |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
323 | } |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
324 | |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
325 | const JabberData * |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
326 | jabber_data_find_remote_by_cid(const gchar *cid) |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
327 | { |
|
27426
bf461113e8be
Change debug outputs to say "data object" instead of "smiley", since BoB is not
Marcus Lundblad <malu@pidgin.im>
parents:
27425
diff
changeset
|
328 | purple_debug_info("jabber", "lookup remote data object with cid = %s\n", cid); |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24386
diff
changeset
|
329 | |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
330 | return g_hash_table_lookup(remote_data_by_cid, cid); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
331 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
332 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
333 | void |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
334 | jabber_data_associate_local(JabberData *data, const gchar *alt) |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
335 | { |
|
27426
bf461113e8be
Change debug outputs to say "data object" instead of "smiley", since BoB is not
Marcus Lundblad <malu@pidgin.im>
parents:
27425
diff
changeset
|
336 | purple_debug_info("jabber", "associating local data object\n alt = %s, cid = %s\n", |
|
bf461113e8be
Change debug outputs to say "data object" instead of "smiley", since BoB is not
Marcus Lundblad <malu@pidgin.im>
parents:
27425
diff
changeset
|
337 | alt , jabber_data_get_cid(data)); |
|
27421
0aeae425286d
Allow the "alt" property on a Bits of Binary object to be NULL (do not store
Marcus Lundblad <malu@pidgin.im>
parents:
27155
diff
changeset
|
338 | if (alt) |
|
0aeae425286d
Allow the "alt" property on a Bits of Binary object to be NULL (do not store
Marcus Lundblad <malu@pidgin.im>
parents:
27155
diff
changeset
|
339 | g_hash_table_insert(local_data_by_alt, g_strdup(alt), data); |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24386
diff
changeset
|
340 | g_hash_table_insert(local_data_by_cid, g_strdup(jabber_data_get_cid(data)), |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
341 | data); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
342 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
343 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
344 | void |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
345 | jabber_data_associate_remote(JabberData *data) |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
346 | { |
|
27426
bf461113e8be
Change debug outputs to say "data object" instead of "smiley", since BoB is not
Marcus Lundblad <malu@pidgin.im>
parents:
27425
diff
changeset
|
347 | purple_debug_info("jabber", "associating remote data object, cid = %s\n", |
|
24257
d6402f066933
Fixed a memory error, which was due to me destroying some hashtables in the
Marcus Lundblad <malu@pidgin.im>
parents:
24256
diff
changeset
|
348 | jabber_data_get_cid(data)); |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24386
diff
changeset
|
349 | g_hash_table_insert(remote_data_by_cid, g_strdup(jabber_data_get_cid(data)), |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
350 | data); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
351 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
352 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
353 | void |
|
25817
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
354 | jabber_data_parse(JabberStream *js, const char *who, JabberIqType type, |
|
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
355 | const char *id, xmlnode *data_node) |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
356 | { |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
357 | JabberIq *result = NULL; |
|
25817
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
358 | const char *cid = xmlnode_get_attrib(data_node, "cid"); |
|
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
359 | const JabberData *data = cid ? jabber_data_find_local_by_cid(cid) : NULL; |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
360 | |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
361 | if (!data) { |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
362 | xmlnode *item_not_found = xmlnode_new("item-not-found"); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
363 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
364 | result = jabber_iq_new(js, JABBER_IQ_ERROR); |
|
25817
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
365 | if (who) |
|
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
366 | xmlnode_set_attrib(result->node, "to", who); |
|
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
367 | xmlnode_set_attrib(result->node, "id", id); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
368 | xmlnode_insert_child(result->node, item_not_found); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
369 | } else { |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
370 | result = jabber_iq_new(js, JABBER_IQ_RESULT); |
|
25817
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
371 | if (who) |
|
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
372 | xmlnode_set_attrib(result->node, "to", who); |
|
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
373 | xmlnode_set_attrib(result->node, "id", id); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
374 | xmlnode_insert_child(result->node, |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
375 | jabber_data_get_xml_definition(data)); |
|
27423
36dfce0b39e9
Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents:
27422
diff
changeset
|
376 | /* if the data object is temporary, destroy it and remove the references |
|
36dfce0b39e9
Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents:
27422
diff
changeset
|
377 | to it */ |
|
36dfce0b39e9
Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents:
27422
diff
changeset
|
378 | if (data->ephemeral) { |
|
36dfce0b39e9
Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents:
27422
diff
changeset
|
379 | g_hash_table_remove(local_data_by_cid, cid); |
|
36dfce0b39e9
Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents:
27422
diff
changeset
|
380 | } |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
381 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
382 | jabber_iq_send(result); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
383 | } |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
384 | |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
385 | void |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
386 | jabber_data_init(void) |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
387 | { |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
388 | purple_debug_info("jabber", "creating hash tables for data objects\n"); |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
389 | local_data_by_alt = g_hash_table_new_full(g_str_hash, g_str_equal, |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
390 | g_free, NULL); |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
391 | local_data_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal, |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
392 | g_free, jabber_data_delete); |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
393 | remote_data_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal, |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
394 | g_free, jabber_data_delete); |
|
26704
e6dba3759625
Gratuitous alphabetization of the IQ handlers (again!) and move the data handler to jabber_data_init
Paul Aurich <darkrain42@pidgin.im>
parents:
26088
diff
changeset
|
395 | |
|
28979
191942cc7747
jabber: Start putting all the namespaces in one location with consistent naming.
Paul Aurich <darkrain42@pidgin.im>
parents:
28450
diff
changeset
|
396 | jabber_iq_register_handler("data", NS_BOB, jabber_data_parse); |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
397 | } |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
398 | |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
399 | void |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
400 | jabber_data_uninit(void) |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
401 | { |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
402 | purple_debug_info("jabber", "destroying hash tables for data objects\n"); |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
403 | g_hash_table_destroy(local_data_by_alt); |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
404 | g_hash_table_destroy(local_data_by_cid); |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
405 | g_hash_table_destroy(remote_data_by_cid); |
|
24737
b8a96a07e7ac
Add more jabber plugin unloading functions to clean up more data structures
Paul Aurich <darkrain42@pidgin.im>
parents:
24386
diff
changeset
|
406 | local_data_by_alt = local_data_by_cid = remote_data_by_cid = NULL; |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
407 | } |