libpurple/protocols/jabber/jutil.c

Tue, 19 May 2020 10:29:23 +0000

author
Gary Kramlich <grim@reaperworld.com>
date
Tue, 19 May 2020 10:29:23 +0000
changeset 40417
48c621e76141
parent 40358
e6fe6fc1f516
child 40439
e9838d634d5e
permissions
-rw-r--r--

Merged in default (pull request #697)

simple: Fix search for message headers

Approved-by: Gary Kramlich

7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
1 /*
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2 * purple - Jabber Protocol Plugin
3127
4213ad5b231c [gaim-migrate @ 3142]
Sean Egan <seanegan@pidgin.im>
parents: 2086
diff changeset
3 *
28322
ac8fec1d2234 Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents: 27899
diff changeset
4 * Purple is the legal property of its developers, whose names are too numerous
ac8fec1d2234 Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents: 27899
diff changeset
5 * to list here. Please refer to the COPYRIGHT file distributed with this
ac8fec1d2234 Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents: 27899
diff changeset
6 * source distribution.
3127
4213ad5b231c [gaim-migrate @ 3142]
Sean Egan <seanegan@pidgin.im>
parents: 2086
diff changeset
7 *
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
8 * This program is free software; you can redistribute it and/or modify
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
9 * it under the terms of the GNU General Public License as published by
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
10 * the Free Software Foundation; either version 2 of the License, or
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
11 * (at your option) any later version.
3127
4213ad5b231c [gaim-migrate @ 3142]
Sean Egan <seanegan@pidgin.im>
parents: 2086
diff changeset
12 *
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
13 * This program is distributed in the hope that it will be useful,
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
16 * GNU General Public License for more details.
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
17 *
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
18 * You should have received a copy of the GNU General Public License
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
19 * along with this program; if not, write to the Free Software
19859
71d37b57eff2 The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 15952
diff changeset
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
3127
4213ad5b231c [gaim-migrate @ 3142]
Sean Egan <seanegan@pidgin.im>
parents: 2086
diff changeset
21 *
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
22 */
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
23 #include "internal.h"
40358
e6fe6fc1f516 move all protocols, purple plugins, and purple tests to use purple.h instead of including files individually
Gary Kramlich <grim@reaperworld.com>
parents: 40282
diff changeset
24 #include <purple.h>
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
25
7322
de15a9314c04 [gaim-migrate @ 7908]
Nathan Walp <nwalp@pidgin.im>
parents: 7310
diff changeset
26 #include "chat.h"
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
27 #include "presence.h"
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
28 #include "jutil.h"
3127
4213ad5b231c [gaim-migrate @ 3142]
Sean Egan <seanegan@pidgin.im>
parents: 2086
diff changeset
29
27849
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
30 #include <idna.h>
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
31 #include <stringprep.h>
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
32 static char idn_buffer[1024];
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
33
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
34 static gboolean jabber_nodeprep(char *str, size_t buflen)
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
35 {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
36 return stringprep_xmpp_nodeprep(str, buflen) == STRINGPREP_OK;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
37 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
38
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
39 static gboolean jabber_resourceprep(char *str, size_t buflen)
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
40 {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
41 return stringprep_xmpp_resourceprep(str, buflen) == STRINGPREP_OK;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
42 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
43
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
44 static JabberID*
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
45 jabber_idn_validate(const char *str, const char *at, const char *slash,
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
46 const char *null)
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
47 {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
48 const char *node = NULL;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
49 const char *domain = NULL;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
50 const char *resource = NULL;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
51 int node_len = 0;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
52 int domain_len = 0;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
53 int resource_len = 0;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
54 char *out;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
55 JabberID *jid;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
56
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
57 /* Ensure no parts are > 1023 bytes */
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
58 if (at) {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
59 node = str;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
60 node_len = at - str;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
61
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
62 domain = at + 1;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
63 if (slash) {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
64 domain_len = slash - (at + 1);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
65 resource = slash + 1;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
66 resource_len = null - (slash + 1);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
67 } else {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
68 domain_len = null - (at + 1);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
69 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
70 } else {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
71 domain = str;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
72
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
73 if (slash) {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
74 domain_len = slash - str;
36193
ea46ab68f0dc Fix a possible information leak when preping XMPP JIDs.
Mark Doliner <mark@kingant.net>
parents: 35308
diff changeset
75 resource = slash + 1;
27849
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
76 resource_len = null - (slash + 1);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
77 } else {
36193
ea46ab68f0dc Fix a possible information leak when preping XMPP JIDs.
Mark Doliner <mark@kingant.net>
parents: 35308
diff changeset
78 domain_len = null - str;
27849
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
79 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
80 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
81
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
82 if (node && node_len > 1023)
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
83 return NULL;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
84 if (domain_len > 1023)
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
85 return NULL;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
86 if (resource && resource_len > 1023)
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
87 return NULL;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
88
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
89 jid = g_new0(JabberID, 1);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
90
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
91 if (node) {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
92 strncpy(idn_buffer, node, node_len);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
93 idn_buffer[node_len] = '\0';
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
94
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
95 if (!jabber_nodeprep(idn_buffer, sizeof(idn_buffer))) {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
96 jabber_id_free(jid);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
97 jid = NULL;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
98 goto out;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
99 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
100
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
101 jid->node = g_strdup(idn_buffer);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
102 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
103
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
104 /* domain *must* be here */
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
105 strncpy(idn_buffer, domain, domain_len);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
106 idn_buffer[domain_len] = '\0';
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
107 if (domain[0] == '[') { /* IPv6 address */
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
108 gboolean valid = FALSE;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
109
39987
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
110 if (domain_len > 2 && idn_buffer[domain_len - 1] == ']') {
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
111 GInetAddress *addr;
27849
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
112 idn_buffer[domain_len - 1] = '\0';
39987
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
113 addr = g_inet_address_new_from_string(idn_buffer + 1);
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
114 if (addr != NULL) {
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
115 valid = (g_inet_address_get_family(addr) ==
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
116 G_SOCKET_FAMILY_IPV6);
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
117 g_object_unref(addr);
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
118 }
27849
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
119 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
120
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
121 if (!valid) {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
122 jabber_id_free(jid);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
123 jid = NULL;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
124 goto out;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
125 }
36193
ea46ab68f0dc Fix a possible information leak when preping XMPP JIDs.
Mark Doliner <mark@kingant.net>
parents: 35308
diff changeset
126
ea46ab68f0dc Fix a possible information leak when preping XMPP JIDs.
Mark Doliner <mark@kingant.net>
parents: 35308
diff changeset
127 jid->domain = g_strndup(domain, domain_len);
27849
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
128 } else {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
129 /* Apply nameprep */
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
130 if (stringprep_nameprep(idn_buffer, sizeof(idn_buffer)) != STRINGPREP_OK) {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
131 jabber_id_free(jid);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
132 jid = NULL;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
133 goto out;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
134 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
135
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
136 /* And now ToASCII */
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
137 if (idna_to_ascii_8z(idn_buffer, &out, IDNA_USE_STD3_ASCII_RULES) != IDNA_SUCCESS) {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
138 jabber_id_free(jid);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
139 jid = NULL;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
140 goto out;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
141 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
142
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
143 /* This *MUST* be freed using 'free', not 'g_free' */
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
144 free(out);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
145 jid->domain = g_strdup(idn_buffer);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
146 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
147
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
148 if (resource) {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
149 strncpy(idn_buffer, resource, resource_len);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
150 idn_buffer[resource_len] = '\0';
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
151
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
152 if (!jabber_resourceprep(idn_buffer, sizeof(idn_buffer))) {
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
153 jabber_id_free(jid);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
154 jid = NULL;
28535
2c150600a9e9 Fix a crash when attempting to validate a JID with an invalid resource.
Paul Aurich <darkrain42@pidgin.im>
parents: 28431
diff changeset
155 goto out;
2c150600a9e9 Fix a crash when attempting to validate a JID with an invalid resource.
Paul Aurich <darkrain42@pidgin.im>
parents: 28431
diff changeset
156 } else
2c150600a9e9 Fix a crash when attempting to validate a JID with an invalid resource.
Paul Aurich <darkrain42@pidgin.im>
parents: 28431
diff changeset
157 jid->resource = g_strdup(idn_buffer);
27849
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
158 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
159
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
160 out:
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
161 return jid;
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
162 }
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
163
7310
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
164 gboolean jabber_nodeprep_validate(const char *str)
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
165 {
27849
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
166 gboolean result;
7310
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
167
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
168 if(!str)
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
169 return TRUE;
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
170
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
171 if(strlen(str) > 1023)
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
172 return FALSE;
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
173
27849
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
174 strncpy(idn_buffer, str, sizeof(idn_buffer) - 1);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
175 idn_buffer[sizeof(idn_buffer) - 1] = '\0';
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
176 result = jabber_nodeprep(idn_buffer, sizeof(idn_buffer));
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
177 return result;
7310
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
178 }
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
179
27728
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
180 gboolean jabber_domain_validate(const char *str)
7310
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
181 {
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
182 const char *c;
27731
53ddfbc48e11 Save one traversal of the domain for IPv6 validation.
Paul Aurich <darkrain42@pidgin.im>
parents: 27728
diff changeset
183 size_t len;
7310
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
184
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
185 if(!str)
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
186 return TRUE;
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
187
27731
53ddfbc48e11 Save one traversal of the domain for IPv6 validation.
Paul Aurich <darkrain42@pidgin.im>
parents: 27728
diff changeset
188 len = strlen(str);
53ddfbc48e11 Save one traversal of the domain for IPv6 validation.
Paul Aurich <darkrain42@pidgin.im>
parents: 27728
diff changeset
189 if (len > 1023)
7310
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
190 return FALSE;
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
191
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
192 c = str;
27728
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
193
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
194 if (*c == '[') {
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
195 /* Check if str is a valid IPv6 identifier */
39987
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
196 GInetAddress *addr;
27728
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
197 gboolean valid = FALSE;
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
198
39987
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
199 if (len <= 2 || *(c + len - 1) != ']') {
27728
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
200 return FALSE;
39987
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
201 }
27728
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
202
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
203 /* Ugly, but in-place */
27731
53ddfbc48e11 Save one traversal of the domain for IPv6 validation.
Paul Aurich <darkrain42@pidgin.im>
parents: 27728
diff changeset
204 *(gchar *)(c + len - 1) = '\0';
39987
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
205 addr = g_inet_address_new_from_string(c + 1);
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
206 if (addr != NULL) {
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
207 valid = (g_inet_address_get_family(addr) == G_SOCKET_FAMILY_IPV6);
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
208 g_object_unref(addr);
9aea69045c1f Replace purple_ip*_address_is_valid by GLib functions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39833
diff changeset
209 }
27731
53ddfbc48e11 Save one traversal of the domain for IPv6 validation.
Paul Aurich <darkrain42@pidgin.im>
parents: 27728
diff changeset
210 *(gchar *)(c + len - 1) = ']';
27728
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
211
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
212 return valid;
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
213 }
03b2a20ba465 Validate IPv6 identifiers in the domain portion of a JID.
Paul Aurich <darkrain42@pidgin.im>
parents: 27723
diff changeset
214
7310
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
215 while(c && *c) {
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
216 gunichar ch = g_utf8_get_char(c);
27720
a809853d8d46 Be more restrictive in the characters allowed by jabber_nameprep_validate()
Mark Doliner <markdoliner@pidgin.im>
parents: 27719
diff changeset
217 /* The list of characters allowed in domain names is pretty small */
27722
3f93427031cd XMPP allows for internationalized domain names.
Paul Aurich <darkrain42@pidgin.im>
parents: 27721
diff changeset
218 if ((ch <= 0x7F && !( (ch >= 'a' && ch <= 'z')
27720
a809853d8d46 Be more restrictive in the characters allowed by jabber_nameprep_validate()
Mark Doliner <markdoliner@pidgin.im>
parents: 27719
diff changeset
219 || (ch >= '0' && ch <= '9')
a809853d8d46 Be more restrictive in the characters allowed by jabber_nameprep_validate()
Mark Doliner <markdoliner@pidgin.im>
parents: 27719
diff changeset
220 || (ch >= 'A' && ch <= 'Z')
a809853d8d46 Be more restrictive in the characters allowed by jabber_nameprep_validate()
Mark Doliner <markdoliner@pidgin.im>
parents: 27719
diff changeset
221 || ch == '.'
27722
3f93427031cd XMPP allows for internationalized domain names.
Paul Aurich <darkrain42@pidgin.im>
parents: 27721
diff changeset
222 || ch == '-' )) || (ch >= 0x80 && !g_unichar_isgraph(ch)))
7310
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
223 return FALSE;
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
224
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
225 c = g_utf8_next_char(c);
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
226 }
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
227
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
228 return TRUE;
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
229 }
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
230
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
231 gboolean jabber_resourceprep_validate(const char *str)
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
232 {
27849
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
233 gboolean result;
7310
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
234
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
235 if(!str)
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
236 return TRUE;
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
237
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
238 if(strlen(str) > 1023)
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
239 return FALSE;
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
240
27849
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
241 strncpy(idn_buffer, str, sizeof(idn_buffer) - 1);
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
242 idn_buffer[sizeof(idn_buffer) - 1] = '\0';
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
243 result = jabber_resourceprep(idn_buffer, sizeof(idn_buffer));
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
244 return result;
7310
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
245 }
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
246
29027
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
247 char *jabber_saslprep(const char *in)
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
248 {
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
249 char *out;
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
250
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
251 g_return_val_if_fail(in != NULL, NULL);
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
252 g_return_val_if_fail(strlen(in) <= sizeof(idn_buffer) - 1, NULL);
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
253
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
254 strncpy(idn_buffer, in, sizeof(idn_buffer) - 1);
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
255 idn_buffer[sizeof(idn_buffer) - 1] = '\0';
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
256
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
257 if (STRINGPREP_OK != stringprep(idn_buffer, sizeof(idn_buffer), 0,
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
258 stringprep_saslprep)) {
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
259 memset(idn_buffer, 0, sizeof(idn_buffer));
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
260 return NULL;
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
261 }
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
262
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
263 out = g_strdup(idn_buffer);
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
264 memset(idn_buffer, 0, sizeof(idn_buffer));
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
265 return out;
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
266 }
6af29b140195 jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents: 28535
diff changeset
267
28414
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
268 static JabberID*
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
269 jabber_id_new_internal(const char *str, gboolean allow_terminating_slash)
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
270 {
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
271 const char *at = NULL;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
272 const char *slash = NULL;
27714
c86eb4fefae2 Change jabber_id_new() to iterate byte by byte instead of character
Mark Doliner <markdoliner@pidgin.im>
parents: 27713
diff changeset
273 const char *c;
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
274 gboolean needs_validation = FALSE;
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
275 JabberID *jid;
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
276
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
277 if (!str)
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
278 return NULL;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
279
27714
c86eb4fefae2 Change jabber_id_new() to iterate byte by byte instead of character
Mark Doliner <markdoliner@pidgin.im>
parents: 27713
diff changeset
280 for (c = str; *c != '\0'; c++)
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
281 {
27714
c86eb4fefae2 Change jabber_id_new() to iterate byte by byte instead of character
Mark Doliner <markdoliner@pidgin.im>
parents: 27713
diff changeset
282 switch (*c) {
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
283 case '@':
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
284 if (!slash) {
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
285 if (at) {
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
286 /* Multiple @'s in the node/domain portion, not a valid JID! */
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
287 return NULL;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
288 }
27714
c86eb4fefae2 Change jabber_id_new() to iterate byte by byte instead of character
Mark Doliner <markdoliner@pidgin.im>
parents: 27713
diff changeset
289 if (c == str) {
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
290 /* JIDs cannot start with @ */
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
291 return NULL;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
292 }
27714
c86eb4fefae2 Change jabber_id_new() to iterate byte by byte instead of character
Mark Doliner <markdoliner@pidgin.im>
parents: 27713
diff changeset
293 if (c[1] == '\0') {
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
294 /* JIDs cannot end with @ */
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
295 return NULL;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
296 }
27714
c86eb4fefae2 Change jabber_id_new() to iterate byte by byte instead of character
Mark Doliner <markdoliner@pidgin.im>
parents: 27713
diff changeset
297 at = c;
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
298 }
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
299 break;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
300
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
301 case '/':
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
302 if (!slash) {
27714
c86eb4fefae2 Change jabber_id_new() to iterate byte by byte instead of character
Mark Doliner <markdoliner@pidgin.im>
parents: 27713
diff changeset
303 if (c == str) {
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
304 /* JIDs cannot start with / */
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
305 return NULL;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
306 }
28414
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
307 if (c[1] == '\0' && !allow_terminating_slash) {
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
308 /* JIDs cannot end with / */
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
309 return NULL;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
310 }
27714
c86eb4fefae2 Change jabber_id_new() to iterate byte by byte instead of character
Mark Doliner <markdoliner@pidgin.im>
parents: 27713
diff changeset
311 slash = c;
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
312 }
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
313 break;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
314
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
315 default:
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
316 /* characters allowed everywhere */
27719
cc4aea1fd74c Of course, these should be >= and <=
Mark Doliner <markdoliner@pidgin.im>
parents: 27714
diff changeset
317 if ((*c >= 'a' && *c <= 'z')
cc4aea1fd74c Of course, these should be >= and <=
Mark Doliner <markdoliner@pidgin.im>
parents: 27714
diff changeset
318 || (*c >= '0' && *c <= '9')
cc4aea1fd74c Of course, these should be >= and <=
Mark Doliner <markdoliner@pidgin.im>
parents: 27714
diff changeset
319 || (*c >= 'A' && *c <= 'Z')
27714
c86eb4fefae2 Change jabber_id_new() to iterate byte by byte instead of character
Mark Doliner <markdoliner@pidgin.im>
parents: 27713
diff changeset
320 || *c == '.' || *c == '-')
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
321 /* We're good */
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
322 break;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
323
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
324 /*
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
325 * Hmm, this character is a bit more exotic. Better fall
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
326 * back to using the more expensive UTF-8 compliant
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
327 * stringprep functions.
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
328 */
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
329 needs_validation = TRUE;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
330 break;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
331 }
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
332 }
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
333
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
334 if (!needs_validation) {
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
335 /* JID is made of only ASCII characters--just lowercase and return */
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
336 jid = g_new0(JabberID, 1);
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
337
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
338 if (at) {
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
339 jid->node = g_ascii_strdown(str, at - str);
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
340 if (slash) {
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
341 jid->domain = g_ascii_strdown(at + 1, slash - (at + 1));
28414
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
342 if (*(slash + 1))
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
343 jid->resource = g_strdup(slash + 1);
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
344 } else {
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
345 jid->domain = g_ascii_strdown(at + 1, -1);
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
346 }
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
347 } else {
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
348 if (slash) {
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
349 jid->domain = g_ascii_strdown(str, slash - str);
28414
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
350 if (*(slash + 1))
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
351 jid->resource = g_strdup(slash + 1);
27713
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
352 } else {
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
353 jid->domain = g_ascii_strdown(str, -1);
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
354 }
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
355 }
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
356 return jid;
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
357 }
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
358
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
359 /*
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
360 * If we get here, there are some non-ASCII chars in the string, so
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
361 * we'll need to validate it, normalize, and finally do a full jabber
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
362 * nodeprep on the jid.
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
363 */
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
364
9985f2f358c9 Check in a version of jabber_id_new() that is hopefully more efficient.
Mark Doliner <markdoliner@pidgin.im>
parents: 27689
diff changeset
365 if (!g_utf8_validate(str, -1, NULL))
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
366 return NULL;
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
367
27849
7f7428cb8309 When GNU Libidn is available, use it for XMPP stringprep operations.
Paul Aurich <darkrain42@pidgin.im>
parents: 27819
diff changeset
368 return jabber_idn_validate(str, at, slash, c /* points to the null */);
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
369 }
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
370
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
371 void
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
372 jabber_id_free(JabberID *jid)
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
373 {
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
374 if(jid) {
31509
992ad686ba0b jabber: if (foo) g_free(foo) -> g_free(foo)
Paul Aurich <darkrain42@pidgin.im>
parents: 31294
diff changeset
375 g_free(jid->node);
992ad686ba0b jabber: if (foo) g_free(foo) -> g_free(foo)
Paul Aurich <darkrain42@pidgin.im>
parents: 31294
diff changeset
376 g_free(jid->domain);
992ad686ba0b jabber: if (foo) g_free(foo) -> g_free(foo)
Paul Aurich <darkrain42@pidgin.im>
parents: 31294
diff changeset
377 g_free(jid->resource);
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
378 g_free(jid);
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
379 }
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
380 }
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
381
35235
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
382
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
383 gboolean
35308
b8e2a5fbffd3 Fix problems logging into some servers including jabber.org and
Mark Doliner <mark@kingant.net>
parents: 35235
diff changeset
384 jabber_id_equal(const JabberID *jid1, const JabberID *jid2)
35235
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
385 {
35308
b8e2a5fbffd3 Fix problems logging into some servers including jabber.org and
Mark Doliner <mark@kingant.net>
parents: 35235
diff changeset
386 if (!jid1 && !jid2) {
b8e2a5fbffd3 Fix problems logging into some servers including jabber.org and
Mark Doliner <mark@kingant.net>
parents: 35235
diff changeset
387 /* Both are null therefore equal */
35235
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
388 return TRUE;
35308
b8e2a5fbffd3 Fix problems logging into some servers including jabber.org and
Mark Doliner <mark@kingant.net>
parents: 35235
diff changeset
389 }
35235
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
390
35308
b8e2a5fbffd3 Fix problems logging into some servers including jabber.org and
Mark Doliner <mark@kingant.net>
parents: 35235
diff changeset
391 if (!jid1 || !jid2) {
b8e2a5fbffd3 Fix problems logging into some servers including jabber.org and
Mark Doliner <mark@kingant.net>
parents: 35235
diff changeset
392 /* One is null, other is non-null, therefore not equal */
b8e2a5fbffd3 Fix problems logging into some servers including jabber.org and
Mark Doliner <mark@kingant.net>
parents: 35235
diff changeset
393 return FALSE;
b8e2a5fbffd3 Fix problems logging into some servers including jabber.org and
Mark Doliner <mark@kingant.net>
parents: 35235
diff changeset
394 }
35235
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
395
35308
b8e2a5fbffd3 Fix problems logging into some servers including jabber.org and
Mark Doliner <mark@kingant.net>
parents: 35235
diff changeset
396 return purple_strequal(jid1->node, jid2->node) &&
b8e2a5fbffd3 Fix problems logging into some servers including jabber.org and
Mark Doliner <mark@kingant.net>
parents: 35235
diff changeset
397 purple_strequal(jid1->domain, jid2->domain) &&
b8e2a5fbffd3 Fix problems logging into some servers including jabber.org and
Mark Doliner <mark@kingant.net>
parents: 35235
diff changeset
398 purple_strequal(jid1->resource, jid2->resource);
35235
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
399 }
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
400
29063
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
401 char *jabber_get_domain(const char *in)
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
402 {
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
403 JabberID *jid = jabber_id_new(in);
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
404 char *out;
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
405
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
406 if (!jid)
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
407 return NULL;
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
408
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
409 out = g_strdup(jid->domain);
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
410 jabber_id_free(jid);
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
411
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
412 return out;
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
413 }
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
414
7306
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
415 char *jabber_get_resource(const char *in)
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
416 {
7306
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
417 JabberID *jid = jabber_id_new(in);
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
418 char *out;
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
419
7306
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
420 if(!jid)
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
421 return NULL;
7306
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
422
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
423 out = g_strdup(jid->resource);
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
424 jabber_id_free(jid);
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
425
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
426 return out;
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
427 }
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
428
35235
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
429 JabberID *
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
430 jabber_id_to_bare_jid(const JabberID *jid)
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
431 {
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
432 JabberID *result = g_new0(JabberID, 1);
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
433
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
434 result->node = g_strdup(jid->node);
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
435 result->domain = g_strdup(jid->domain);
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
436
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
437 return result;
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
438 }
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
439
28431
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
440 char *
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
441 jabber_get_bare_jid(const char *in)
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
442 {
7306
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
443 JabberID *jid = jabber_id_new(in);
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
444 char *out;
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
445
28431
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
446 if (!jid)
7306
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
447 return NULL;
28431
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
448 out = jabber_id_get_bare_jid(jid);
7306
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
449 jabber_id_free(jid);
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
450
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
451 return out;
7014
11471fae7ba0 [gaim-migrate @ 7577]
Nathan Walp <nwalp@pidgin.im>
parents: 3717
diff changeset
452 }
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7014
diff changeset
453
28431
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
454 char *
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
455 jabber_id_get_bare_jid(const JabberID *jid)
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
456 {
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
457 g_return_val_if_fail(jid != NULL, NULL);
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
458
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
459 return g_strconcat(jid->node ? jid->node : "",
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
460 jid->node ? "@" : "",
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
461 jid->domain,
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
462 NULL);
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
463 }
8450418b5abd jabber: Properly handle adding buddies that contain a resource. Closes #10151.
Paul Aurich <darkrain42@pidgin.im>
parents: 28414
diff changeset
464
35235
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
465 char *
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
466 jabber_id_get_full_jid(const JabberID *jid)
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
467 {
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
468 g_return_val_if_fail(jid != NULL, NULL);
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
469
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
470 return g_strconcat(jid->node ? jid->node : "",
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
471 jid->node ? "@" : "",
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
472 jid->domain,
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
473 jid->resource ? "/" : "",
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
474 jid->resource ? jid->resource : "",
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
475 NULL);
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
476 }
93d4bff19574 Prevent spoofing of iq replies by verifying that the 'from' address
Mark Doliner <mark@kingant.net>
parents: 31509
diff changeset
477
29063
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
478 gboolean
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
479 jabber_jid_is_domain(const char *jid)
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
480 {
29097
0834410aa178 Tighter scoping and slightly less memory usage.
Paul Aurich <darkrain42@pidgin.im>
parents: 29085
diff changeset
481 const char *c;
29063
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
482
29097
0834410aa178 Tighter scoping and slightly less memory usage.
Paul Aurich <darkrain42@pidgin.im>
parents: 29085
diff changeset
483 for (c = jid; *c; ++c) {
0834410aa178 Tighter scoping and slightly less memory usage.
Paul Aurich <darkrain42@pidgin.im>
parents: 29085
diff changeset
484 if (*c == '@' || *c == '/')
0834410aa178 Tighter scoping and slightly less memory usage.
Paul Aurich <darkrain42@pidgin.im>
parents: 29085
diff changeset
485 return FALSE;
0834410aa178 Tighter scoping and slightly less memory usage.
Paul Aurich <darkrain42@pidgin.im>
parents: 29085
diff changeset
486 }
0834410aa178 Tighter scoping and slightly less memory usage.
Paul Aurich <darkrain42@pidgin.im>
parents: 29085
diff changeset
487
0834410aa178 Tighter scoping and slightly less memory usage.
Paul Aurich <darkrain42@pidgin.im>
parents: 29085
diff changeset
488 return TRUE;
29063
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
489 }
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
490
f245c5e9e9f3 jabber: When getting info on a "bare" domain JID, interpret the value of "last"
Marcus Lundblad <malu@pidgin.im>
parents: 28535
diff changeset
491
28414
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
492 JabberID *
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
493 jabber_id_new(const char *str)
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
494 {
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
495 return jabber_id_new_internal(str, FALSE);
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
496 }
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
497
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
498 const char *jabber_normalize(const PurpleAccount *account, const char *in)
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7014
diff changeset
499 {
32277
97f16af01a05 Convert jabber prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents: 31509
diff changeset
500 PurpleConnection *gc = NULL;
97f16af01a05 Convert jabber prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents: 31509
diff changeset
501 JabberStream *js = NULL;
7322
de15a9314c04 [gaim-migrate @ 7908]
Nathan Walp <nwalp@pidgin.im>
parents: 7310
diff changeset
502 static char buf[3072]; /* maximum legal length of a jabber jid */
de15a9314c04 [gaim-migrate @ 7908]
Nathan Walp <nwalp@pidgin.im>
parents: 7310
diff changeset
503 JabberID *jid;
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7014
diff changeset
504
39833
cd90938cd6f7 Silence various discarded const warnings.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38854
diff changeset
505 if (account) {
cd90938cd6f7 Silence various discarded const warnings.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38854
diff changeset
506 gc = purple_account_get_connection((PurpleAccount *)account);
cd90938cd6f7 Silence various discarded const warnings.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38854
diff changeset
507 }
32277
97f16af01a05 Convert jabber prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents: 31509
diff changeset
508 if (gc)
97f16af01a05 Convert jabber prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents: 31509
diff changeset
509 js = purple_connection_get_protocol_data(gc);
97f16af01a05 Convert jabber prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Andrew Victor <andrew.victor@mxit.com>
parents: 31509
diff changeset
510
28414
5093c1a49d5c jabber: Use a better method for dealing with terminating slashes in JIDs.
Paul Aurich <darkrain42@pidgin.im>
parents: 28336
diff changeset
511 jid = jabber_id_new_internal(in, TRUE);
7322
de15a9314c04 [gaim-migrate @ 7908]
Nathan Walp <nwalp@pidgin.im>
parents: 7310
diff changeset
512 if(!jid)
7310
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
513 return NULL;
1346a99cba40 [gaim-migrate @ 7894]
Nathan Walp <nwalp@pidgin.im>
parents: 7306
diff changeset
514
27130
9cb09f3df8c7 jabber_id_new() needs to be case-folding the node and domain.
Paul Aurich <darkrain42@pidgin.im>
parents: 25110
diff changeset
515 if(js && jid->node && jid->resource &&
9cb09f3df8c7 jabber_id_new() needs to be case-folding the node and domain.
Paul Aurich <darkrain42@pidgin.im>
parents: 25110
diff changeset
516 jabber_chat_find(js, jid->node, jid->domain))
9cb09f3df8c7 jabber_id_new() needs to be case-folding the node and domain.
Paul Aurich <darkrain42@pidgin.im>
parents: 25110
diff changeset
517 g_snprintf(buf, sizeof(buf), "%s@%s/%s", jid->node, jid->domain,
7322
de15a9314c04 [gaim-migrate @ 7908]
Nathan Walp <nwalp@pidgin.im>
parents: 7310
diff changeset
518 jid->resource);
de15a9314c04 [gaim-migrate @ 7908]
Nathan Walp <nwalp@pidgin.im>
parents: 7310
diff changeset
519 else
27130
9cb09f3df8c7 jabber_id_new() needs to be case-folding the node and domain.
Paul Aurich <darkrain42@pidgin.im>
parents: 25110
diff changeset
520 g_snprintf(buf, sizeof(buf), "%s%s%s", jid->node ? jid->node : "",
9cb09f3df8c7 jabber_id_new() needs to be case-folding the node and domain.
Paul Aurich <darkrain42@pidgin.im>
parents: 25110
diff changeset
521 jid->node ? "@" : "", jid->domain);
7322
de15a9314c04 [gaim-migrate @ 7908]
Nathan Walp <nwalp@pidgin.im>
parents: 7310
diff changeset
522
7429
bc354dd928bf [gaim-migrate @ 8033]
Nathan Walp <nwalp@pidgin.im>
parents: 7419
diff changeset
523 jabber_id_free(jid);
bc354dd928bf [gaim-migrate @ 8033]
Nathan Walp <nwalp@pidgin.im>
parents: 7419
diff changeset
524
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7014
diff changeset
525 return buf;
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7014
diff changeset
526 }
7306
61d7324411f8 [gaim-migrate @ 7890]
Nathan Walp <nwalp@pidgin.im>
parents: 7262
diff changeset
527
27163
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
528 gboolean
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
529 jabber_is_own_server(JabberStream *js, const char *str)
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
530 {
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
531 JabberID *jid;
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
532 gboolean equal;
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
533
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
534 if (str == NULL)
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
535 return FALSE;
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
536
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
537 g_return_val_if_fail(*str != '\0', FALSE);
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
538
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
539 jid = jabber_id_new(str);
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
540 if (!jid)
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
541 return FALSE;
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
542
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
543 equal = (jid->node == NULL &&
38256
035f00c4fd87 Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 36256
diff changeset
544 purple_strequal(jid->domain, js->user->domain) &&
27163
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
545 jid->resource == NULL);
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
546 jabber_id_free(jid);
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
547 return equal;
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
548 }
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
549
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
550 gboolean
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
551 jabber_is_own_account(JabberStream *js, const char *str)
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
552 {
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
553 JabberID *jid;
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
554 gboolean equal;
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
555
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
556 if (str == NULL)
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
557 return TRUE;
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
558
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
559 g_return_val_if_fail(*str != '\0', FALSE);
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
560
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
561 jid = jabber_id_new(str);
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
562 if (!jid)
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
563 return FALSE;
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
564
27191
09b3a16e7330 Allow incoming stanzas to match 'our account' if they come from our resource.
Paul Aurich <darkrain42@pidgin.im>
parents: 27163
diff changeset
565 equal = (purple_strequal(jid->node, js->user->node) &&
38256
035f00c4fd87 Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 36256
diff changeset
566 purple_strequal(jid->domain, js->user->domain) &&
27191
09b3a16e7330 Allow incoming stanzas to match 'our account' if they come from our resource.
Paul Aurich <darkrain42@pidgin.im>
parents: 27163
diff changeset
567 (jid->resource == NULL ||
38256
035f00c4fd87 Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 36256
diff changeset
568 purple_strequal(jid->resource, js->user->resource)));
27163
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
569 jabber_id_free(jid);
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
570 return equal;
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
571 }
398d47149e2f Add two helper functions useful for matching the 'from' attribute on packets to either our server or our account.
Paul Aurich <darkrain42@pidgin.im>
parents: 27130
diff changeset
572
29384
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
573 static const struct {
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
574 const char *status_id; /* link to core */
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
575 const char *show; /* The show child's cdata in a presence stanza */
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
576 const char *readable; /* readable representation */
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
577 JabberBuddyState state;
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
578 } jabber_statuses[] = {
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
579 { "offline", NULL, N_("Offline"), JABBER_BUDDY_STATE_UNAVAILABLE },
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
580 { "available", NULL, N_("Available"), JABBER_BUDDY_STATE_ONLINE},
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
581 { "freeforchat", "chat", N_("Chatty"), JABBER_BUDDY_STATE_CHAT },
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
582 { "away", "away", N_("Away"), JABBER_BUDDY_STATE_AWAY },
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
583 { "extended_away", "xa", N_("Extended Away"), JABBER_BUDDY_STATE_XA },
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
584 { "dnd", "dnd", N_("Do Not Disturb"), JABBER_BUDDY_STATE_DND },
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
585 { "error", NULL, N_("Error"), JABBER_BUDDY_STATE_ERROR }
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
586 };
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
587
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
588 const char *
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
589 jabber_buddy_state_get_name(const JabberBuddyState state)
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
590 {
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36193
diff changeset
591 gsize i;
29384
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
592 for (i = 0; i < G_N_ELEMENTS(jabber_statuses); ++i)
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
593 if (jabber_statuses[i].state == state)
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
594 return _(jabber_statuses[i].readable);
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
595
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
596 return _("Unknown");
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
597 }
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
598
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
599 JabberBuddyState
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
600 jabber_buddy_status_id_get_state(const char *id)
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
601 {
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36193
diff changeset
602 gsize i;
29384
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
603 if (!id)
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
604 return JABBER_BUDDY_STATE_UNKNOWN;
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
605
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
606 for (i = 0; i < G_N_ELEMENTS(jabber_statuses); ++i)
38256
035f00c4fd87 Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 36256
diff changeset
607 if (purple_strequal(id, jabber_statuses[i].status_id))
29384
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
608 return jabber_statuses[i].state;
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
609
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
610 return JABBER_BUDDY_STATE_UNKNOWN;
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
611 }
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
612
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
613 JabberBuddyState jabber_buddy_show_get_state(const char *id)
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
614 {
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36193
diff changeset
615 gsize i;
29384
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
616
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
617 g_return_val_if_fail(id != NULL, JABBER_BUDDY_STATE_UNKNOWN);
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
618
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
619 for (i = 0; i < G_N_ELEMENTS(jabber_statuses); ++i)
38256
035f00c4fd87 Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 36256
diff changeset
620 if (jabber_statuses[i].show && purple_strequal(id, jabber_statuses[i].show))
29384
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
621 return jabber_statuses[i].state;
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
622
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
623 purple_debug_warning("jabber", "Invalid value of presence <show/> "
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
624 "attribute: %s\n", id);
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
625 return JABBER_BUDDY_STATE_UNKNOWN;
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
626 }
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
627
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
628 const char *
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
629 jabber_buddy_state_get_show(JabberBuddyState state)
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
630 {
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36193
diff changeset
631 gsize i;
29384
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
632 for (i = 0; i < G_N_ELEMENTS(jabber_statuses); ++i)
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
633 if (state == jabber_statuses[i].state)
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
634 return jabber_statuses[i].show;
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
635
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
636 return NULL;
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
637 }
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
638
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
639 const char *
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
640 jabber_buddy_state_get_status_id(JabberBuddyState state)
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
641 {
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36193
diff changeset
642 gsize i;
29384
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
643 for (i = 0; i < G_N_ELEMENTS(jabber_statuses); ++i)
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
644 if (state == jabber_statuses[i].state)
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
645 return jabber_statuses[i].status_id;
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
646
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
647 return NULL;
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
648 }
b7b6be8f77fd jabber: Move those functions to jutil.[ch]
Paul Aurich <darkrain42@pidgin.im>
parents: 29336
diff changeset
649

mercurial