Mercurial > ~mikael > mcabber > hg
annotate mcabber/mcabber/xmpp_helper.c @ 2020:46a21258ad91
Fix some compiler warnings
author | Myhailo Danylenko <isbear@ukrpost.net> |
---|---|
date | Sat, 28 Jul 2012 22:10:12 +0300 |
parents | 51f032d5ca22 |
children | f740c4128f76 |
rev | line source |
---|---|
1598 | 1 /* |
1599 | 2 * xmpp_helper.c -- Jabber protocol helper functions |
1598 | 3 * |
1901
84bb3e893586
Update some file headers
Mikael Berthe <mikael@lilotux.net>
parents:
1896
diff
changeset
|
4 * Copyright (C) 2008-2010 Frank Zschockelt <mcabber@freakysoft.de> |
84bb3e893586
Update some file headers
Mikael Berthe <mikael@lilotux.net>
parents:
1896
diff
changeset
|
5 * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> |
1598 | 6 * |
7 * This program is free software; you can redistribute it and/or modify | |
8 * it under the terms of the GNU General Public License as published by | |
9 * the Free Software Foundation; either version 2 of the License, or (at | |
10 * your option) any later version. | |
11 * | |
12 * This program is distributed in the hope that it will be useful, but | |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU General Public License | |
18 * along with this program; if not, write to the Free Software | |
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | |
20 * USA | |
21 */ | |
22 | |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
23 #include <string.h> |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
24 #include <stdlib.h> |
2020
46a21258ad91
Fix some compiler warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1999
diff
changeset
|
25 #include <stdio.h> // snprintf |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
26 |
1598 | 27 #include "xmpp_helper.h" |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
28 #include "settings.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
29 #include "utils.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
30 #include "caps.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
31 #include "logprint.h" |
1607 | 32 #include "config.h" |
1598 | 33 |
34 time_t iqlast; // last message/status change time | |
35 | |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
36 extern char *imstatus_showmap[]; |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
37 |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
38 struct xmpp_error xmpp_errors[] = { |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
39 {XMPP_ERROR_REDIRECT, "302", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
40 "Redirect", "redirect", "modify"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
41 {XMPP_ERROR_BAD_REQUEST, "400", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
42 "Bad Request", "bad-request", "modify"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
43 {XMPP_ERROR_NOT_AUTHORIZED, "401", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
44 "Not Authorized", "not-authorized", "auth"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
45 {XMPP_ERROR_PAYMENT_REQUIRED, "402", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
46 "Payment Required", "payment-required", "auth"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
47 {XMPP_ERROR_FORBIDDEN, "403", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
48 "Forbidden", "forbidden", "auth"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
49 {XMPP_ERROR_NOT_FOUND, "404", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
50 "Not Found", "item-not-found", "cancel"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
51 {XMPP_ERROR_NOT_ALLOWED, "405", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
52 "Not Allowed", "not-allowed", "cancel"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
53 {XMPP_ERROR_NOT_ACCEPTABLE, "406", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
54 "Not Acceptable", "not-acceptable", "modify"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
55 {XMPP_ERROR_REGISTRATION_REQUIRED, "407", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
56 "Registration required", "registration-required", "auth"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
57 {XMPP_ERROR_REQUEST_TIMEOUT, "408", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
58 "Request Timeout", "remote-server-timeout", "wait"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
59 {XMPP_ERROR_CONFLICT, "409", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
60 "Conflict", "conflict", "cancel"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
61 {XMPP_ERROR_INTERNAL_SERVER_ERROR, "500", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
62 "Internal Server Error", "internal-server-error", "wait"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
63 {XMPP_ERROR_NOT_IMPLEMENTED, "501", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
64 "Not Implemented", "feature-not-implemented", "cancel"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
65 {XMPP_ERROR_REMOTE_SERVER_ERROR, "502", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
66 "Remote Server Error", "service-unavailable", "wait"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
67 {XMPP_ERROR_SERVICE_UNAVAILABLE, "503", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
68 "Service Unavailable", "service-unavailable", "cancel"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
69 {XMPP_ERROR_REMOTE_SERVER_TIMEOUT, "504", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
70 "Remote Server Timeout", "remote-server-timeout", "wait"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
71 {XMPP_ERROR_DISCONNECTED, "510", |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
72 "Disconnected", "service-unavailable", "cancel"}, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
73 {0, NULL, NULL, NULL, NULL} |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
74 }; |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
75 |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
76 |
1607 | 77 #ifdef MODULES_ENABLE |
78 static GSList *xmpp_additional_features = NULL; | |
79 static char *ver, *ver_notavail; | |
80 | |
1857
189c2a5a4e66
Fix coding style in xmpp_helper
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1811
diff
changeset
|
81 void xmpp_add_feature(const char *xmlns) |
1607 | 82 { |
83 if (xmlns) { | |
84 ver = NULL; | |
85 ver_notavail = NULL; | |
86 xmpp_additional_features = g_slist_append(xmpp_additional_features, | |
1857
189c2a5a4e66
Fix coding style in xmpp_helper
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1811
diff
changeset
|
87 g_strdup(xmlns)); |
1607 | 88 } |
89 } | |
90 | |
1857
189c2a5a4e66
Fix coding style in xmpp_helper
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1811
diff
changeset
|
91 void xmpp_del_feature(const char *xmlns) |
1607 | 92 { |
93 GSList *feature = xmpp_additional_features; | |
94 while (feature) { | |
95 if (!strcmp(feature->data, xmlns)) { | |
96 ver = NULL; | |
97 ver_notavail = NULL; | |
1857
189c2a5a4e66
Fix coding style in xmpp_helper
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1811
diff
changeset
|
98 g_free(feature->data); |
1607 | 99 xmpp_additional_features = g_slist_delete_link(xmpp_additional_features, |
100 feature); | |
101 return; | |
102 } | |
1857
189c2a5a4e66
Fix coding style in xmpp_helper
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1811
diff
changeset
|
103 feature = g_slist_next(feature); |
1607 | 104 } |
105 } | |
106 #endif | |
107 | |
1598 | 108 const gchar* lm_message_node_get_child_value(LmMessageNode *node, |
109 const gchar *child) | |
110 { | |
111 LmMessageNode *tmp; | |
112 tmp = lm_message_node_find_child(node, child); | |
1896
c5ab9cf3819a
[MUC] Fix handling of empty room topic
Mikael Berthe <mikael@lilotux.net>
parents:
1857
diff
changeset
|
113 if (tmp) { |
c5ab9cf3819a
[MUC] Fix handling of empty room topic
Mikael Berthe <mikael@lilotux.net>
parents:
1857
diff
changeset
|
114 const gchar *val = lm_message_node_get_value(tmp); |
c5ab9cf3819a
[MUC] Fix handling of empty room topic
Mikael Berthe <mikael@lilotux.net>
parents:
1857
diff
changeset
|
115 return (val ? val : ""); |
c5ab9cf3819a
[MUC] Fix handling of empty room topic
Mikael Berthe <mikael@lilotux.net>
parents:
1857
diff
changeset
|
116 } |
c5ab9cf3819a
[MUC] Fix handling of empty room topic
Mikael Berthe <mikael@lilotux.net>
parents:
1857
diff
changeset
|
117 return NULL; |
1598 | 118 } |
119 | |
120 static LmMessageNode *hidden = NULL; | |
121 | |
122 void lm_message_node_hide(LmMessageNode *node) | |
123 { | |
124 LmMessageNode *parent = node->parent, *prev_sibling = node->prev; | |
125 | |
126 if (hidden) { | |
127 hidden->children = hidden->next = hidden->prev = hidden->parent = NULL; | |
128 lm_message_node_unref(hidden); | |
129 } | |
130 | |
131 if (parent->children == node) | |
132 parent->children = node->next; | |
133 if (prev_sibling) | |
134 prev_sibling->next = node->next; | |
135 if (node->next) | |
136 node->next->prev = prev_sibling; | |
137 } | |
138 | |
1729
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1704
diff
changeset
|
139 // Maybe not a good idea, because it uses internals of loudmouth... |
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1704
diff
changeset
|
140 // It's used for rosternotes/bookmarks |
1598 | 141 LmMessageNode *lm_message_node_new(const gchar *name, const gchar *xmlns) |
142 { | |
143 LmMessageNode *node; | |
144 | |
145 node = g_new0 (LmMessageNode, 1); | |
146 node->name = g_strdup (name); | |
147 node->value = NULL; | |
148 node->raw_mode = FALSE; | |
149 node->attributes = NULL; | |
150 node->next = NULL; | |
151 node->prev = NULL; | |
152 node->parent = NULL; | |
153 node->children = NULL; | |
154 | |
155 node->ref_count = 1; | |
156 lm_message_node_set_attribute(node, "xmlns", xmlns); | |
157 return node; | |
158 } | |
159 | |
160 void lm_message_node_insert_childnode(LmMessageNode *node, | |
161 LmMessageNode *child) | |
162 { | |
163 LmMessageNode *x; | |
164 lm_message_node_deep_ref(child); | |
165 | |
166 if (node->children == NULL) | |
167 node->children = child; | |
168 else { | |
169 for (x = node->children; x->next; x = x->next) | |
170 ; | |
171 x->next = child; | |
172 } | |
173 } | |
174 | |
175 void lm_message_node_deep_ref(LmMessageNode *node) | |
176 { | |
177 if (node == NULL) | |
178 return; | |
179 lm_message_node_ref(node); | |
180 lm_message_node_deep_ref(node->next); | |
181 lm_message_node_deep_ref(node->children); | |
182 } | |
183 | |
184 const gchar* lm_message_get_from(LmMessage *m) | |
185 { | |
186 return lm_message_node_get_attribute(m->node, "from"); | |
187 } | |
188 | |
189 const gchar* lm_message_get_id(LmMessage *m) | |
190 { | |
191 return lm_message_node_get_attribute(m->node, "id"); | |
192 } | |
193 | |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
194 LmMessage *lm_message_new_iq_from_query(LmMessage *m, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
195 LmMessageSubType type) |
1598 | 196 { |
197 LmMessage *new; | |
198 const char *from = lm_message_node_get_attribute(m->node, "from"); | |
199 const char *id = lm_message_node_get_attribute(m->node, "id"); | |
200 | |
201 new = lm_message_new_with_sub_type(from, LM_MESSAGE_TYPE_IQ, | |
202 type); | |
203 if (id) | |
204 lm_message_node_set_attribute(new->node, "id", id); | |
205 | |
206 return new; | |
207 } | |
208 | |
1600 | 209 // entity_version(enum imstatus status) |
1598 | 210 // Return a static version string for Entity Capabilities. |
211 // It should be specific to the client version, please change the id | |
212 // if you alter mcabber's disco support (or add something to the version | |
213 // number) so that it doesn't conflict with the official client. | |
1600 | 214 const char *entity_version(enum imstatus status) |
1598 | 215 { |
1607 | 216 #ifndef MODULES_ENABLE |
1600 | 217 static char *ver, *ver_notavail; |
1607 | 218 #endif |
1598 | 219 |
1600 | 220 if (ver && (status != notavail)) |
1598 | 221 return ver; |
1600 | 222 if (ver_notavail) |
223 return ver_notavail; | |
1598 | 224 |
1600 | 225 caps_add(""); |
226 caps_set_identity("", "client", PACKAGE_STRING, "pc"); | |
227 caps_add_feature("", NS_DISCO_INFO); | |
1999
51f032d5ca22
Add support for XEP-0115 Entity Capabilities, with offline cache
Hermitifier
parents:
1972
diff
changeset
|
228 caps_add_feature("", NS_CAPS); |
1600 | 229 caps_add_feature("", NS_MUC); |
230 // advertise ChatStates only if they aren't disabled | |
231 if (!settings_opt_get_int("disable_chatstates")) | |
1857
189c2a5a4e66
Fix coding style in xmpp_helper
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1811
diff
changeset
|
232 caps_add_feature("", NS_CHATSTATES); |
1600 | 233 caps_add_feature("", NS_TIME); |
234 caps_add_feature("", NS_XMPP_TIME); | |
235 caps_add_feature("", NS_VERSION); | |
236 caps_add_feature("", NS_PING); | |
237 caps_add_feature("", NS_COMMANDS); | |
1602 | 238 caps_add_feature("", NS_RECEIPTS); |
1951
1a01a7ef4e43
Add support for XEP-0249 / Direct MUC Invitations (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1901
diff
changeset
|
239 caps_add_feature("", NS_X_CONFERENCE); |
1600 | 240 if (!settings_opt_get_int("iq_last_disable") && |
241 (!settings_opt_get_int("iq_last_disable_when_notavail") || | |
242 status != notavail)) | |
1857
189c2a5a4e66
Fix coding style in xmpp_helper
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1811
diff
changeset
|
243 caps_add_feature("", NS_LAST); |
1607 | 244 #ifdef MODULES_ENABLE |
245 { | |
246 GSList *el = xmpp_additional_features; | |
247 while (el) { | |
248 caps_add_feature("", el->data); | |
1857
189c2a5a4e66
Fix coding style in xmpp_helper
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1811
diff
changeset
|
249 el = g_slist_next(el); |
1607 | 250 } |
251 } | |
252 #endif | |
1598 | 253 |
1600 | 254 if (status == notavail) { |
255 ver_notavail = caps_generate(); | |
256 return ver_notavail; | |
257 } | |
258 | |
259 ver = caps_generate(); | |
1598 | 260 return ver; |
261 } | |
262 | |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
263 LmMessageNode *lm_message_node_find_xmlns(LmMessageNode *node, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
264 const char *xmlns) |
1598 | 265 { |
266 LmMessageNode *x; | |
267 const char *p; | |
268 | |
269 for (x = node->children ; x; x = x->next) { | |
270 if ((p = lm_message_node_get_attribute(x, "xmlns")) && !strcmp(p, xmlns)) | |
271 break; | |
272 } | |
273 return x; | |
274 } | |
275 | |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
276 time_t lm_message_node_get_timestamp(LmMessageNode *node) |
1598 | 277 { |
278 LmMessageNode *x; | |
279 const char *p; | |
280 | |
281 x = lm_message_node_find_xmlns(node, NS_XMPP_DELAY); | |
282 if (x && (!strcmp(x->name, "delay")) && | |
283 (p = lm_message_node_get_attribute(x, "stamp")) != NULL) | |
284 return from_iso8601(p, 1); | |
285 x = lm_message_node_find_xmlns(node, NS_DELAY); | |
286 if (x && (p = lm_message_node_get_attribute(x, "stamp")) != NULL) | |
287 return from_iso8601(p, 1); | |
288 return 0; | |
289 } | |
290 | |
291 // lm_message_new_presence(status, recipient, message) | |
292 // Create an xmlnode with default presence attributes | |
293 // Note: the caller must free the node after use | |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
294 LmMessage *lm_message_new_presence(enum imstatus st, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
295 const char *recipient, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
296 const char *msg) |
1598 | 297 { |
298 unsigned int prio; | |
299 LmMessage *x = lm_message_new(recipient, LM_MESSAGE_TYPE_PRESENCE); | |
300 | |
301 switch(st) { | |
302 case away: | |
303 case notavail: | |
304 case dontdisturb: | |
305 case freeforchat: | |
306 lm_message_node_add_child(x->node, "show", imstatus_showmap[st]); | |
307 break; | |
308 | |
1972
45f0f0f60656
Remove deprecated status invisible
Mikael Berthe <mikael@lilotux.net>
parents:
1951
diff
changeset
|
309 #ifdef WITH_DEPRECATED_STATUS_INVISIBLE |
1598 | 310 case invisible: |
311 lm_message_node_set_attribute(x->node, "type", "invisible"); | |
312 break; | |
1972
45f0f0f60656
Remove deprecated status invisible
Mikael Berthe <mikael@lilotux.net>
parents:
1951
diff
changeset
|
313 #endif |
1598 | 314 |
315 case offline: | |
316 lm_message_node_set_attribute(x->node, "type", "unavailable"); | |
317 break; | |
318 | |
319 default: | |
320 break; | |
321 } | |
322 | |
323 if (st == away || st == notavail) | |
324 prio = settings_opt_get_int("priority_away"); | |
325 else | |
326 prio = settings_opt_get_int("priority"); | |
327 | |
328 if (prio) { | |
329 char strprio[8]; | |
330 snprintf(strprio, 8, "%d", (int)prio); | |
331 lm_message_node_add_child(x->node, "priority", strprio); | |
332 } | |
333 | |
334 if (msg) | |
335 lm_message_node_add_child(x->node, "status", msg); | |
336 | |
337 return x; | |
338 } | |
339 | |
340 static const char *defaulterrormsg(guint code) | |
341 { | |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1602
diff
changeset
|
342 int i; |
1598 | 343 |
344 for (i = 0; xmpp_errors[i].code; ++i) { | |
345 if (xmpp_errors[i].code == code) | |
346 return xmpp_errors[i].meaning; | |
347 } | |
348 return NULL; | |
349 } | |
350 | |
351 // display_server_error(x) | |
352 // Display the error to the user | |
353 // x: error tag xmlnode pointer | |
1800
d2747442918a
When displaying a server error, show the sender JID
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
354 void display_server_error(LmMessageNode *x, const char *from) |
1598 | 355 { |
1800
d2747442918a
When displaying a server error, show the sender JID
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
356 const char *desc = NULL, *errname = NULL, *s; |
1598 | 357 char *sdesc, *tmp; |
358 | |
359 if (!x) return; | |
360 | |
361 /* RFC3920: | |
362 * The <error/> element: | |
363 * o MUST contain a child element corresponding to one of the defined | |
364 * stanza error conditions specified below; this element MUST be | |
365 * qualified by the 'urn:ietf:params:xml:ns:xmpp-stanzas' namespace. | |
366 */ | |
367 if (x->children) | |
1704
ab502d645378
Update display_server_error()
Mikael Berthe <mikael@lilotux.net>
parents:
1697
diff
changeset
|
368 errname = x->children->name; |
1800
d2747442918a
When displaying a server error, show the sender JID
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
369 |
d2747442918a
When displaying a server error, show the sender JID
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
370 if (from) |
d2747442918a
When displaying a server error, show the sender JID
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
371 scr_LogPrint(LPRINT_LOGNORM, "Received error packet [%s] from <%s>", |
d2747442918a
When displaying a server error, show the sender JID
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
372 (errname ? errname : ""), from); |
d2747442918a
When displaying a server error, show the sender JID
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
373 else |
d2747442918a
When displaying a server error, show the sender JID
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
374 scr_LogPrint(LPRINT_LOGNORM, "Received error packet [%s]", |
d2747442918a
When displaying a server error, show the sender JID
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
375 (errname ? errname : "")); |
1598 | 376 |
377 // For backward compatibility | |
1704
ab502d645378
Update display_server_error()
Mikael Berthe <mikael@lilotux.net>
parents:
1697
diff
changeset
|
378 if (!errname && ((s = lm_message_node_get_attribute(x, "code")) != NULL)) { |
1598 | 379 // Default message |
1704
ab502d645378
Update display_server_error()
Mikael Berthe <mikael@lilotux.net>
parents:
1697
diff
changeset
|
380 desc = defaulterrormsg(atoi(s)); |
1598 | 381 } |
382 | |
383 // Error tag data is better, if available | |
384 s = lm_message_node_get_value(x); | |
385 if (s && *s) desc = s; | |
386 | |
387 // And sometimes there is a text message | |
388 s = lm_message_node_get_child_value(x, "text"); | |
389 | |
390 if (s && *s) desc = s; | |
391 | |
392 // If we still have no description, let's give up | |
1704
ab502d645378
Update display_server_error()
Mikael Berthe <mikael@lilotux.net>
parents:
1697
diff
changeset
|
393 if (!desc || !*desc) |
1598 | 394 return; |
395 | |
396 // Strip trailing newlines | |
397 sdesc = g_strdup(desc); | |
398 for (tmp = sdesc; *tmp; tmp++) ; | |
399 if (tmp > sdesc) | |
400 tmp--; | |
401 while (tmp >= sdesc && (*tmp == '\n' || *tmp == '\r')) | |
402 *tmp-- = '\0'; | |
403 | |
1704
ab502d645378
Update display_server_error()
Mikael Berthe <mikael@lilotux.net>
parents:
1697
diff
changeset
|
404 if (*sdesc) |
ab502d645378
Update display_server_error()
Mikael Berthe <mikael@lilotux.net>
parents:
1697
diff
changeset
|
405 scr_LogPrint(LPRINT_LOGNORM, "Error message from server: %s", sdesc); |
1598 | 406 g_free(sdesc); |
407 } | |
408 | |
1811 | 409 /* vim: set et cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */ |