libpurple/protocols/jabber/data.c

Fri, 24 Mar 2017 02:23:46 +0300

author
qarkai <qarkai@gmail.com>
date
Fri, 24 Mar 2017 02:23:46 +0300
branch
string-comparison-r2
changeset 38259
c593fc9f5438
parent 31294
73607ab89c6f
child 38358
30ba44276e74
child 40755
fb2056ce3c58
permissions
-rw-r--r--

Replace strcmp() with purple_strequal()
Didn't touch finch/libgnt files

23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
1 /*
30184
a8de64b7cbfd Fix license to refer to GPLv2 in a files...
Marcus Lundblad <malu@pidgin.im>
parents: 30123
diff changeset
2 * purple - Jabber Service Discovery
a8de64b7cbfd Fix license to refer to GPLv2 in a files...
Marcus Lundblad <malu@pidgin.im>
parents: 30123
diff changeset
3 *
28321
c8d617c408ab Update various header copyrights thanks to licensecheck.
Paul Aurich <darkrain42@pidgin.im>
parents: 27155
diff changeset
4 * 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
5 * 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
6 * source distribution.
c8d617c408ab Update various header copyrights thanks to licensecheck.
Paul Aurich <darkrain42@pidgin.im>
parents: 27155
diff changeset
7 *
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
8 * 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
9 * 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
10 * 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
11 * (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
12 *
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
13 * 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
14 * 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
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
30184
a8de64b7cbfd Fix license to refer to GPLv2 in a files...
Marcus Lundblad <malu@pidgin.im>
parents: 30123
diff changeset
16 * GNU 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
17 *
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
18 * 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
19 * 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
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
30184
a8de64b7cbfd Fix license to refer to GPLv2 in a files...
Marcus Lundblad <malu@pidgin.im>
parents: 30123
diff changeset
21 *
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
22 */
26042
4dabdb5fe213 Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24386
diff changeset
23
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
24 #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
25
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
26 #include <stdlib.h>
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
27 #include <glib.h>
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
28 #include <string.h>
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
29
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
30 #include "data.h"
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
31 #include "debug.h"
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
32 #include "xmlnode.h"
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
33 #include "util.h"
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
34 #include "iq.h"
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
35
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
36 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
37 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
38 static GHashTable *remote_data_by_cid = NULL;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
39
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
40 JabberData *
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
41 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
42 gboolean ephemeral, JabberStream *js)
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
43 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
44 JabberData *data;
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
45 gchar *checksum;
30452
30db199e757d jabber: Don't use a static array when it might not be sufficient.
Paul Aurich <darkrain42@pidgin.im>
parents: 30451
diff changeset
46 gchar cid[256]; /* "Big enough" for a SHA1 hex hash value */
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
47
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
48 g_return_val_if_fail(rawdata != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
49 g_return_val_if_fail(size > 0, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
50 g_return_val_if_fail(type != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
51
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
52 data = g_new0(JabberData, 1);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
53 checksum = jabber_calculate_data_hash(rawdata, size, "sha1");
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
54
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
55 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
56 g_free(checksum);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
57
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
58 data->cid = g_strdup(cid);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
59 data->type = g_strdup(type);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
60 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
61 data->ephemeral = ephemeral;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
62
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
63 data->data = g_memdup(rawdata, size);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
64
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
65 return data;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
66 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
67
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
68 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
69 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
70 {
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 JabberData *data = cbdata;
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
72
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
73 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
74 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
75 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
76 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
77 }
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
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
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
80 JabberData *
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
81 jabber_data_create_from_xml(xmlnode *tag)
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
82 {
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
83 JabberData *data;
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
84 gchar *raw_data = NULL;
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
85 const gchar *cid, *type;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
86
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
87 g_return_val_if_fail(tag != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
88
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
89 /* check if this is a "data" tag */
38259
c593fc9f5438 Replace strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 31294
diff changeset
90 if (!purple_strequal(tag->name, "data")) {
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
91 purple_debug_error("jabber", "Invalid data element\n");
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
92 return NULL;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
93 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
94
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
95 cid = xmlnode_get_attrib(tag, "cid");
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
96 type = xmlnode_get_attrib(tag, "type");
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
97
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
98 if (!cid || !type) {
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
99 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
100 return NULL;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
101 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
102
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
103 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
104
28447
1c533c2efd06 Minor merge duplication.
Paul Aurich <darkrain42@pidgin.im>
parents: 28444
diff changeset
105 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
106 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
107 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
108 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
109 }
2da956f23839 Don't crash when receiving an error iq response when trying fetch a custom
Marcus Lundblad <malu@pidgin.im>
parents: 28345
diff changeset
110
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
111 data = g_new0(JabberData, 1);
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
112 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
113 g_free(raw_data);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
114
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
115 if (data->data == NULL) {
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
116 purple_debug_error("jabber", "Malformed base64 data\n");
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
117 g_free(data);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
118 return NULL;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
119 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
120
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
121 data->cid = g_strdup(cid);
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
122 data->type = g_strdup(type);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
123
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
124 return data;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
125 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
126
27422
e073924c74db Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents: 27421
diff changeset
127 void
e073924c74db Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents: 27421
diff changeset
128 jabber_data_destroy(JabberData *data)
e073924c74db Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents: 27421
diff changeset
129 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
130 g_return_if_fail(data != NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
131
27422
e073924c74db Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents: 27421
diff changeset
132 jabber_data_delete(data);
e073924c74db Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents: 27421
diff changeset
133 }
e073924c74db Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents: 27421
diff changeset
134
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
135 const char *
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
136 jabber_data_get_cid(const JabberData *data)
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
137 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
138 g_return_val_if_fail(data != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
139
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
140 return data->cid;
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
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
143
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
144 const char *
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
145 jabber_data_get_type(const JabberData *data)
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
146 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
147 g_return_val_if_fail(data != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
148
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
149 return data->type;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
150 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
151
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
152 gsize
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
153 jabber_data_get_size(const JabberData *data)
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
154 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
155 g_return_val_if_fail(data != NULL, 0);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
156
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
157 return data->size;
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
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
160 gpointer
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
161 jabber_data_get_data(const JabberData *data)
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
162 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
163 g_return_val_if_fail(data != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
164
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
165 return data->data;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
166 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
167
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
168 xmlnode *
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
169 jabber_data_get_xml_definition(const JabberData *data)
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
170 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
171 xmlnode *tag;
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
172 char *base64data;
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
173
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
174 g_return_val_if_fail(data != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
175
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
176 tag = xmlnode_new("data");
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
177 base64data = purple_base64_encode(data->data, data->size);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
178
28979
191942cc7747 jabber: Start putting all the namespaces in one location with consistent naming.
Paul Aurich <darkrain42@pidgin.im>
parents: 28450
diff changeset
179 xmlnode_set_namespace(tag, NS_BOB);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
180 xmlnode_set_attrib(tag, "cid", data->cid);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
181 xmlnode_set_attrib(tag, "type", data->type);
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 xmlnode_insert_data(tag, base64data, -1);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
184
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
185 g_free(base64data);
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 tag;
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 xmlnode *
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
191 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
192 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
193 xmlnode *img;
30452
30db199e757d jabber: Don't use a static array when it might not be sufficient.
Paul Aurich <darkrain42@pidgin.im>
parents: 30451
diff changeset
194 char *src;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
195
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
196 g_return_val_if_fail(data != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
197 g_return_val_if_fail(alt != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
198
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
199 img = xmlnode_new("img");
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
200 xmlnode_set_attrib(img, "alt", alt);
30452
30db199e757d jabber: Don't use a static array when it might not be sufficient.
Paul Aurich <darkrain42@pidgin.im>
parents: 30451
diff changeset
201
30db199e757d jabber: Don't use a static array when it might not be sufficient.
Paul Aurich <darkrain42@pidgin.im>
parents: 30451
diff changeset
202 src = g_strconcat("cid:", data->cid, NULL);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
203 xmlnode_set_attrib(img, "src", src);
30452
30db199e757d jabber: Don't use a static array when it might not be sufficient.
Paul Aurich <darkrain42@pidgin.im>
parents: 30451
diff changeset
204 g_free(src);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
205
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
206 return img;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
207 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
208
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
209 static xmlnode *
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
210 jabber_data_get_xml_request(const gchar *cid)
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 *tag = xmlnode_new("data");
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
213
28979
191942cc7747 jabber: Start putting all the namespaces in one location with consistent naming.
Paul Aurich <darkrain42@pidgin.im>
parents: 28450
diff changeset
214 xmlnode_set_namespace(tag, NS_BOB);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
215 xmlnode_set_attrib(tag, "cid", cid);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
216
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
217 return tag;
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
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
220 static gboolean
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
221 jabber_data_has_valid_hash(const JabberData *data)
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
222 {
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
223 const gchar *cid = jabber_data_get_cid(data);
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
224 gchar **cid_parts = g_strsplit(cid, "@", -1);
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
225 guint num_cid_parts = 0;
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
226 gboolean ret = FALSE;
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
227
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
228 if (cid_parts)
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
229 num_cid_parts = g_strv_length(cid_parts);
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
230
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
231 if (num_cid_parts == 2 && purple_strequal(cid_parts[1], "bob.xmpp.org")) {
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
232 gchar **sub_parts = g_strsplit(cid_parts[0], "+", -1);
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
233 guint num_sub_parts = 0;
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
234
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
235 if (sub_parts)
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
236 num_sub_parts = g_strv_length(sub_parts);
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
237
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
238 if (num_sub_parts == 2) {
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
239 const gchar *hash_algo = sub_parts[0];
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
240 const gchar *hash_value = sub_parts[1];
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
241 gchar *digest =
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
242 jabber_calculate_data_hash(jabber_data_get_data(data),
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
243 jabber_data_get_size(data), hash_algo);
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
244
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
245 if (digest) {
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
246 ret = purple_strequal(digest, hash_value);
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
247
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
248 if (!ret)
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
249 purple_debug_warning("jabber", "Unable to validate BoB "
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
250 "hash; expecting %s, got %s\n",
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
251 cid, digest);
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
252
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
253 g_free(digest);
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
254 } else {
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
255 purple_debug_warning("jabber", "Unable to validate BoB hash; "
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
256 "unknown hash algorithm %s\n", hash_algo);
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
257 }
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
258 } else {
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
259 purple_debug_warning("jabber", "Malformed BoB CID\n");
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
260 }
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
261
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
262 g_strfreev(sub_parts);
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
263 }
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
264
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
265 g_strfreev(cid_parts);
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
266 return ret;
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
267 }
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
268
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
269
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
270 typedef struct {
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
271 gpointer userdata;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
272 gchar *alt;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
273 gboolean ephemeral;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
274 JabberDataRequestCallback *cb;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
275 } JabberDataRequestData;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
276
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
277 static void
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
278 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
279 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
280 {
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
281 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
282 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
283 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
284 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
285 JabberDataRequestCallback *cb = request_data->cb;
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30453
diff changeset
286
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
287 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
288 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
289
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
290 /* 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
291 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
292 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
293
30453
206741a404ca jabber: Fix a crash in the BoB code when receiving from Jabbim.
Paul Aurich <darkrain42@pidgin.im>
parents: 30452
diff changeset
294 if (data && !ephemeral) {
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
295 jabber_data_associate_remote(js, from, data);
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
296 }
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
297 cb(data, alt, userdata);
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
298 } 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
299 purple_debug_info("jabber",
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
300 "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
301 cb(NULL, alt, userdata);
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
302 } else {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
303 purple_debug_warning("jabber", "Unknown response to data request\n");
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
304 cb(NULL, alt, userdata);
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
305 }
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
306
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
307 g_free(request_data);
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
308 }
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 void
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30453
diff changeset
311 jabber_data_request(JabberStream *js, const gchar *cid, const gchar *who,
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
312 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
313 gpointer userdata)
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
314 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
315 JabberIq *request;
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
316 xmlnode *data_request;
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
317 JabberDataRequestData *data;
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
318
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
319 g_return_if_fail(cid != NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
320 g_return_if_fail(who != NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
321 g_return_if_fail(alt != NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
322
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
323 request = jabber_iq_new(js, JABBER_IQ_GET);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
324 data_request = jabber_data_get_xml_request(cid);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
325 data = g_new0(JabberDataRequestData, 1);
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
326
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
327 data->userdata = userdata;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
328 data->alt = alt;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
329 data->ephemeral = ephemeral;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
330 data->cb = cb;
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30453
diff changeset
331
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
332 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
333 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
334 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
335 jabber_iq_send(request);
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
336 }
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
337
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
338 const JabberData *
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
339 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
340 {
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
341 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
342 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
343 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
344
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
345 const JabberData *
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
346 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
347 {
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
348 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
349 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
350 }
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
351
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
352 const JabberData *
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
353 jabber_data_find_remote_by_cid(JabberStream *js, const gchar *who,
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
354 const gchar *cid)
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
355 {
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
356 const JabberData *data = g_hash_table_lookup(remote_data_by_cid, cid);
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
357 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
358
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
359 if (data == NULL) {
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
360 gchar *jid_cid =
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
361 g_strdup_printf("%s@%s/%s%s%s", js->user->node, js->user->domain,
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
362 js->user->resource, who, cid);
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
363 purple_debug_info("jabber",
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
364 "didn't find BoB object by pure CID, try including JIDs: %s\n",
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
365 jid_cid);
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
366 data = g_hash_table_lookup(remote_data_by_cid, jid_cid);
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
367 g_free(jid_cid);
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
368 }
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
369 return data;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
370 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
371
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
372 void
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
373 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
374 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
375 g_return_if_fail(data != NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
376
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
377 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
378 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
379 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
380 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
381 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
382 data);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
383 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
384
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
385 void
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
386 jabber_data_associate_remote(JabberStream *js, const gchar *who, JabberData *data)
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
387 {
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
388 gchar *cid;
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
389
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
390 g_return_if_fail(data != NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
391
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
392 if (jabber_data_has_valid_hash(data)) {
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
393 cid = g_strdup(jabber_data_get_cid(data));
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
394 } else {
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
395 cid = g_strdup_printf("%s@%s/%s%s%s", js->user->node, js->user->domain,
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
396 js->user->resource, who, jabber_data_get_cid(data));
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
397 }
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
398
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
399 purple_debug_info("jabber", "associating remote BoB object with cid = %s\n",
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
400 cid);
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30453
diff changeset
401
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
402 g_hash_table_insert(remote_data_by_cid, cid, data);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
403 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
404
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
405 void
25817
09d6a40a341d Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents: 25566
diff changeset
406 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
407 const char *id, xmlnode *data_node)
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
408 {
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
409 JabberIq *result = NULL;
25817
09d6a40a341d Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents: 25566
diff changeset
410 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
411 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
412
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
413 if (!data) {
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
414 xmlnode *item_not_found = xmlnode_new("item-not-found");
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
415
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
416 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
417 if (who)
09d6a40a341d Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents: 25566
diff changeset
418 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
419 xmlnode_set_attrib(result->node, "id", id);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
420 xmlnode_insert_child(result->node, item_not_found);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
421 } else {
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
422 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
423 if (who)
09d6a40a341d Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents: 25566
diff changeset
424 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
425 xmlnode_set_attrib(result->node, "id", id);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
426 xmlnode_insert_child(result->node,
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
427 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
428 /* 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
429 to it */
36dfce0b39e9 Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents: 27422
diff changeset
430 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
431 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
432 }
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
433 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
434 jabber_iq_send(result);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
435 }
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
436
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
437 void
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
438 jabber_data_init(void)
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
439 {
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
440 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
441 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
442 g_free, NULL);
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
443 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
444 g_free, jabber_data_delete);
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
445 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
446 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
447
28979
191942cc7747 jabber: Start putting all the namespaces in one location with consistent naming.
Paul Aurich <darkrain42@pidgin.im>
parents: 28450
diff changeset
448 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
449 }
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
450
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
451 void
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
452 jabber_data_uninit(void)
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
453 {
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
454 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
455 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
456 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
457 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
458 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
459 }

mercurial