Thu, 13 Feb 2020 20:57:31 -0600
Move the libidn check to jabber/meson.build as it needs specific functions of the library
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
1 | /* |
|
35099
9bea64da7c15
Fix summary description of these files.
Mark Doliner <mark@kingant.net>
parents:
34935
diff
changeset
|
2 | * purple - Handling of XEP-0231: Bits of Binary. |
|
30184
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; |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
46 | |
|
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
|
47 | 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
|
48 | 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
|
49 | 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
|
50 | |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
51 | checksum = g_compute_checksum_for_data(G_CHECKSUM_SHA1, rawdata, size); |
|
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
|
52 | |
|
39491
0dfac00d800e
Replace g_snprintf+g_strdup by g_strdup_printf.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38358
diff
changeset
|
53 | data = g_new0(JabberData, 1); |
|
0dfac00d800e
Replace g_snprintf+g_strdup by g_strdup_printf.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38358
diff
changeset
|
54 | data->cid = g_strdup_printf("sha1+%s@bob.xmpp.org", checksum); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
55 | data->type = g_strdup(type); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
56 | 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
|
57 | data->ephemeral = ephemeral; |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
58 | data->data = g_memdup(rawdata, size); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
59 | |
|
39491
0dfac00d800e
Replace g_snprintf+g_strdup by g_strdup_printf.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38358
diff
changeset
|
60 | g_free(checksum); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
61 | return data; |
|
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 | |
|
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
|
64 | 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
|
65 | 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
|
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 | 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
|
68 | |
|
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
|
69 | 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
|
70 | 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
|
71 | 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
|
72 | 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
|
73 | } |
|
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 | |
|
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 | |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
76 | JabberData * |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
77 | jabber_data_create_from_xml(PurpleXmlNode *tag) |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
78 | { |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
79 | JabberData *data; |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
80 | gchar *raw_data = NULL; |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
81 | const gchar *cid, *type; |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
82 | |
|
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
|
83 | 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
|
84 | |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
85 | /* check if this is a "data" tag */ |
|
38259
c593fc9f5438
Replace strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
31294
diff
changeset
|
86 | 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
|
87 | purple_debug_error("jabber", "Invalid data element\n"); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
88 | return NULL; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
89 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
90 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
91 | cid = purple_xmlnode_get_attrib(tag, "cid"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
92 | type = purple_xmlnode_get_attrib(tag, "type"); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
93 | |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
94 | if (!cid || !type) { |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
95 | 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
|
96 | return NULL; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
97 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
98 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
99 | raw_data = purple_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
|
100 | |
|
28447
1c533c2efd06
Minor merge duplication.
Paul Aurich <darkrain42@pidgin.im>
parents:
28444
diff
changeset
|
101 | 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
|
102 | 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
|
103 | 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
|
104 | 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
|
105 | } |
|
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 | |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
107 | data = g_new0(JabberData, 1); |
|
38341
3da74e727e78
Remove purple_base64_encode/decode() wrappers
Mike Ruprecht <cmaiku@gmail.com>
parents:
38327
diff
changeset
|
108 | data->data = g_base64_decode(raw_data, &data->size); |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
109 | g_free(raw_data); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
110 | |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
111 | if (data->data == NULL) { |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
112 | purple_debug_error("jabber", "Malformed base64 data\n"); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
113 | g_free(data); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
114 | return NULL; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
115 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
116 | |
|
28439
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
117 | data->cid = g_strdup(cid); |
|
f5746ce9d72d
jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents:
28345
diff
changeset
|
118 | data->type = g_strdup(type); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
119 | |
|
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
|
120 | return data; |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
121 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
122 | |
|
27422
e073924c74db
Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents:
27421
diff
changeset
|
123 | void |
|
e073924c74db
Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents:
27421
diff
changeset
|
124 | jabber_data_destroy(JabberData *data) |
|
e073924c74db
Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents:
27421
diff
changeset
|
125 | { |
|
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
|
126 | 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
|
127 | |
|
27422
e073924c74db
Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents:
27421
diff
changeset
|
128 | jabber_data_delete(data); |
|
e073924c74db
Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents:
27421
diff
changeset
|
129 | } |
|
e073924c74db
Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents:
27421
diff
changeset
|
130 | |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
131 | const char * |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
132 | jabber_data_get_cid(const JabberData *data) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
133 | { |
|
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
|
134 | 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
|
135 | |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
136 | return data->cid; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
137 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
138 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
139 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
140 | const char * |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
141 | jabber_data_get_type(const JabberData *data) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
142 | { |
|
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
|
143 | 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
|
144 | |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
145 | return data->type; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
146 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
147 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
148 | gsize |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
149 | jabber_data_get_size(const JabberData *data) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
150 | { |
|
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
|
151 | 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
|
152 | |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
153 | return data->size; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
154 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
155 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
156 | gpointer |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
157 | jabber_data_get_data(const JabberData *data) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
158 | { |
|
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
|
159 | 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
|
160 | |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
161 | return data->data; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
162 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
163 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
164 | PurpleXmlNode * |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
165 | jabber_data_get_xml_definition(const JabberData *data) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
166 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
167 | PurpleXmlNode *tag; |
|
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
|
168 | 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
|
169 | |
|
71b63f79a6a4
jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents:
30184
diff
changeset
|
170 | 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
|
171 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
172 | tag = purple_xmlnode_new("data"); |
|
38341
3da74e727e78
Remove purple_base64_encode/decode() wrappers
Mike Ruprecht <cmaiku@gmail.com>
parents:
38327
diff
changeset
|
173 | base64data = g_base64_encode(data->data, data->size); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
174 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
175 | purple_xmlnode_set_namespace(tag, NS_BOB); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
176 | purple_xmlnode_set_attrib(tag, "cid", data->cid); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
177 | purple_xmlnode_set_attrib(tag, "type", data->type); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
178 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
179 | purple_xmlnode_insert_data(tag, base64data, -1); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
180 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
181 | g_free(base64data); |
|
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 | return tag; |
|
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 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
186 | PurpleXmlNode * |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
187 | 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
|
188 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
189 | PurpleXmlNode *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
|
190 | char *src; |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
191 | |
|
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
|
192 | 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
|
193 | 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
|
194 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
195 | img = purple_xmlnode_new("img"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
196 | purple_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
|
197 | |
|
30db199e757d
jabber: Don't use a static array when it might not be sufficient.
Paul Aurich <darkrain42@pidgin.im>
parents:
30451
diff
changeset
|
198 | src = g_strconcat("cid:", data->cid, NULL); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
199 | purple_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
|
200 | g_free(src); |
|
23629
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 | return img; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
203 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
204 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
205 | static PurpleXmlNode * |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
206 | jabber_data_get_xml_request(const gchar *cid) |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
207 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
208 | PurpleXmlNode *tag = purple_xmlnode_new("data"); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
209 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
210 | purple_xmlnode_set_namespace(tag, NS_BOB); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
211 | purple_xmlnode_set_attrib(tag, "cid", cid); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
212 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
213 | return tag; |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
214 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
215 | |
|
29912
4f8e1c3bbc4a
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents:
29910
diff
changeset
|
216 | 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
|
217 | 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
|
218 | { |
|
4f8e1c3bbc4a
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents:
29910
diff
changeset
|
219 | 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
|
220 | 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
|
221 | 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
|
222 | 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
|
223 | |
|
29936
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
224 | if (cid_parts) |
|
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
225 | 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
|
226 | |
|
29936
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
227 | 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
|
228 | 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
|
229 | 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
|
230 | |
|
29936
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
231 | if (sub_parts) |
|
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
232 | 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
|
233 | |
|
29936
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
234 | 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
|
235 | 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
|
236 | const gchar *hash_value = sub_parts[1]; |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
237 | GChecksumType hash_type; |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
238 | gboolean valid_hash_type = TRUE; |
|
29936
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
239 | |
|
38327
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
240 | if (purple_strequal(hash_algo, "sha1")) |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
241 | hash_type = G_CHECKSUM_SHA1; |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
242 | else if (purple_strequal(hash_algo, "sha256")) |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
243 | hash_type = G_CHECKSUM_SHA256; |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
244 | else if (purple_strequal(hash_algo, "sha512")) |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
245 | hash_type = G_CHECKSUM_SHA512; |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
246 | else if (purple_strequal(hash_algo, "md5")) |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
247 | hash_type = G_CHECKSUM_MD5; |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
248 | else |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
249 | valid_hash_type = FALSE; |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
250 | |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
251 | if (valid_hash_type) { |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
252 | gchar *digest = g_compute_checksum_for_data( |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
253 | hash_type, jabber_data_get_data(data), |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
254 | jabber_data_get_size(data)); |
|
c842a56b9967
jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents:
35099
diff
changeset
|
255 | |
|
29936
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
256 | 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
|
257 | |
|
29936
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
258 | if (!ret) |
|
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", "Unable to validate BoB " |
|
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
260 | "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
|
261 | cid, digest); |
|
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
262 | |
|
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 | 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
|
264 | } else { |
|
29936
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
265 | 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
|
266 | "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
|
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 | } else { |
|
29936
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
269 | 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
|
270 | } |
|
29936
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
271 | |
|
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
272 | 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
|
273 | } |
|
29936
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
274 | |
|
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
275 | g_strfreev(cid_parts); |
|
8e4d3e3481ab
jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents:
29912
diff
changeset
|
276 | 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
|
277 | } |
|
4f8e1c3bbc4a
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents:
29910
diff
changeset
|
278 | |
|
29906
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
279 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
280 | typedef struct { |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
281 | gpointer userdata; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
282 | gchar *alt; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
283 | gboolean ephemeral; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
284 | JabberDataRequestCallback *cb; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
285 | } JabberDataRequestData; |
|
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 | static void |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
288 | jabber_data_request_cb(JabberStream *js, const char *from, |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
289 | JabberIqType type, const char *id, PurpleXmlNode *packet, gpointer data) |
|
29906
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 | 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
|
292 | 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
|
293 | 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
|
294 | 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
|
295 | JabberDataRequestCallback *cb = request_data->cb; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30453
diff
changeset
|
296 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
297 | PurpleXmlNode *data_element = purple_xmlnode_get_child(packet, "data"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
298 | PurpleXmlNode *item_not_found = purple_xmlnode_get_child(packet, "item-not-found"); |
|
29906
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 | /* 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
|
301 | 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
|
302 | 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
|
303 | |
|
30453
206741a404ca
jabber: Fix a crash in the BoB code when receiving from Jabbim.
Paul Aurich <darkrain42@pidgin.im>
parents:
30452
diff
changeset
|
304 | 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
|
305 | 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
|
306 | } |
|
29912
4f8e1c3bbc4a
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents:
29910
diff
changeset
|
307 | 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
|
308 | } 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
|
309 | purple_debug_info("jabber", |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
310 | "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
|
311 | cb(NULL, alt, userdata); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
312 | } 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
|
313 | 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
|
314 | cb(NULL, alt, userdata); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
315 | } |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
316 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
317 | g_free(request_data); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
318 | } |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
319 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
320 | void |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30453
diff
changeset
|
321 | 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
|
322 | 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
|
323 | gpointer userdata) |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
324 | { |
|
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
|
325 | JabberIq *request; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
326 | PurpleXmlNode *data_request; |
|
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
|
327 | 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
|
328 | |
|
71b63f79a6a4
jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents:
30184
diff
changeset
|
329 | 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
|
330 | 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
|
331 | 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
|
332 | |
|
71b63f79a6a4
jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents:
30184
diff
changeset
|
333 | 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
|
334 | 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
|
335 | 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
|
336 | |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
337 | data->userdata = userdata; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
338 | data->alt = alt; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
339 | data->ephemeral = ephemeral; |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
340 | data->cb = cb; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30453
diff
changeset
|
341 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
342 | purple_xmlnode_set_attrib(request->node, "to", who); |
|
29906
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
343 | jabber_iq_set_callback(request, jabber_data_request_cb, data); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
344 | purple_xmlnode_insert_child(request->node, data_request); |
|
29906
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
345 | jabber_iq_send(request); |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
346 | } |
|
2403e9d40e4a
jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents:
29380
diff
changeset
|
347 | |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
348 | const JabberData * |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
349 | 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
|
350 | { |
|
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
|
351 | 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
|
352 | 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
|
353 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
354 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
355 | const JabberData * |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
356 | 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
|
357 | { |
|
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
|
358 | 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
|
359 | 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
|
360 | } |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
361 | |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
362 | 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
|
363 | 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
|
364 | const gchar *cid) |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
365 | { |
|
29912
4f8e1c3bbc4a
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents:
29910
diff
changeset
|
366 | 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
|
367 | 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
|
368 | |
|
29912
4f8e1c3bbc4a
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents:
29910
diff
changeset
|
369 | 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
|
370 | 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
|
371 | 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
|
372 | 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
|
373 | 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
|
374 | "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
|
375 | 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
|
376 | 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
|
377 | 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
|
378 | } |
|
4f8e1c3bbc4a
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents:
29910
diff
changeset
|
379 | return data; |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
380 | } |
|
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 | void |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
383 | 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
|
384 | { |
|
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
|
385 | 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
|
386 | |
|
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
|
387 | 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
|
388 | 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
|
389 | 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
|
390 | 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
|
391 | 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
|
392 | data); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
393 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
394 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
395 | 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
|
396 | 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
|
397 | { |
|
29912
4f8e1c3bbc4a
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents:
29910
diff
changeset
|
398 | 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
|
399 | |
|
71b63f79a6a4
jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents:
30184
diff
changeset
|
400 | 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
|
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 | 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
|
403 | 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
|
404 | } else { |
|
4f8e1c3bbc4a
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents:
29910
diff
changeset
|
405 | 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
|
406 | 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
|
407 | } |
|
4f8e1c3bbc4a
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents:
29910
diff
changeset
|
408 | |
|
4f8e1c3bbc4a
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents:
29910
diff
changeset
|
409 | 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
|
410 | cid); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30453
diff
changeset
|
411 | |
|
29912
4f8e1c3bbc4a
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents:
29910
diff
changeset
|
412 | 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
|
413 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
414 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
415 | void |
|
25817
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
416 | jabber_data_parse(JabberStream *js, const char *who, JabberIqType type, |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
417 | const char *id, PurpleXmlNode *data_node) |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
418 | { |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
419 | JabberIq *result = NULL; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
420 | const char *cid = purple_xmlnode_get_attrib(data_node, "cid"); |
|
25817
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
421 | 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
|
422 | |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
423 | if (!data) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
424 | PurpleXmlNode *item_not_found = purple_xmlnode_new("item-not-found"); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
425 | |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
426 | 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
|
427 | if (who) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
428 | purple_xmlnode_set_attrib(result->node, "to", who); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
429 | purple_xmlnode_set_attrib(result->node, "id", id); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
430 | purple_xmlnode_insert_child(result->node, item_not_found); |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
431 | } else { |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
432 | 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
|
433 | if (who) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
434 | purple_xmlnode_set_attrib(result->node, "to", who); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
435 | purple_xmlnode_set_attrib(result->node, "id", id); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34297
diff
changeset
|
436 | purple_xmlnode_insert_child(result->node, |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
437 | 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
|
438 | /* 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
|
439 | to it */ |
|
36dfce0b39e9
Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents:
27422
diff
changeset
|
440 | 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
|
441 | 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
|
442 | } |
|
23629
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
443 | } |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
444 | jabber_iq_send(result); |
|
05adde07702c
New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff
changeset
|
445 | } |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
446 | |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
447 | void |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
448 | jabber_data_init(void) |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
449 | { |
|
34297
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
31294
diff
changeset
|
450 | if (purple_debug_is_verbose()) |
|
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
31294
diff
changeset
|
451 | purple_debug_misc("jabber", "creating hash tables for data objects"); |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
452 | 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
|
453 | g_free, NULL); |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
454 | 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
|
455 | g_free, jabber_data_delete); |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
456 | 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
|
457 | 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
|
458 | |
|
28979
191942cc7747
jabber: Start putting all the namespaces in one location with consistent naming.
Paul Aurich <darkrain42@pidgin.im>
parents:
28450
diff
changeset
|
459 | 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
|
460 | } |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
461 | |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
462 | void |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
463 | jabber_data_uninit(void) |
|
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
464 | { |
|
34297
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
31294
diff
changeset
|
465 | if (purple_debug_is_verbose()) |
|
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
31294
diff
changeset
|
466 | purple_debug_info("jabber", "destroying hash tables for data objects"); |
|
24254
2d990726bf92
Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents:
23629
diff
changeset
|
467 | 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
|
468 | 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
|
469 | 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
|
470 | 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
|
471 | } |