Mercurial > ~mikael > mcabber > hg
annotate mcabber/src/xmpp.c @ 1600:c5ee395fbc8c
Updated Entity Capabilities support (XEP-0115)
author | franky |
---|---|
date | Tue, 23 Sep 2008 10:59:25 +0200 |
parents | dcd5d4c75199 |
children | f4a2c6f767d1 |
rev | line source |
---|---|
29 | 1 /* |
1599 | 2 * xmpp.c -- Jabber protocol handling |
393 | 3 * |
1599 | 4 * Copyright (C) 2008-2009 Frank Zschockelt <mcabber@freakysoft.de> |
5 * Copyright (C) 2005-2009 Mikael Berthe <mikael@lilotux.net> | |
29 | 6 * Parts come from the centericq project: |
7 * Copyright (C) 2002-2005 by Konstantin Klyagin <konst@konst.org.ua> | |
8 * | |
9 * This program is free software; you can redistribute it and/or modify | |
10 * it under the terms of the GNU General Public License as published by | |
11 * the Free Software Foundation; either version 2 of the License, or (at | |
12 * your option) any later version. | |
13 * | |
14 * This program is distributed in the hope that it will be useful, but | |
15 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
17 * General Public License for more details. | |
18 * | |
19 * You should have received a copy of the GNU General Public License | |
20 * along with this program; if not, write to the Free Software | |
21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | |
22 * USA | |
23 */ | |
1598 | 24 #include <stdlib.h> |
25 #include <string.h> | |
26 #include <sys/utsname.h> | |
29 | 27 |
1600 | 28 #include "caps.h" |
1598 | 29 #include "commands.h" |
30 #include "events.h" | |
31 #include "histolog.h" | |
32 #include "hooks.h" | |
33 #include "logprint.h" | |
34 #include "otr.h" | |
81 | 35 #include "roster.h" |
29 | 36 #include "screen.h" |
1598 | 37 #include "settings.h" |
29 | 38 #include "utils.h" |
1598 | 39 #include "xmpp.h" |
40 #include "xmpp_helper.h" | |
41 #include "xmpp_defines.h" | |
29 | 42 |
1001
dff25377c11f
Auto-reconnect after a network/server failure
Mikael Berthe <mikael@lilotux.net>
parents:
999
diff
changeset
|
43 #define RECONNECTION_TIMEOUT 60L |
dff25377c11f
Auto-reconnect after a network/server failure
Mikael Berthe <mikael@lilotux.net>
parents:
999
diff
changeset
|
44 |
1598 | 45 LmConnection* lconnection; |
46 static guint AutoConnection; | |
47 | |
48 inline void update_last_use(void); | |
49 inline gboolean xmpp_reconnect(); | |
50 | |
51 static enum imstatus mystatus = offline; | |
52 static enum imstatus mywantedstatus = available; | |
53 static gchar *mystatusmsg; | |
29 | 54 |
353
3fe43f6daa5a
Make imstatus2char a null-terminated string
Mikael Berthe <mikael@lilotux.net>
parents:
325
diff
changeset
|
55 char imstatus2char[imstatus_size+1] = { |
1311
0dda8238af21
Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
56 '_', 'o', 'f', 'd', 'n', 'a', 'i', '\0' |
46 | 57 }; |
58 | |
1378 | 59 static char *imstatus_showmap[] = { |
60 "", | |
61 "", | |
62 "chat", | |
63 "dnd", | |
64 "xa", | |
65 "away", | |
66 "" | |
67 }; | |
68 | |
1598 | 69 static LmMessageNode *bookmarks = NULL; |
70 static LmMessageNode *rosternotes = NULL; | |
1014
99c5278bf6b8
Keep the status and status messages when we're disconnected
Mikael Berthe <mikael@lilotux.net>
parents:
1013
diff
changeset
|
71 |
1598 | 72 struct xmpp_error { |
73 guint code; | |
74 const char *code_str; | |
75 const char *meaning; | |
76 const char *condition; | |
77 const char *type; | |
78 } xmpp_errors[] = { | |
79 {XMPP_ERROR_REDIRECT, "302", | |
80 "Redirect", "redirect", "modify"}, | |
81 {XMPP_ERROR_BAD_REQUEST, "400", | |
82 "Bad Request", "bad-request", "modify"}, | |
83 {XMPP_ERROR_NOT_AUTHORIZED, "401", | |
84 "Not Authorized", "not-authorized", "auth"}, | |
85 {XMPP_ERROR_PAYMENT_REQUIRED, "402", | |
86 "Payment Required", "payment-required", "auth"}, | |
87 {XMPP_ERROR_FORBIDDEN, "403", | |
88 "Forbidden", "forbidden", "auth"}, | |
89 {XMPP_ERROR_NOT_FOUND, "404", | |
90 "Not Found", "item-not-found", "cancel"}, | |
91 {XMPP_ERROR_NOT_ALLOWED, "405", | |
92 "Not Allowed", "not-allowed", "cancel"}, | |
93 {XMPP_ERROR_NOT_ACCEPTABLE, "406", | |
94 "Not Acceptable", "not-acceptable", "modify"}, | |
95 {XMPP_ERROR_REGISTRATION_REQUIRED, "407", | |
96 "Registration required", "registration-required", "auth"}, | |
97 {XMPP_ERROR_REQUEST_TIMEOUT, "408", | |
98 "Request Timeout", "remote-server-timeout", "wait"}, | |
99 {XMPP_ERROR_CONFLICT, "409", | |
100 "Conflict", "conflict", "cancel"}, | |
101 {XMPP_ERROR_INTERNAL_SERVER_ERROR, "500", | |
102 "Internal Server Error", "internal-server-error", "wait"}, | |
103 {XMPP_ERROR_NOT_IMPLEMENTED, "501", | |
104 "Not Implemented", "feature-not-implemented", "cancel"}, | |
105 {XMPP_ERROR_REMOTE_SERVER_ERROR, "502", | |
106 "Remote Server Error", "service-unavailable", "wait"}, | |
107 {XMPP_ERROR_SERVICE_UNAVAILABLE, "503", | |
108 "Service Unavailable", "service-unavailable", "cancel"}, | |
109 {XMPP_ERROR_REMOTE_SERVER_TIMEOUT, "504", | |
110 "Remote Server Timeout", "remote-server-timeout", "wait"}, | |
111 {XMPP_ERROR_DISCONNECTED, "510", | |
112 "Disconnected", "service-unavailable", "cancel"}, | |
113 {0, NULL, NULL, NULL, NULL} | |
114 }; | |
939
12fa2ae6445d
Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
115 |
1598 | 116 #include "xmpp_helper.c" |
117 #include "xmpp_iq.c" | |
118 #include "xmpp_iqrequest.c" | |
119 #include "xmpp_muc.c" | |
120 #include "xmpp_s10n.c" | |
29 | 121 |
1598 | 122 static struct IqHandlers |
116 | 123 { |
1598 | 124 const gchar *xmlns; |
125 LmHandleMessageFunction handler; | |
126 } iq_handlers[] = { | |
127 {NS_PING, &handle_iq_ping}, | |
128 {NS_VERSION, &handle_iq_version}, | |
129 {NS_TIME, &handle_iq_time}, | |
130 {NS_ROSTER, &handle_iq_roster}, | |
131 {NS_XMPP_TIME, &handle_iq_time202}, | |
132 {NS_LAST, &handle_iq_last}, | |
133 {NS_DISCO_INFO, &handle_iq_disco_info}, | |
134 {NS_DISCO_ITEMS,&handle_iq_disco_items}, | |
135 {NS_COMMANDS, &handle_iq_commands}, | |
136 {NULL, NULL} | |
137 }; | |
519
5c338d31de56
Show current global status message in "/status"
Mikael Berthe <mikael@lilotux.net>
parents:
513
diff
changeset
|
138 |
1558
3df441efb7c2
Fix gcc warnings related to inline/static uses
Mikael Berthe <mikael@lilotux.net>
parents:
1546
diff
changeset
|
139 void update_last_use(void) |
1254
401639413340
More jabber:iq:last support... (misc)
Mikael Berthe <mikael@lilotux.net>
parents:
1244
diff
changeset
|
140 { |
401639413340
More jabber:iq:last support... (misc)
Mikael Berthe <mikael@lilotux.net>
parents:
1244
diff
changeset
|
141 iqlast = time(NULL); |
401639413340
More jabber:iq:last support... (misc)
Mikael Berthe <mikael@lilotux.net>
parents:
1244
diff
changeset
|
142 } |
401639413340
More jabber:iq:last support... (misc)
Mikael Berthe <mikael@lilotux.net>
parents:
1244
diff
changeset
|
143 |
1598 | 144 // Note: the caller should check the jid is correct |
145 void xmpp_addbuddy(const char *bjid, const char *name, const char *group) | |
1215
80c095886fb5
Entity Capabilities support (XEP-0115)
Mikael Berthe <mikael@lilotux.net>
parents:
1213
diff
changeset
|
146 { |
1598 | 147 LmMessageNode *query, *y; |
148 LmMessage *iq; | |
149 char *cleanjid; | |
1255
ceada40bbe20
Update Entity Capabilities (add iq:last)
Mikael Berthe <mikael@lilotux.net>
parents:
1254
diff
changeset
|
150 |
1598 | 151 if (!lm_connection_is_authenticated(lconnection)) return; |
152 | |
153 cleanjid = jidtodisp(bjid); // Stripping resource, just in case... | |
154 | |
155 // We don't check if the jabber user already exists in the roster, | |
156 // because it allows to re-ask for notification. | |
1215
80c095886fb5
Entity Capabilities support (XEP-0115)
Mikael Berthe <mikael@lilotux.net>
parents:
1213
diff
changeset
|
157 |
1598 | 158 iq = lm_message_new_with_sub_type(NULL, LM_MESSAGE_TYPE_IQ, |
159 LM_MESSAGE_SUB_TYPE_SET); | |
160 query = lm_message_node_add_child(iq->node, "query", NULL); | |
161 lm_message_node_set_attribute(query, "xmlns", NS_ROSTER); | |
162 y = lm_message_node_add_child(query, "item", NULL); | |
163 lm_message_node_set_attribute(y, "jid", cleanjid); | |
164 | |
165 if (name) | |
166 lm_message_node_set_attribute(y, "name", name); | |
1215
80c095886fb5
Entity Capabilities support (XEP-0115)
Mikael Berthe <mikael@lilotux.net>
parents:
1213
diff
changeset
|
167 |
1598 | 168 if (group) |
169 lm_message_node_add_child(y, "group", group); | |
170 | |
171 lm_connection_send(lconnection, iq, NULL); | |
172 lm_message_unref(iq); | |
532
2ac8d8e49e81
Send status changes to chatrooms
Mikael Berthe <mikael@lilotux.net>
parents:
531
diff
changeset
|
173 |
1598 | 174 xmpp_send_s10n(cleanjid, LM_MESSAGE_SUB_TYPE_SUBSCRIBE); |
532
2ac8d8e49e81
Send status changes to chatrooms
Mikael Berthe <mikael@lilotux.net>
parents:
531
diff
changeset
|
175 |
1598 | 176 roster_add_user(cleanjid, name, group, ROSTER_TYPE_USER, sub_pending, -1); |
177 g_free(cleanjid); | |
178 buddylist_build(); | |
532
2ac8d8e49e81
Send status changes to chatrooms
Mikael Berthe <mikael@lilotux.net>
parents:
531
diff
changeset
|
179 |
1598 | 180 update_roster = TRUE; |
532
2ac8d8e49e81
Send status changes to chatrooms
Mikael Berthe <mikael@lilotux.net>
parents:
531
diff
changeset
|
181 } |
2ac8d8e49e81
Send status changes to chatrooms
Mikael Berthe <mikael@lilotux.net>
parents:
531
diff
changeset
|
182 |
1598 | 183 void xmpp_updatebuddy(const char *bjid, const char *name, const char *group) |
29 | 184 { |
1598 | 185 LmMessage *iq; |
186 LmMessageNode *x; | |
187 char *cleanjid; | |
29 | 188 |
1598 | 189 if (!lm_connection_is_authenticated(lconnection)) return; |
444 | 190 |
1598 | 191 // XXX We should check name's and group's correctness |
192 | |
193 cleanjid = jidtodisp(bjid); // Stripping resource, just in case... | |
29 | 194 |
1598 | 195 iq = lm_message_new_with_sub_type(NULL, LM_MESSAGE_TYPE_IQ, |
196 LM_MESSAGE_SUB_TYPE_SET); | |
197 x = lm_message_node_add_child(iq->node, "query", NULL); | |
198 lm_message_node_set_attribute(x, "xmlns", NS_ROSTER); | |
199 x = lm_message_node_add_child(x, "item", NULL); | |
200 lm_message_node_set_attributes(x, | |
201 "jid", cleanjid, | |
202 "name", name, | |
203 NULL); | |
29 | 204 |
1598 | 205 if (group) |
206 lm_message_node_add_child(x, "group", group); | |
1419
fb438482b28e
New option to customize the away/notavail priority (Michael Gehring)
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
207 |
1598 | 208 lm_connection_send(lconnection, iq, NULL); |
209 lm_message_unref(iq); | |
210 g_free(cleanjid); | |
534 | 211 } |
212 | |
1598 | 213 void xmpp_delbuddy(const char *bjid) |
534 | 214 { |
1598 | 215 LmMessageNode *y, *z; |
216 LmMessage *iq; | |
217 char *cleanjid; | |
218 | |
219 if (!lm_connection_is_authenticated(lconnection)) return; | |
220 | |
221 cleanjid = jidtodisp(bjid); // Stripping resource, just in case... | |
534 | 222 |
1598 | 223 // If the current buddy is an agent, unsubscribe from it |
224 if (roster_gettype(cleanjid) == ROSTER_TYPE_AGENT) { | |
225 scr_LogPrint(LPRINT_LOGNORM, "Unregistering from the %s agent", cleanjid); | |
29 | 226 |
1598 | 227 iq = lm_message_new_with_sub_type(cleanjid, LM_MESSAGE_TYPE_IQ, |
228 LM_MESSAGE_SUB_TYPE_SET); | |
229 y = lm_message_node_add_child(iq->node, "query", NULL); | |
230 lm_message_node_set_attribute(y, "xmlns", NS_REGISTER); | |
231 lm_message_node_add_child(y, "remove", NULL); | |
232 lm_connection_send(lconnection, iq, NULL); | |
233 lm_message_unref(iq); | |
1014
99c5278bf6b8
Keep the status and status messages when we're disconnected
Mikael Berthe <mikael@lilotux.net>
parents:
1013
diff
changeset
|
234 } |
29 | 235 |
1598 | 236 // Cancel the subscriptions |
237 xmpp_send_s10n(cleanjid, LM_MESSAGE_SUB_TYPE_UNSUBSCRIBED); //cancel "from" | |
238 xmpp_send_s10n(cleanjid, LM_MESSAGE_SUB_TYPE_UNSUBSCRIBE); //cancel "to" | |
239 | |
240 // Ask for removal from roster | |
241 iq = lm_message_new_with_sub_type(NULL, LM_MESSAGE_TYPE_IQ, | |
242 LM_MESSAGE_SUB_TYPE_SET); | |
444 | 243 |
1598 | 244 y = lm_message_node_add_child(iq->node, "query", NULL); |
245 lm_message_node_set_attribute(y, "xmlns", NS_ROSTER); | |
246 z = lm_message_node_add_child(y, "item", NULL); | |
247 lm_message_node_set_attributes(z, | |
248 "jid", cleanjid, | |
249 "subscription", "remove", | |
250 NULL); | |
251 lm_connection_send(lconnection, iq, NULL); | |
252 lm_message_unref(iq); | |
253 | |
254 roster_del_user(cleanjid); | |
255 g_free(cleanjid); | |
256 buddylist_build(); | |
257 | |
258 update_roster = TRUE; | |
259 } | |
1365 | 260 |
1598 | 261 void xmpp_request(const char *fjid, enum iqreq_type reqtype) |
262 { | |
263 GSList *resources, *p_res; | |
264 GSList *roster_elt; | |
265 const char *strreqtype, *xmlns; | |
1365 | 266 |
1598 | 267 if (reqtype == iqreq_version) { |
268 xmlns = NS_VERSION; | |
269 strreqtype = "version"; | |
270 } else if (reqtype == iqreq_time) { | |
271 xmlns = NS_TIME; | |
272 strreqtype = "time"; | |
273 } else if (reqtype == iqreq_last) { | |
274 xmlns = NS_LAST; | |
275 strreqtype = "last"; | |
276 } else if (reqtype == iqreq_vcard) { | |
277 xmlns = NS_VCARD; | |
278 strreqtype = "vCard"; | |
279 // Special case | |
280 } else | |
281 return; | |
1365 | 282 |
1598 | 283 if (strchr(fjid, JID_RESOURCE_SEPARATOR)) { |
284 // This is a full JID | |
285 xmpp_iq_request(fjid, xmlns); | |
286 scr_LogPrint(LPRINT_NORMAL, "Sent %s request to <%s>", strreqtype, fjid); | |
287 return; | |
521 | 288 } |
713 | 289 |
1598 | 290 // The resource has not been specified |
291 roster_elt = roster_find(fjid, jidsearch, ROSTER_TYPE_USER|ROSTER_TYPE_ROOM); | |
292 if (!roster_elt) { | |
293 scr_LogPrint(LPRINT_NORMAL, "No known resource for <%s>...", fjid); | |
294 xmpp_iq_request(fjid, xmlns); // Let's send a request anyway... | |
295 scr_LogPrint(LPRINT_NORMAL, "Sent %s request to <%s>", strreqtype, fjid); | |
296 return; | |
297 } | |
1254
401639413340
More jabber:iq:last support... (misc)
Mikael Berthe <mikael@lilotux.net>
parents:
1244
diff
changeset
|
298 |
1598 | 299 // Send a request to each resource |
300 resources = buddy_getresources(roster_elt->data); | |
301 if (!resources) { | |
302 scr_LogPrint(LPRINT_NORMAL, "No known resource for <%s>...", fjid); | |
303 xmpp_iq_request(fjid, xmlns); // Let's send a request anyway... | |
304 scr_LogPrint(LPRINT_NORMAL, "Sent %s request to <%s>", strreqtype, fjid); | |
305 } | |
306 for (p_res = resources ; p_res ; p_res = g_slist_next(p_res)) { | |
307 gchar *fulljid; | |
308 fulljid = g_strdup_printf("%s/%s", fjid, (char*)p_res->data); | |
309 xmpp_iq_request(fulljid, xmlns); | |
310 scr_LogPrint(LPRINT_NORMAL, "Sent %s request to <%s>", strreqtype, fulljid); | |
311 g_free(fulljid); | |
312 g_free(p_res->data); | |
313 } | |
314 g_slist_free(resources); | |
1014
99c5278bf6b8
Keep the status and status messages when we're disconnected
Mikael Berthe <mikael@lilotux.net>
parents:
1013
diff
changeset
|
315 } |
99c5278bf6b8
Keep the status and status messages when we're disconnected
Mikael Berthe <mikael@lilotux.net>
parents:
1013
diff
changeset
|
316 |
1598 | 317 // xmpp_send_msg(jid, text, type, subject, |
318 // otrinject, *encrypted, type_overwrite) | |
1197 | 319 // When encrypted is not NULL, the function set *encrypted to 1 if the |
320 // message has been PGP-encrypted. If encryption enforcement is set and | |
321 // encryption fails, *encrypted is set to -1. | |
1598 | 322 void xmpp_send_msg(const char *fjid, const char *text, int type, |
323 const char *subject, gboolean otrinject, gint *encrypted, | |
324 LmMessageSubType type_overwrite) | |
35 | 325 { |
1598 | 326 LmMessage *x; |
327 LmMessageSubType subtype; | |
1304 | 328 #ifdef HAVE_LIBOTR |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
329 int otr_msg = 0; |
1304 | 330 #endif |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
331 #if defined HAVE_GPGME || defined JEP0022 || defined JEP0085 |
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
332 char *rname, *barejid; |
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
333 GSList *sl_buddy; |
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
334 #endif |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
335 #if defined JEP0022 || defined JEP0085 |
1598 | 336 LmMessageNode *event; |
997 | 337 guint use_jep85 = 0; |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
338 struct jep0085 *jep85 = NULL; |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
339 #endif |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
340 gchar *enc = NULL; |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
341 |
1055
6eb1efea75d0
PGP: Visual encryption flag
Mikael Berthe <mikael@lilotux.net>
parents:
1053
diff
changeset
|
342 if (encrypted) |
1197 | 343 *encrypted = 0; |
1055
6eb1efea75d0
PGP: Visual encryption flag
Mikael Berthe <mikael@lilotux.net>
parents:
1053
diff
changeset
|
344 |
1598 | 345 if (!lm_connection_is_authenticated(lconnection)) |
1435
9bf7f3ddff10
Do not send a groupchat-style message when changing a MUC room topic
Mikael Berthe <mikael@lilotux.net>
parents:
1426
diff
changeset
|
346 return; |
9bf7f3ddff10
Do not send a groupchat-style message when changing a MUC room topic
Mikael Berthe <mikael@lilotux.net>
parents:
1426
diff
changeset
|
347 |
9bf7f3ddff10
Do not send a groupchat-style message when changing a MUC room topic
Mikael Berthe <mikael@lilotux.net>
parents:
1426
diff
changeset
|
348 if (!text && type == ROSTER_TYPE_USER) |
9bf7f3ddff10
Do not send a groupchat-style message when changing a MUC room topic
Mikael Berthe <mikael@lilotux.net>
parents:
1426
diff
changeset
|
349 return; |
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
350 |
1598 | 351 if (type_overwrite != LM_MESSAGE_SUB_TYPE_NOT_SET) |
352 subtype = type_overwrite; | |
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1304
diff
changeset
|
353 else { |
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1304
diff
changeset
|
354 if (type == ROSTER_TYPE_ROOM) |
1598 | 355 subtype = LM_MESSAGE_SUB_TYPE_GROUPCHAT; |
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1304
diff
changeset
|
356 else |
1598 | 357 subtype = LM_MESSAGE_SUB_TYPE_CHAT; |
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1304
diff
changeset
|
358 } |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
359 |
1598 | 360 #if defined HAVE_GPGME || defined HAVE_LIBOTR || \ |
361 defined JEP0022 || defined JEP0085 | |
1058 | 362 rname = strchr(fjid, JID_RESOURCE_SEPARATOR); |
363 barejid = jidtodisp(fjid); | |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
364 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER); |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
365 |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
366 // If we can get a resource name, we use it. Else we use NULL, |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
367 // which hopefully will give us the most likely resource. |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
368 if (rname) |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
369 rname++; |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
370 |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
371 #ifdef HAVE_LIBOTR |
1598 | 372 if (otr_enabled() && !otrinject) { |
373 if (type == ROSTER_TYPE_USER) { | |
1347
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
374 otr_msg = otr_send((char **)&text, barejid); |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
375 if (!text) { |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
376 g_free(barejid); |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
377 if (encrypted) |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
378 *encrypted = -1; |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
379 return; |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
380 } |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
381 } |
1484
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
382 if (otr_msg && encrypted) |
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
383 *encrypted = ENCRYPTED_OTR; |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
384 } |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
385 #endif |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
386 |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
387 #ifdef HAVE_GPGME |
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
388 if (type == ROSTER_TYPE_USER && sl_buddy && gpg_enabled()) { |
1197 | 389 if (!settings_pgp_getdisabled(barejid)) { // not disabled for this contact? |
390 guint force; | |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1058
diff
changeset
|
391 struct pgp_data *res_pgpdata; |
1197 | 392 force = settings_pgp_getforce(barejid); |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1058
diff
changeset
|
393 res_pgpdata = buddy_resource_pgp(sl_buddy->data, rname); |
1197 | 394 if (force || (res_pgpdata && res_pgpdata->sign_keyid)) { |
395 /* Remote client has PGP support (we have a signature) | |
396 * OR encryption is enforced (force = TRUE). | |
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
397 * If the contact has a specific KeyId, we'll use it; |
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
398 * if not, we'll use the key used for the signature. |
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
399 * Both keys should match, in theory (cf. XEP-0027). */ |
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
400 const char *key; |
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
401 key = settings_pgp_getkeyid(barejid); |
1197 | 402 if (!key && res_pgpdata) |
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
403 key = res_pgpdata->sign_keyid; |
1197 | 404 if (key) |
405 enc = gpg_encrypt(text, key); | |
406 if (!enc && force) { | |
407 if (encrypted) | |
408 *encrypted = -1; | |
409 g_free(barejid); | |
410 return; | |
411 } | |
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
412 } |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1058
diff
changeset
|
413 } |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
414 } |
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
415 #endif // HAVE_GPGME |
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
416 |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1058
diff
changeset
|
417 g_free(barejid); |
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
418 #endif // HAVE_GPGME || defined JEP0022 || defined JEP0085 |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
419 |
1598 | 420 x = lm_message_new_with_sub_type(fjid, LM_MESSAGE_TYPE_MESSAGE, subtype); |
421 lm_message_node_add_child(x->node, "body", | |
422 enc ? "This message is PGP-encrypted." : text); | |
423 | |
424 if (subject) | |
425 lm_message_node_add_child(x->node, "subject", subject); | |
426 | |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
427 if (enc) { |
1598 | 428 LmMessageNode *y; |
429 y = lm_message_node_add_child(x->node, "x", enc); | |
430 lm_message_node_set_attribute(y, "xmlns", NS_ENCRYPTED); | |
1055
6eb1efea75d0
PGP: Visual encryption flag
Mikael Berthe <mikael@lilotux.net>
parents:
1053
diff
changeset
|
431 if (encrypted) |
1484
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
432 *encrypted = ENCRYPTED_PGP; |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
433 g_free(enc); |
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
434 } |
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
435 |
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
436 #if defined JEP0022 || defined JEP0085 |
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
437 // If typing notifications are disabled, we can skip all this stuff... |
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
438 if (chatstates_disabled || type == ROSTER_TYPE_ROOM) |
1598 | 439 goto xmpp_send_msg_no_chatstates; |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
440 |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
441 if (sl_buddy) |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
442 jep85 = buddy_resource_jep85(sl_buddy->data, rname); |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
443 #endif |
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
444 |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
445 #ifdef JEP0085 |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
446 /* JEP-0085 5.1 |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
447 * "Until receiving a reply to the initial content message (or a standalone |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
448 * notification) from the Contact, the User MUST NOT send subsequent chat |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
449 * state notifications to the Contact." |
1378 | 450 * In our implementation support is initially "unknown", then it's "probed" |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
451 * and can become "ok". |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
452 */ |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
453 if (jep85 && (jep85->support == CHATSTATES_SUPPORT_OK || |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
454 jep85->support == CHATSTATES_SUPPORT_UNKNOWN)) { |
1598 | 455 event = lm_message_node_add_child(x->node, "active", NULL); |
456 lm_message_node_set_attribute(event, "xmlns", NS_CHATSTATES); | |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
457 if (jep85->support == CHATSTATES_SUPPORT_UNKNOWN) |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
458 jep85->support = CHATSTATES_SUPPORT_PROBED; |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
459 else |
997 | 460 use_jep85 = 1; |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
461 jep85->last_state_sent = ROSTER_EVENT_ACTIVE; |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
462 } |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
463 #endif |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
464 #ifdef JEP0022 |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
465 /* JEP-22 |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
466 * If the Contact supports JEP-0085, we do not use JEP-0022. |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
467 * If not, we try to fall back to JEP-0022. |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
468 */ |
997 | 469 if (!use_jep85) { |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
470 struct jep0022 *jep22 = NULL; |
1598 | 471 event = lm_message_node_add_child(x->node, "x", NULL); |
472 lm_message_node_set_attribute(event, "xmlns", NS_EVENT); | |
473 lm_message_node_add_child(event, "composing", NULL); | |
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
474 |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
475 if (sl_buddy) |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
476 jep22 = buddy_resource_jep22(sl_buddy->data, rname); |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
477 if (jep22) |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
478 jep22->last_state_sent = ROSTER_EVENT_ACTIVE; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
479 |
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
480 // An id is mandatory when using JEP-0022. |
1598 | 481 if (text || subject) { |
482 const gchar *msgid = lm_message_get_id(x); | |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
483 // Let's update last_msgid_sent |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
484 if (jep22) { |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
485 g_free(jep22->last_msgid_sent); |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
486 jep22->last_msgid_sent = g_strdup(msgid); |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
487 } |
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
488 } |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
489 } |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
490 #endif |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
491 |
1598 | 492 xmpp_send_msg_no_chatstates: |
1254
401639413340
More jabber:iq:last support... (misc)
Mikael Berthe <mikael@lilotux.net>
parents:
1244
diff
changeset
|
493 if (mystatus != invisible) |
401639413340
More jabber:iq:last support... (misc)
Mikael Berthe <mikael@lilotux.net>
parents:
1244
diff
changeset
|
494 update_last_use(); |
1598 | 495 lm_connection_send(lconnection, x, NULL); |
496 lm_message_unref(x); | |
35 | 497 } |
498 | |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
499 #ifdef JEP0085 |
1598 | 500 // xmpp_send_jep85_chatstate() |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
501 // Send a JEP-85 chatstate. |
1598 | 502 static void xmpp_send_jep85_chatstate(const char *bjid, const char *resname, |
503 guint state) | |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
504 { |
1598 | 505 LmMessage *m; |
506 LmMessageNode *event; | |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
507 GSList *sl_buddy; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
508 const char *chattag; |
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
509 char *rjid, *fjid = NULL; |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
510 struct jep0085 *jep85 = NULL; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
511 |
1598 | 512 if (!lm_connection_is_authenticated(lconnection)) return; |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
513 |
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
514 sl_buddy = roster_find(bjid, jidsearch, ROSTER_TYPE_USER); |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
515 |
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
516 // If we have a resource name, we use it. Else we use NULL, |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
517 // which hopefully will give us the most likely resource. |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
518 if (sl_buddy) |
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
519 jep85 = buddy_resource_jep85(sl_buddy->data, resname); |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
520 |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
521 if (!jep85 || (jep85->support != CHATSTATES_SUPPORT_OK)) |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
522 return; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
523 |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
524 if (state == jep85->last_state_sent) |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
525 return; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
526 |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
527 if (state == ROSTER_EVENT_ACTIVE) |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
528 chattag = "active"; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
529 else if (state == ROSTER_EVENT_COMPOSING) |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
530 chattag = "composing"; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
531 else if (state == ROSTER_EVENT_PAUSED) |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
532 chattag = "paused"; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
533 else { |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
534 scr_LogPrint(LPRINT_LOGNORM, "Error: unsupported JEP-85 state (%d)", state); |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
535 return; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
536 } |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
537 |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
538 jep85->last_state_sent = state; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
539 |
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
540 if (resname) |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
541 fjid = g_strdup_printf("%s/%s", bjid, resname); |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
542 |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
543 rjid = resname ? fjid : (char*)bjid; |
1598 | 544 m = lm_message_new_with_sub_type(rjid, LM_MESSAGE_TYPE_MESSAGE, |
545 LM_MESSAGE_SUB_TYPE_CHAT); | |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
546 |
1598 | 547 event = lm_message_node_add_child(m->node, chattag, NULL); |
548 lm_message_node_set_attribute(event, "xmlns", NS_CHATSTATES); | |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
549 |
1598 | 550 lm_connection_send(lconnection, m, NULL); |
551 lm_message_unref(m); | |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
552 |
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
553 g_free(fjid); |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
554 } |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
555 #endif |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
556 |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
557 #ifdef JEP0022 |
1598 | 558 // xmpp_send_jep22_event() |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
559 // Send a JEP-22 message event (delivered, composing...). |
1598 | 560 static void xmpp_send_jep22_event(const char *fjid, guint type) |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
561 { |
1598 | 562 LmMessage *x; |
563 LmMessageNode *event; | |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
564 const char *msgid; |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
565 char *rname, *barejid; |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
566 GSList *sl_buddy; |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
567 struct jep0022 *jep22 = NULL; |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
568 guint jep22_state; |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
569 |
1598 | 570 if (!lm_connection_is_authenticated(lconnection)) return; |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
571 |
1058 | 572 rname = strchr(fjid, JID_RESOURCE_SEPARATOR); |
573 barejid = jidtodisp(fjid); | |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
574 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER); |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
575 g_free(barejid); |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
576 |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
577 // If we can get a resource name, we use it. Else we use NULL, |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
578 // which hopefully will give us the most likely resource. |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
579 if (rname) |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
580 rname++; |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
581 if (sl_buddy) |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
582 jep22 = buddy_resource_jep22(sl_buddy->data, rname); |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
583 |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
584 if (!jep22) |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
585 return; // XXX Maybe we could try harder (other resources?) |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
586 |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
587 msgid = jep22->last_msgid_rcvd; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
588 |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
589 // For composing events (composing, active, inactive, paused...), |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
590 // JEP22 only has 2 states; we'll use composing and active. |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
591 if (type == ROSTER_EVENT_COMPOSING) |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
592 jep22_state = ROSTER_EVENT_COMPOSING; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
593 else if (type == ROSTER_EVENT_ACTIVE || |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
594 type == ROSTER_EVENT_PAUSED) |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
595 jep22_state = ROSTER_EVENT_ACTIVE; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
596 else |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
597 jep22_state = 0; // ROSTER_EVENT_NONE |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
598 |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
599 if (jep22_state) { |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
600 // Do not re-send a same event |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
601 if (jep22_state == jep22->last_state_sent) |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
602 return; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
603 jep22->last_state_sent = jep22_state; |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
604 } |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
605 |
1598 | 606 x = lm_message_new_with_sub_type(fjid, LM_MESSAGE_TYPE_MESSAGE, |
607 LM_MESSAGE_SUB_TYPE_CHAT); | |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
608 |
1598 | 609 event = lm_message_node_add_child(x->node, "x", NULL); |
610 lm_message_node_set_attribute(event, "xmlns", NS_EVENT); | |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
611 if (type == ROSTER_EVENT_DELIVERED) |
1598 | 612 lm_message_node_add_child(event, "delivered", NULL); |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
613 else if (type == ROSTER_EVENT_COMPOSING) |
1598 | 614 lm_message_node_add_child(event, "composing", NULL); |
615 lm_message_node_add_child(event, "id", msgid); | |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
616 |
1598 | 617 lm_connection_send(lconnection, x, NULL); |
618 lm_message_unref(x); | |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
619 } |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
620 #endif |
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
621 |
1598 | 622 // xmpp_send_chatstate(buddy, state) |
997 | 623 // Send a chatstate or event (JEP-22/85) according to the buddy's capabilities. |
624 // The message is sent to one of the resources with the highest priority. | |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
625 #if defined JEP0022 || defined JEP0085 |
1598 | 626 void xmpp_send_chatstate(gpointer buddy, guint chatstate) |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
627 { |
1058 | 628 const char *bjid; |
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
629 #ifdef JEP0085 |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
630 GSList *resources, *p_res, *p_next; |
1476
77afd831f8f7
Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents:
1448
diff
changeset
|
631 struct jep0085 *jep85 = NULL; |
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
632 #endif |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
633 #ifdef JEP0022 |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
634 struct jep0022 *jep22; |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
635 #endif |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
636 |
1058 | 637 bjid = buddy_getjid(buddy); |
638 if (!bjid) return; | |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
639 |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
640 #ifdef JEP0085 |
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
641 /* Send the chatstate to the last resource (which should have the highest |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
642 priority). |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
643 If chatstate is "active", send an "active" state to all resources |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
644 which do not curently have this state. |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
645 */ |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
646 resources = buddy_getresources(buddy); |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
647 for (p_res = resources ; p_res ; p_res = p_next) { |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
648 p_next = g_slist_next(p_res); |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
649 jep85 = buddy_resource_jep85(buddy, p_res->data); |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
650 if (jep85 && jep85->support == CHATSTATES_SUPPORT_OK) { |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
651 // If p_next is NULL, this is the highest (prio) resource, i.e. |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
652 // the one we are probably writing to. |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
653 if (!p_next || (jep85->last_state_sent != ROSTER_EVENT_ACTIVE && |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
654 chatstate == ROSTER_EVENT_ACTIVE)) |
1598 | 655 xmpp_send_jep85_chatstate(bjid, p_res->data, chatstate); |
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
656 } |
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
657 g_free(p_res->data); |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
658 } |
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
659 g_slist_free(resources); |
1099
7804dbac3875
Fix a potential JEP22/85 issue introduced by changeset 10f9d6fcfeab
Mikael Berthe <mikael@lilotux.net>
parents:
1091
diff
changeset
|
660 // If the last resource had chatstates support when can return now, |
7804dbac3875
Fix a potential JEP22/85 issue introduced by changeset 10f9d6fcfeab
Mikael Berthe <mikael@lilotux.net>
parents:
1091
diff
changeset
|
661 // we don't want to send a JEP22 event. |
7804dbac3875
Fix a potential JEP22/85 issue introduced by changeset 10f9d6fcfeab
Mikael Berthe <mikael@lilotux.net>
parents:
1091
diff
changeset
|
662 if (jep85 && jep85->support == CHATSTATES_SUPPORT_OK) |
7804dbac3875
Fix a potential JEP22/85 issue introduced by changeset 10f9d6fcfeab
Mikael Berthe <mikael@lilotux.net>
parents:
1091
diff
changeset
|
663 return; |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
664 #endif |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
665 #ifdef JEP0022 |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
666 jep22 = buddy_resource_jep22(buddy, NULL); |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
667 if (jep22 && jep22->support == CHATSTATES_SUPPORT_OK) { |
1598 | 668 xmpp_send_jep22_event(bjid, chatstate); |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
669 } |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
670 #endif |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
671 } |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
672 #endif |
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
673 |
1598 | 674 |
999
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
675 // chatstates_reset_probed(fulljid) |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
676 // If the JEP has been probed for this contact, set it back to unknown so |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
677 // that we probe it again. The parameter must be a full jid (w/ resource). |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
678 #if defined JEP0022 || defined JEP0085 |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
679 static void chatstates_reset_probed(const char *fulljid) |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
680 { |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
681 char *rname, *barejid; |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
682 GSList *sl_buddy; |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
683 struct jep0085 *jep85; |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
684 struct jep0022 *jep22; |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
685 |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
686 rname = strchr(fulljid, JID_RESOURCE_SEPARATOR); |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
687 if (!rname++) |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
688 return; |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
689 |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
690 barejid = jidtodisp(fulljid); |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
691 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER); |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
692 g_free(barejid); |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
693 |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
694 if (!sl_buddy) |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
695 return; |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
696 |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
697 jep85 = buddy_resource_jep85(sl_buddy->data, rname); |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
698 jep22 = buddy_resource_jep22(sl_buddy->data, rname); |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
699 |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
700 if (jep85 && jep85->support == CHATSTATES_SUPPORT_PROBED) |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
701 jep85->support = CHATSTATES_SUPPORT_UNKNOWN; |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
702 if (jep22 && jep22->support == CHATSTATES_SUPPORT_PROBED) |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
703 jep22->support = CHATSTATES_SUPPORT_UNKNOWN; |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
704 } |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
705 #endif |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
706 |
1194
03d8fafe8104
Remove a warning when gpgme is disabled
Mikael Berthe <mikael@lilotux.net>
parents:
1166
diff
changeset
|
707 #ifdef HAVE_GPGME |
1104
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
708 // keys_mismatch(key, expectedkey) |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
709 // Return TRUE if both keys are non-null and "expectedkey" doesn't match |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
710 // the end of "key". |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
711 // If one of the keys is null, return FALSE. |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
712 // If expectedkey is less than 8 bytes long, return TRUE. |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
713 // |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
714 // Example: keys_mismatch("C9940A9BB0B92210", "B0B92210") will return FALSE. |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
715 static bool keys_mismatch(const char *key, const char *expectedkey) |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
716 { |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
717 int lk, lek; |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
718 |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
719 if (!expectedkey || !key) |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
720 return FALSE; |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
721 |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
722 lk = strlen(key); |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
723 lek = strlen(expectedkey); |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
724 |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
725 // If the expectedkey is less than 8 bytes long, this is probably a |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
726 // user mistake so we consider it's a mismatch. |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
727 if (lek < 8) |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
728 return TRUE; |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
729 |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
730 if (lek < lk) |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
731 key += lk - lek; |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
732 |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
733 return strcasecmp(key, expectedkey); |
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
734 } |
1194
03d8fafe8104
Remove a warning when gpgme is disabled
Mikael Berthe <mikael@lilotux.net>
parents:
1166
diff
changeset
|
735 #endif |
1104
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
736 |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
737 // check_signature(barejid, resourcename, xmldata, text) |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
738 // Verify the signature (in xmldata) of "text" for the contact |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
739 // barejid/resourcename. |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
740 // xmldata is the 'jabber:x:signed' stanza. |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
741 // If the key id is found, the contact's PGP data are updated. |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
742 static void check_signature(const char *barejid, const char *rname, |
1598 | 743 LmMessageNode *node, const char *text) |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
744 { |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
745 #ifdef HAVE_GPGME |
1598 | 746 const char *p, *key; |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
747 GSList *sl_buddy; |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
748 struct pgp_data *res_pgpdata; |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
749 gpgme_sigsum_t sigsum; |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
750 |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
751 // All parameters must be valid |
1598 | 752 if (!(node && barejid && rname && text)) |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
753 return; |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
754 |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
755 if (!gpg_enabled()) |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
756 return; |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
757 |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
758 // Get the resource PGP data structure |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
759 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER); |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
760 if (!sl_buddy) |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
761 return; |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
762 res_pgpdata = buddy_resource_pgp(sl_buddy->data, rname); |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
763 if (!res_pgpdata) |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
764 return; |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
765 |
1598 | 766 if (!node->name || strcmp(node->name, "x")) //XXX: probably useless |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
767 return; // We expect "<x xmlns='jabber:x:signed'>" |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
768 |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
769 // Get signature |
1598 | 770 p = lm_message_node_get_value(node); |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
771 if (!p) |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
772 return; |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
773 |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
774 key = gpg_verify(p, text, &sigsum); |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
775 if (key) { |
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
776 const char *expectedkey; |
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
777 char *buf; |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
778 g_free(res_pgpdata->sign_keyid); |
1598 | 779 res_pgpdata->sign_keyid = (char *)key; |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
780 res_pgpdata->last_sigsum = sigsum; |
1046
a3748bd3d010
Tell the user when a signature is bad
Mikael Berthe <mikael@lilotux.net>
parents:
1045
diff
changeset
|
781 if (sigsum & GPGME_SIGSUM_RED) { |
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
782 buf = g_strdup_printf("Bad signature from <%s/%s>", barejid, rname); |
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1282
diff
changeset
|
783 scr_WriteIncomingMessage(barejid, buf, 0, HBB_PREFIX_INFO, 0); |
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
784 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); |
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
785 g_free(buf); |
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
786 } |
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
787 // Verify that the key id is the one we expect. |
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
788 expectedkey = settings_pgp_getkeyid(barejid); |
1104
382972712208
Allow short key format in check_signature()
Mikael Berthe <mikael@lilotux.net>
parents:
1099
diff
changeset
|
789 if (keys_mismatch(key, expectedkey)) { |
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
790 buf = g_strdup_printf("Warning: The KeyId from <%s/%s> doesn't match " |
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
791 "the key you set up", barejid, rname); |
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1282
diff
changeset
|
792 scr_WriteIncomingMessage(barejid, buf, 0, HBB_PREFIX_INFO, 0); |
1046
a3748bd3d010
Tell the user when a signature is bad
Mikael Berthe <mikael@lilotux.net>
parents:
1045
diff
changeset
|
793 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); |
a3748bd3d010
Tell the user when a signature is bad
Mikael Berthe <mikael@lilotux.net>
parents:
1045
diff
changeset
|
794 g_free(buf); |
a3748bd3d010
Tell the user when a signature is bad
Mikael Berthe <mikael@lilotux.net>
parents:
1045
diff
changeset
|
795 } |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
796 } |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
797 #endif |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
798 } |
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
799 |
1598 | 800 static LmSSLResponse ssl_cb(LmSSL *ssl, LmSSLStatus status, gpointer ud) |
801 { | |
802 scr_LogPrint(LPRINT_LOGNORM, "SSL status:%d", status); | |
803 | |
804 switch (status) { | |
805 case LM_SSL_STATUS_NO_CERT_FOUND: | |
806 scr_LogPrint(LPRINT_LOGNORM, "No certificate found!"); | |
807 break; | |
808 case LM_SSL_STATUS_UNTRUSTED_CERT: | |
809 scr_LogPrint(LPRINT_LOGNORM, "Certificate is not trusted!"); | |
810 break; | |
811 case LM_SSL_STATUS_CERT_EXPIRED: | |
812 scr_LogPrint(LPRINT_LOGNORM, "Certificate has expired!"); | |
813 break; | |
814 case LM_SSL_STATUS_CERT_NOT_ACTIVATED: | |
815 scr_LogPrint(LPRINT_LOGNORM, "Certificate has not been activated!"); | |
816 break; | |
817 case LM_SSL_STATUS_CERT_HOSTNAME_MISMATCH: | |
818 scr_LogPrint(LPRINT_LOGNORM, | |
819 "Certificate hostname does not match expected hostname!"); | |
820 break; | |
821 case LM_SSL_STATUS_CERT_FINGERPRINT_MISMATCH: { | |
822 char fpr[49]; | |
823 fingerprint_to_hex((const unsigned char*)lm_ssl_get_fingerprint(ssl), | |
824 fpr); | |
825 scr_LogPrint(LPRINT_LOGNORM, | |
826 "Certificate fingerprint does not match expected fingerprint!"); | |
827 scr_LogPrint(LPRINT_LOGNORM, "Remote fingerprint: %s", fpr); | |
828 | |
829 scr_LogPrint(LPRINT_LOGNORM, "Expected fingerprint: %s", | |
830 settings_opt_get("ssl_fingerprint")); | |
831 | |
832 return LM_SSL_RESPONSE_STOP; | |
833 break; | |
834 } | |
835 case LM_SSL_STATUS_GENERIC_ERROR: | |
836 scr_LogPrint(LPRINT_LOGNORM, "Generic SSL error!"); | |
837 break; | |
838 } | |
839 | |
840 if (!settings_opt_get_int("ssl_ignore_checks")) | |
841 return LM_SSL_RESPONSE_CONTINUE; | |
842 return LM_SSL_RESPONSE_STOP; | |
843 } | |
844 | |
845 static void connection_auth_cb(LmConnection *connection, gboolean success, | |
846 gpointer user_data) | |
847 { | |
848 if (success) { | |
849 LmMessage *m; | |
850 | |
851 m = lm_message_new_with_sub_type(NULL, LM_MESSAGE_TYPE_PRESENCE, | |
852 LM_MESSAGE_SUB_TYPE_AVAILABLE); | |
853 lm_connection_send(connection, m, NULL); | |
854 | |
855 lm_message_unref(m); | |
856 xmpp_setprevstatus(); | |
857 xmpp_iq_request(NULL, NS_ROSTER); | |
858 xmpp_request_storage("storage:bookmarks"); | |
859 xmpp_request_storage("storage:rosternotes"); | |
860 | |
861 AutoConnection = TRUE; | |
862 } else | |
863 scr_LogPrint(LPRINT_LOGNORM, "Authentication failed"); | |
864 } | |
865 | |
866 gboolean xmpp_reconnect() | |
867 { | |
868 if (!lm_connection_is_authenticated(lconnection)) | |
869 xmpp_connect(); | |
870 return FALSE; | |
871 } | |
872 | |
873 static void _try_to_reconnect(void) | |
874 { | |
875 if (AutoConnection) | |
876 g_timeout_add_seconds(RECONNECTION_TIMEOUT, xmpp_reconnect, NULL); | |
877 } | |
878 | |
879 static void connection_open_cb(LmConnection *connection, gboolean success, | |
880 gpointer user_data) | |
881 { | |
882 const char *username, *password, *resource, *servername; | |
883 GError *error; | |
884 | |
885 if (success) { | |
886 servername = settings_opt_get("server"); | |
887 username = settings_opt_get("username"); | |
888 password = settings_opt_get("password"); | |
889 resource = strchr(lm_connection_get_jid(connection), | |
890 JID_RESOURCE_SEPARATOR); | |
891 if (resource) | |
892 resource++; | |
893 | |
894 if (!lm_connection_authenticate(lconnection, username, password, resource, | |
895 connection_auth_cb, NULL, FALSE, &error)) { | |
896 scr_LogPrint(LPRINT_LOGNORM, "Failed to authenticate: %s\n", | |
897 error->message); | |
898 _try_to_reconnect(); | |
899 } | |
900 } else { | |
901 scr_LogPrint(LPRINT_LOGNORM, "There was an error while connecting."); | |
902 _try_to_reconnect(); | |
903 } | |
904 } | |
905 | |
906 static void connection_close_cb(LmConnection *connection, | |
907 LmDisconnectReason reason, | |
908 gpointer user_data) | |
909 { | |
910 const char *str; | |
911 | |
912 switch (reason) { | |
913 case LM_DISCONNECT_REASON_OK: | |
914 str = "LM_DISCONNECT_REASON_OK"; | |
915 break; | |
916 case LM_DISCONNECT_REASON_PING_TIME_OUT: | |
917 str = "LM_DISCONNECT_REASON_PING_TIME_OUT"; | |
918 break; | |
919 case LM_DISCONNECT_REASON_HUP: | |
920 str = "LM_DISCONNECT_REASON_HUP"; | |
921 break; | |
922 case LM_DISCONNECT_REASON_ERROR: | |
923 str = "LM_DISCONNECT_REASON_ERROR"; | |
924 break; | |
925 case LM_DISCONNECT_REASON_UNKNOWN: | |
926 default: | |
927 str = "LM_DISCONNECT_REASON_UNKNOWN"; | |
928 break; | |
929 } | |
930 | |
931 if (reason != LM_DISCONNECT_REASON_OK) | |
932 _try_to_reconnect(); | |
933 | |
934 // Free bookmarks | |
935 if (bookmarks) | |
936 lm_message_node_unref(bookmarks); | |
937 bookmarks = NULL; | |
938 // Free roster | |
939 roster_free(); | |
940 if (rosternotes) | |
941 lm_message_node_unref(rosternotes); | |
942 rosternotes = NULL; | |
943 // Update display | |
944 update_roster = TRUE; | |
945 scr_UpdateBuddyWindow(); | |
946 | |
947 scr_LogPrint(LPRINT_NORMAL, "Disconnected, reason:%d->'%s'\n", reason, str); | |
948 } | |
949 | |
950 static void handle_state_events(const char *from, LmMessageNode *node) | |
951 { | |
952 #if defined JEP0022 || defined JEP0085 | |
953 LmMessageNode *state_ns = NULL; | |
954 const char *body; | |
955 char *rname, *bjid; | |
956 GSList *sl_buddy; | |
957 guint events; | |
958 struct jep0022 *jep22 = NULL; | |
959 struct jep0085 *jep85 = NULL; | |
960 enum { | |
961 JEP_none, | |
962 JEP_85, | |
963 JEP_22 | |
964 } which_jep = JEP_none; | |
965 | |
966 rname = strchr(from, JID_RESOURCE_SEPARATOR); | |
967 if (rname) | |
968 ++rname; | |
969 else | |
970 rname = (char *)from + strlen(from); | |
971 bjid = jidtodisp(from); | |
972 sl_buddy = roster_find(bjid, jidsearch, ROSTER_TYPE_USER); | |
973 g_free(bjid); | |
974 | |
975 /* XXX Actually that's wrong, since it filters out server "offline" | |
976 messages (for JEP-0022). This JEP is (almost) deprecated so | |
977 we don't really care. */ | |
978 if (!sl_buddy) { | |
979 return; | |
980 } | |
981 | |
982 /* Let's see chich JEP the contact uses. If possible, we'll use | |
983 JEP-85, if not we'll look for JEP-22 support. */ | |
984 events = buddy_resource_getevents(sl_buddy->data, rname); | |
985 | |
986 jep85 = buddy_resource_jep85(sl_buddy->data, rname); | |
987 if (jep85) { | |
988 state_ns = lm_message_node_find_xmlns(node, NS_CHATSTATES); | |
989 if (state_ns) | |
990 which_jep = JEP_85; | |
991 } | |
992 | |
993 if (which_jep != JEP_85) { /* Fall back to JEP-0022 */ | |
994 jep22 = buddy_resource_jep22(sl_buddy->data, rname); | |
995 if (jep22) { | |
996 state_ns = lm_message_node_find_xmlns(node, NS_EVENT); | |
997 if (state_ns) | |
998 which_jep = JEP_22; | |
999 } | |
1000 } | |
1001 | |
1002 if (!which_jep) { /* Sender does not use chat states */ | |
1003 return; | |
1004 } | |
1005 | |
1006 body = lm_message_node_get_child_value(node, "body"); | |
1007 | |
1008 if (which_jep == JEP_85) { /* JEP-0085 */ | |
1009 jep85->support = CHATSTATES_SUPPORT_OK; | |
1010 | |
1011 if (!strcmp(state_ns->name, "composing")) { | |
1012 jep85->last_state_rcvd = ROSTER_EVENT_COMPOSING; | |
1013 } else if (!strcmp(state_ns->name, "active")) { | |
1014 jep85->last_state_rcvd = ROSTER_EVENT_ACTIVE; | |
1015 } else if (!strcmp(state_ns->name, "paused")) { | |
1016 jep85->last_state_rcvd = ROSTER_EVENT_PAUSED; | |
1017 } else if (!strcmp(state_ns->name, "inactive")) { | |
1018 jep85->last_state_rcvd = ROSTER_EVENT_INACTIVE; | |
1019 } else if (!strcmp(state_ns->name, "gone")) { | |
1020 jep85->last_state_rcvd = ROSTER_EVENT_GONE; | |
1021 } | |
1022 events = jep85->last_state_rcvd; | |
1023 } else { /* JEP-0022 */ | |
1024 #ifdef JEP0022 | |
1025 const char *msgid; | |
1026 jep22->support = CHATSTATES_SUPPORT_OK; | |
1027 jep22->last_state_rcvd = ROSTER_EVENT_NONE; | |
1028 | |
1029 msgid = lm_message_node_get_attribute(node, "id"); | |
1030 | |
1031 if (lm_message_node_get_child(state_ns, "composing")) { | |
1032 // Clear composing if the message contains a body | |
1033 if (body) | |
1034 events &= ~ROSTER_EVENT_COMPOSING; | |
1035 else | |
1036 events |= ROSTER_EVENT_COMPOSING; | |
1037 jep22->last_state_rcvd |= ROSTER_EVENT_COMPOSING; | |
1038 | |
1039 } else { | |
1040 events &= ~ROSTER_EVENT_COMPOSING; | |
1041 } | |
1042 | |
1043 // Cache the message id | |
1044 g_free(jep22->last_msgid_rcvd); | |
1045 if (msgid) | |
1046 jep22->last_msgid_rcvd = g_strdup(msgid); | |
1047 else | |
1048 jep22->last_msgid_rcvd = NULL; | |
1049 | |
1050 if (lm_message_node_get_child(state_ns, "delivered")) { | |
1051 jep22->last_state_rcvd |= ROSTER_EVENT_DELIVERED; | |
1052 | |
1053 // Do we have to send back an ACK? | |
1054 if (body) | |
1055 xmpp_send_jep22_event(from, ROSTER_EVENT_DELIVERED); | |
1056 } | |
1057 #endif | |
1058 } | |
1059 | |
1060 buddy_resource_setevents(sl_buddy->data, rname, events); | |
1061 | |
1062 update_roster = TRUE; | |
1063 #endif | |
1064 } | |
1065 | |
1066 static void gotmessage(LmMessageSubType type, const char *from, | |
1067 const char *body, const char *enc, const char *subject, | |
1068 time_t timestamp, LmMessageNode *node_signed) | |
29 | 1069 { |
1058 | 1070 char *bjid; |
956
819396bebdf5
Do not block system messages when block_unsubscribed is set
Mikael Berthe <mikael@lilotux.net>
parents:
940
diff
changeset
|
1071 const char *rname, *s; |
1347
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1072 char *decrypted_pgp = NULL; |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1073 char *decrypted_otr = NULL; |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
1074 int otr_msg = 0, free_msg = 0; |
29 | 1075 |
1058 | 1076 bjid = jidtodisp(from); |
441
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1077 |
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
960
diff
changeset
|
1078 rname = strchr(from, JID_RESOURCE_SEPARATOR); |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1079 if (rname) rname++; |
819
c2d7d9dd4193
New option 'block_unsubscribed'
Mikael Berthe <mikael@lilotux.net>
parents:
818
diff
changeset
|
1080 |
1042
8a395c2cafc4
Initial PGP support (decrypt)
Mikael Berthe <mikael@lilotux.net>
parents:
1023
diff
changeset
|
1081 #ifdef HAVE_GPGME |
8a395c2cafc4
Initial PGP support (decrypt)
Mikael Berthe <mikael@lilotux.net>
parents:
1023
diff
changeset
|
1082 if (enc && gpg_enabled()) { |
1347
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1083 decrypted_pgp = gpg_decrypt(enc); |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1084 if (decrypted_pgp) { |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1085 body = decrypted_pgp; |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
1086 } |
1042
8a395c2cafc4
Initial PGP support (decrypt)
Mikael Berthe <mikael@lilotux.net>
parents:
1023
diff
changeset
|
1087 } |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
1088 // Check signature of an unencrypted message |
1598 | 1089 if (node_signed && gpg_enabled()) |
1090 check_signature(bjid, rname, node_signed, decrypted_pgp); | |
1042
8a395c2cafc4
Initial PGP support (decrypt)
Mikael Berthe <mikael@lilotux.net>
parents:
1023
diff
changeset
|
1091 #endif |
8a395c2cafc4
Initial PGP support (decrypt)
Mikael Berthe <mikael@lilotux.net>
parents:
1023
diff
changeset
|
1092 |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
1093 #ifdef HAVE_LIBOTR |
1347
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1094 if (otr_enabled()) { |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1095 decrypted_otr = (char*)body; |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1096 otr_msg = otr_receive(&decrypted_otr, bjid, &free_msg); |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1097 if (!decrypted_otr) { |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1098 goto gotmessage_return; |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1099 } |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1100 body = decrypted_otr; |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
1101 } |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
1102 #endif |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
1103 |
864
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1104 // Check for unexpected groupchat messages |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1105 // If we receive a groupchat message from a room we're not a member of, |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1106 // this is probably a server issue and the best we can do is to send |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1107 // a type unavailable. |
1598 | 1108 if (type == LM_MESSAGE_SUB_TYPE_GROUPCHAT && !roster_getnickname(bjid)) { |
864
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1109 // It shouldn't happen, probably a server issue |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1110 GSList *room_elt; |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1111 char *mbuf; |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1112 |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1113 mbuf = g_strdup_printf("Unexpected groupchat packet!"); |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1114 scr_LogPrint(LPRINT_LOGNORM, "%s", mbuf); |
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1282
diff
changeset
|
1115 scr_WriteIncomingMessage(bjid, mbuf, 0, HBB_PREFIX_INFO, 0); |
864
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1116 g_free(mbuf); |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1117 |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1118 // Send back an unavailable packet |
1598 | 1119 xmpp_setstatus(offline, bjid, "", TRUE); |
864
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1120 |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1121 // MUC |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1122 // Make sure this is a room (it can be a conversion user->room) |
1058 | 1123 room_elt = roster_find(bjid, jidsearch, 0); |
864
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1124 if (!room_elt) { |
1355 | 1125 room_elt = roster_add_user(bjid, NULL, NULL, ROSTER_TYPE_ROOM, |
1126 sub_none, -1); | |
864
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1127 } else { |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1128 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1129 } |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1130 |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1131 buddylist_build(); |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1132 scr_DrawRoster(); |
1347
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1133 goto gotmessage_return; |
864
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1134 } |
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
1135 |
819
c2d7d9dd4193
New option 'block_unsubscribed'
Mikael Berthe <mikael@lilotux.net>
parents:
818
diff
changeset
|
1136 // We don't call the message_in hook if 'block_unsubscribed' is true and |
c2d7d9dd4193
New option 'block_unsubscribed'
Mikael Berthe <mikael@lilotux.net>
parents:
818
diff
changeset
|
1137 // this is a regular message from an unsubscribed user. |
956
819396bebdf5
Do not block system messages when block_unsubscribed is set
Mikael Berthe <mikael@lilotux.net>
parents:
940
diff
changeset
|
1138 // System messages (from our server) are allowed. |
1598 | 1139 if ((!settings_opt_get_int("block_unsubscribed") || |
1140 (roster_getsubscription(bjid) & sub_from) || | |
1141 (type == LM_MESSAGE_SUB_TYPE_CHAT)) || | |
1058 | 1142 ((s = settings_opt_get("server")) != NULL && !strcasecmp(bjid, s))) { |
1399
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1143 gchar *fullbody = NULL; |
1484
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
1144 guint encrypted; |
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
1145 |
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
1146 if (decrypted_pgp) |
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
1147 encrypted = ENCRYPTED_PGP; |
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
1148 else if (otr_msg) |
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
1149 encrypted = ENCRYPTED_OTR; |
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
1150 else |
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
1151 encrypted = 0; |
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
1152 |
1399
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1153 if (subject) { |
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1154 if (body) |
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1155 fullbody = g_strdup_printf("[%s]\n%s", subject, body); |
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1156 else |
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1157 fullbody = g_strdup_printf("[%s]\n", subject); |
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1158 body = fullbody; |
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1159 } |
1484
7b36b91a4388
New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents:
1476
diff
changeset
|
1160 hk_message_in(bjid, rname, timestamp, body, type, encrypted); |
1399
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1161 g_free(fullbody); |
819
c2d7d9dd4193
New option 'block_unsubscribed'
Mikael Berthe <mikael@lilotux.net>
parents:
818
diff
changeset
|
1162 } else { |
1058 | 1163 scr_LogPrint(LPRINT_LOGNORM, "Blocked a message from <%s>", bjid); |
819
c2d7d9dd4193
New option 'block_unsubscribed'
Mikael Berthe <mikael@lilotux.net>
parents:
818
diff
changeset
|
1164 } |
1347
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1165 |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1166 gotmessage_return: |
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1167 // Clean up and exit |
1058 | 1168 g_free(bjid); |
1347
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1169 g_free(decrypted_pgp); |
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1330
diff
changeset
|
1170 if (free_msg) |
1347
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
1171 g_free(decrypted_otr); |
29 | 1172 } |
1173 | |
420
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
1174 |
1598 | 1175 static LmHandlerResult handle_messages(LmMessageHandler *handler, |
1176 LmConnection *connection, | |
1177 LmMessage *m, gpointer user_data) | |
579
0c67755e0fa7
Introduce a handle_presence_muc() function
Mikael Berthe <mikael@lilotux.net>
parents:
578
diff
changeset
|
1178 { |
1598 | 1179 const char *p, *from=lm_message_get_from(m); |
1180 char *r, *s; | |
1181 LmMessageNode *x; | |
1182 const char *body = NULL; | |
1183 const char *enc = NULL; | |
1184 const char *subject = NULL; | |
1001
dff25377c11f
Auto-reconnect after a network/server failure
Mikael Berthe <mikael@lilotux.net>
parents:
999
diff
changeset
|
1185 time_t timestamp = 0L; |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1186 |
1598 | 1187 body = lm_message_node_get_child_value(m->node, "body"); |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1188 |
1598 | 1189 x = lm_message_node_find_xmlns(m->node, NS_ENCRYPTED); |
1190 if (x && (p = lm_message_node_get_value(x)) != NULL) | |
1399
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1191 enc = p; |
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1192 |
1598 | 1193 p = lm_message_node_get_child_value(m->node, "subject"); |
1194 if (p != NULL) { | |
1195 if (lm_message_get_sub_type(m) != LM_MESSAGE_SUB_TYPE_GROUPCHAT) { | |
1196 // Chat message | |
1399
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1197 subject = p; |
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1198 } else { // Room topic |
549
448e299e45da
MUC: "/room topic" shows the current room topic
Mikael Berthe <mikael@lilotux.net>
parents:
547
diff
changeset
|
1199 GSList *roombuddy; |
1598 | 1200 gchar *mbuf; |
1201 const gchar *subj = p; | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1202 // Get the room (s) and the nickname (r) |
1598 | 1203 s = g_strdup(lm_message_get_from(m)); |
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
960
diff
changeset
|
1204 r = strchr(s, JID_RESOURCE_SEPARATOR); |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1205 if (r) *r++ = 0; |
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1206 else r = s; |
549
448e299e45da
MUC: "/room topic" shows the current room topic
Mikael Berthe <mikael@lilotux.net>
parents:
547
diff
changeset
|
1207 // Set the new topic |
448e299e45da
MUC: "/room topic" shows the current room topic
Mikael Berthe <mikael@lilotux.net>
parents:
547
diff
changeset
|
1208 roombuddy = roster_find(s, jidsearch, 0); |
448e299e45da
MUC: "/room topic" shows the current room topic
Mikael Berthe <mikael@lilotux.net>
parents:
547
diff
changeset
|
1209 if (roombuddy) |
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
756
diff
changeset
|
1210 buddy_settopic(roombuddy->data, subj); |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1211 // Display inside the room window |
560
64cb4de94972
Better topic attribution
Mikael Berthe <mikael@lilotux.net>
parents:
549
diff
changeset
|
1212 if (r == s) { |
64cb4de94972
Better topic attribution
Mikael Berthe <mikael@lilotux.net>
parents:
549
diff
changeset
|
1213 // No specific resource (this is certainly history) |
1598 | 1214 mbuf = g_strdup_printf("The topic has been set to: %s", subj); |
560
64cb4de94972
Better topic attribution
Mikael Berthe <mikael@lilotux.net>
parents:
549
diff
changeset
|
1215 } else { |
1598 | 1216 mbuf = g_strdup_printf("%s has set the topic to: %s", r, subj); |
560
64cb4de94972
Better topic attribution
Mikael Berthe <mikael@lilotux.net>
parents:
549
diff
changeset
|
1217 } |
1598 | 1218 scr_WriteIncomingMessage(s, mbuf, 0, |
1219 HBB_PREFIX_INFO|HBB_PREFIX_NOFLAG, 0); | |
1220 if (settings_opt_get_int("log_muc_conf")) | |
1221 hlog_write_message(s, 0, -1, mbuf); | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1222 g_free(s); |
1598 | 1223 g_free(mbuf); |
732
ab623c2df964
MUC: Update the chat status line when the topic is updated
Mikael Berthe <mikael@lilotux.net>
parents:
724
diff
changeset
|
1224 // The topic is displayed in the chat status line, so refresh now. |
ab623c2df964
MUC: Update the chat status line when the topic is updated
Mikael Berthe <mikael@lilotux.net>
parents:
724
diff
changeset
|
1225 scr_UpdateChatStatus(TRUE); |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1226 } |
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1227 } |
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1228 |
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1229 // Timestamp? |
1598 | 1230 timestamp = lm_message_node_get_timestamp(m->node); |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1231 |
1598 | 1232 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { |
1233 x = lm_message_node_get_child(m->node, "error"); | |
1213
4a7db2870685
Improve Private Storage detection.
Mikael Berthe <mikael@lilotux.net>
parents:
1212
diff
changeset
|
1234 display_server_error(x); |
999
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
1235 #if defined JEP0022 || defined JEP0085 |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
1236 // If the JEP85/22 support is probed, set it back to unknown so that |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
1237 // we probe it again. |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
1238 chatstates_reset_probed(from); |
9687ecc59303
Redo chat states detection if we receive a message error packet from a contact
Mikael Berthe <mikael@lilotux.net>
parents:
998
diff
changeset
|
1239 #endif |
1132
1650056b96fc
Do not use chat states of error messages :)
Mikael Berthe <mikael@lilotux.net>
parents:
1128
diff
changeset
|
1240 } else { |
1598 | 1241 handle_state_events(from, m->node); |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1242 } |
1399
187985455020
Correctly display PGP-encoded messages with a subject
Mikael Berthe <mikael@lilotux.net>
parents:
1397
diff
changeset
|
1243 if (from && (body || subject)) |
1598 | 1244 gotmessage(lm_message_get_sub_type(m), from, body, enc, subject, timestamp, |
1245 lm_message_node_find_xmlns(m->node, NS_SIGNED)); | |
1128 | 1246 |
1247 if (from) { | |
1598 | 1248 x = lm_message_node_find_xmlns(m->node, |
1249 "http://jabber.org/protocol/muc#user"); | |
1250 if (x && !strcmp(x->name, "x")) | |
1128 | 1251 got_muc_message(from, x); |
1252 } | |
1598 | 1253 |
1254 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1255 } |
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1256 |
1600 | 1257 static LmHandlerResult cb_caps(LmMessageHandler *h, LmConnection *c, |
1258 LmMessage *m, gpointer user_data) | |
1259 { | |
1260 char *ver = user_data; | |
1261 | |
1262 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { | |
1263 display_server_error(lm_message_node_get_child(m->node, "error")); | |
1264 } else if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_RESULT) { | |
1265 LmMessageNode *info; | |
1266 LmMessageNode *query = lm_message_node_get_child(m->node, "query"); | |
1267 | |
1268 caps_add(ver); | |
1269 info = lm_message_node_get_child(query, "identity"); | |
1270 if (info) | |
1271 caps_set_identity(ver, lm_message_node_get_attribute(info, "category"), | |
1272 lm_message_node_get_attribute(info, "name"), | |
1273 lm_message_node_get_attribute(info, "type")); | |
1274 info = lm_message_node_get_child(query, "feature"); | |
1275 while (info) { | |
1276 if (!g_strcmp0(info->name, "feature")) | |
1277 caps_add_feature(ver, lm_message_node_get_attribute(info, "var")); | |
1278 info = info->next; | |
1279 } | |
1280 } | |
1281 g_free(ver); | |
1282 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
1283 } | |
1284 | |
1598 | 1285 static LmHandlerResult handle_presence(LmMessageHandler *handler, |
1286 LmConnection *connection, | |
1287 LmMessage *m, gpointer user_data) | |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
1288 { |
1598 | 1289 char *r; |
1290 const char *from, *rname, *p=NULL, *ustmsg=NULL; | |
1291 enum imstatus ust; | |
1292 char bpprio; | |
1293 time_t timestamp = 0L; | |
1600 | 1294 LmMessageNode *muc_packet, *caps; |
1598 | 1295 |
1296 //Check for MUC presence packet | |
1297 muc_packet = lm_message_node_find_xmlns | |
1298 (m->node, "http://jabber.org/protocol/muc#user"); | |
1299 | |
1300 from = lm_message_get_from(m); | |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
1301 |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
1302 rname = strchr(from, JID_RESOURCE_SEPARATOR); |
1598 | 1303 if (rname) rname++; |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
1304 |
1598 | 1305 if (settings_opt_get_int("ignore_self_presence")) { |
1306 const char *self_fjid = lm_connection_get_jid(connection); | |
1307 if (self_fjid && !strcasecmp(self_fjid, from)) { | |
1308 return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; // Ignoring self presence | |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
1309 } |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
1310 } |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
1311 |
1598 | 1312 r = jidtodisp(from); |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
1313 |
1598 | 1314 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { |
1315 LmMessageNode *x; | |
1316 scr_LogPrint(LPRINT_LOGNORM, "Error presence packet from <%s>", r); | |
1317 x = lm_message_node_find_child(m->node, "error"); | |
1318 display_server_error(x); | |
1319 // Let's check it isn't a nickname conflict. | |
1320 // XXX Note: We should handle the <conflict/> string condition. | |
1321 if ((p = lm_message_node_get_attribute(x, "code")) != NULL) { | |
1322 if (atoi(p) == 409) { | |
1323 // 409 = conflict (nickname is in use or registered by another user) | |
1324 // If we are not inside this room, we should reset the nickname | |
1325 GSList *room_elt = roster_find(r, jidsearch, 0); | |
1326 if (room_elt && !buddy_getinsideroom(room_elt->data)) | |
1327 buddy_setnickname(room_elt->data, NULL); | |
1328 } | |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
1329 } |
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
1330 |
1598 | 1331 g_free(r); |
1332 return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; | |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
1333 } |
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
1334 |
1598 | 1335 p = lm_message_node_get_child_value(m->node, "priority"); |
1336 if (p && *p) bpprio = (gchar)atoi(p); | |
1337 else bpprio = 0; | |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
1338 |
1598 | 1339 ust = available; |
749
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
1340 |
1598 | 1341 p = lm_message_node_get_child_value(m->node, "show"); |
1342 if (p) { | |
1343 if (!strcmp(p, "away")) ust = away; | |
1344 else if (!strcmp(p, "dnd")) ust = dontdisturb; | |
1345 else if (!strcmp(p, "xa")) ust = notavail; | |
1346 else if (!strcmp(p, "chat")) ust = freeforchat; | |
749
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
1347 } |
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
1348 |
1598 | 1349 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_UNAVAILABLE) |
1350 ust = offline; | |
749
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
1351 |
1598 | 1352 ustmsg = lm_message_node_get_child_value(m->node, "status"); |
749
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
1353 |
1598 | 1354 // Timestamp? |
1355 timestamp = lm_message_node_get_timestamp(m->node); | |
1356 | |
1357 if (muc_packet) { | |
1358 // This is a MUC presence message | |
1359 handle_muc_presence(from, muc_packet, r, rname, | |
1360 ust, ustmsg, timestamp, bpprio); | |
749
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
1361 } else { |
1598 | 1362 // Not a MUC message, so this is a regular buddy... |
1363 // Call hk_statuschange() if status has changed or if the | |
1364 // status message is different | |
1365 const char *msg; | |
1366 msg = roster_getstatusmsg(r, rname); | |
1367 if ((ust != roster_getstatus(r, rname)) || | |
1368 (!ustmsg && msg && msg[0]) || (ustmsg && (!msg || strcmp(ustmsg, msg)))) | |
1369 hk_statuschange(r, rname, bpprio, timestamp, ust, ustmsg); | |
1370 // Presence signature processing | |
1371 if (!ustmsg) | |
1372 ustmsg = ""; // Some clients omit the <status/> element :-( | |
1373 check_signature(r, rname, lm_message_node_find_xmlns(m->node, NS_SIGNED), | |
1374 ustmsg); | |
1128 | 1375 } |
1376 | |
1600 | 1377 //XEP-0115 Entity Capabilities |
1378 caps = lm_message_node_find_xmlns(m->node, NS_CAPS); | |
1379 if (caps) { | |
1380 const char *ver = lm_message_node_get_attribute(caps, "ver"); | |
1381 GSList *sl_buddy = NULL; | |
1382 if (rname) | |
1383 sl_buddy = roster_find(r, jidsearch, ROSTER_TYPE_USER); | |
1384 //only cache the caps if the user is on the roster | |
1385 if (sl_buddy && buddy_getonserverflag(sl_buddy->data)) { | |
1386 buddy_resource_setcaps(sl_buddy->data, rname, ver); | |
1387 | |
1388 if (!caps_has_hash(ver)) { | |
1389 char *node; | |
1390 LmMessageHandler *handler; | |
1391 LmMessage *iq = lm_message_new_with_sub_type(from, LM_MESSAGE_TYPE_IQ, | |
1392 LM_MESSAGE_SUB_TYPE_GET); | |
1393 node = g_strdup_printf("%s#%s", | |
1394 lm_message_node_get_attribute(caps, "node"), | |
1395 ver); | |
1396 lm_message_node_set_attributes | |
1397 (lm_message_node_add_child(iq->node, "query", NULL), | |
1398 "xmlns", NS_DISCO_INFO, | |
1399 "node", node, | |
1400 NULL); | |
1401 g_free(node); | |
1402 handler = lm_message_handler_new(cb_caps, g_strdup(ver), NULL); | |
1403 lm_connection_send_with_reply(connection, iq, handler, NULL); | |
1404 lm_message_unref(iq); | |
1405 lm_message_handler_unref(handler); | |
1406 } | |
1407 } | |
1408 } | |
1409 | |
1598 | 1410 g_free(r); |
1411 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
1128 | 1412 } |
1413 | |
1414 | |
1598 | 1415 static LmHandlerResult handle_iq(LmMessageHandler *handler, |
1416 LmConnection *connection, | |
1417 LmMessage *m, gpointer user_data) | |
1418 { | |
1419 int i; | |
1420 const char *xmlns = NULL; | |
1421 LmMessageNode *x; | |
1422 | |
1423 for (x = m->node->children; x; x=x->next) { | |
1424 xmlns = lm_message_node_get_attribute(x, "xmlns"); | |
1425 if (xmlns) | |
1426 for (i=0; iq_handlers[i].xmlns; ++i) | |
1427 if (!strcmp(iq_handlers[i].xmlns, xmlns)) | |
1428 return iq_handlers[i].handler(NULL, connection, m, user_data); | |
1429 xmlns = NULL; | |
1128 | 1430 } |
1431 | |
1598 | 1432 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { |
1433 display_server_error(lm_message_node_get_child(m->node, "error")); | |
1434 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
1128 | 1435 } |
1436 | |
1598 | 1437 if ((lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_SET) || |
1438 (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_GET)) | |
1439 send_iq_error(connection, m, XMPP_ERROR_NOT_IMPLEMENTED); | |
1440 | |
1441 scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, "Unhandled IQ: %s", | |
1442 lm_message_node_to_string(m->node)); | |
1443 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
1128 | 1444 } |
1445 | |
1598 | 1446 static LmHandlerResult handle_s10n(LmMessageHandler *handler, |
1447 LmConnection *connection, | |
1448 LmMessage *m, gpointer user_data) | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1449 { |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1450 char *r; |
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1451 char *buf; |
818
55cd45481a07
Fix a buddylist bug when receiving a subscription request
Mikael Berthe <mikael@lilotux.net>
parents:
793
diff
changeset
|
1452 int newbuddy; |
1598 | 1453 const char *from = lm_message_get_from(m); |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1454 |
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1455 r = jidtodisp(from); |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1456 |
818
55cd45481a07
Fix a buddylist bug when receiving a subscription request
Mikael Berthe <mikael@lilotux.net>
parents:
793
diff
changeset
|
1457 newbuddy = !roster_find(r, jidsearch, 0); |
55cd45481a07
Fix a buddylist bug when receiving a subscription request
Mikael Berthe <mikael@lilotux.net>
parents:
793
diff
changeset
|
1458 |
1598 | 1459 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_SUBSCRIBE) { |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1460 /* The sender wishes to subscribe to our presence */ |
1598 | 1461 const char *msg; |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1462 int isagent; |
749
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
1463 eviqs *evn; |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1464 |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1465 isagent = (roster_gettype(r) & ROSTER_TYPE_AGENT) != 0; |
1598 | 1466 msg = lm_message_node_get_child_value(m->node, "status"); |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1467 |
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
616
diff
changeset
|
1468 buf = g_strdup_printf("<%s> wants to subscribe to your presence updates", |
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
616
diff
changeset
|
1469 from); |
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1282
diff
changeset
|
1470 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0); |
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
616
diff
changeset
|
1471 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); |
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
616
diff
changeset
|
1472 g_free(buf); |
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
616
diff
changeset
|
1473 |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1474 if (msg) { |
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
756
diff
changeset
|
1475 buf = g_strdup_printf("<%s> said: %s", from, msg); |
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1282
diff
changeset
|
1476 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0); |
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
756
diff
changeset
|
1477 replace_nl_with_dots(buf); |
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
756
diff
changeset
|
1478 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); |
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
756
diff
changeset
|
1479 g_free(buf); |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1480 } |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1481 |
749
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
1482 // Create a new event item |
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
1483 evn = evs_new(EVS_TYPE_SUBSCRIPTION, EVS_MAX_TIMEOUT); |
751
4a7271e69694
Avoid reusing events ids
Mikael Berthe <mikael@lilotux.net>
parents:
749
diff
changeset
|
1484 if (evn) { |
752 | 1485 evn->callback = &evscallback_subscription; |
751
4a7271e69694
Avoid reusing events ids
Mikael Berthe <mikael@lilotux.net>
parents:
749
diff
changeset
|
1486 evn->data = g_strdup(r); |
754
5b962b978573
Add event description when receiving a subscription request
Mikael Berthe <mikael@lilotux.net>
parents:
752
diff
changeset
|
1487 evn->desc = g_strdup_printf("<%s> wants to subscribe to your " |
5b962b978573
Add event description when receiving a subscription request
Mikael Berthe <mikael@lilotux.net>
parents:
752
diff
changeset
|
1488 "presence updates", r); |
751
4a7271e69694
Avoid reusing events ids
Mikael Berthe <mikael@lilotux.net>
parents:
749
diff
changeset
|
1489 buf = g_strdup_printf("Please use /event %s accept|reject", evn->id); |
4a7271e69694
Avoid reusing events ids
Mikael Berthe <mikael@lilotux.net>
parents:
749
diff
changeset
|
1490 } else { |
4a7271e69694
Avoid reusing events ids
Mikael Berthe <mikael@lilotux.net>
parents:
749
diff
changeset
|
1491 buf = g_strdup_printf("Unable to create a new event!"); |
4a7271e69694
Avoid reusing events ids
Mikael Berthe <mikael@lilotux.net>
parents:
749
diff
changeset
|
1492 } |
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1282
diff
changeset
|
1493 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0); |
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
616
diff
changeset
|
1494 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1495 g_free(buf); |
1598 | 1496 } else if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_UNSUBSCRIBE) { |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1497 /* The sender is unsubscribing from our presence */ |
1598 | 1498 xmpp_send_s10n(from, LM_MESSAGE_SUB_TYPE_UNSUBSCRIBED); |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1499 buf = g_strdup_printf("<%s> is unsubscribing from your " |
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1500 "presence updates", from); |
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1282
diff
changeset
|
1501 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0); |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1502 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); |
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1503 g_free(buf); |
1598 | 1504 } else if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_SUBSCRIBED) { |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1505 /* The sender has allowed us to receive their presence */ |
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1506 buf = g_strdup_printf("<%s> has allowed you to receive their " |
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1507 "presence updates", from); |
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1282
diff
changeset
|
1508 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0); |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1509 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); |
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1510 g_free(buf); |
1598 | 1511 } else if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_UNSUBSCRIBED) { |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1512 /* The subscription request has been denied or a previously-granted |
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1513 subscription has been cancelled */ |
610
0e8247cf2bd1
Consider buddies as offline when they have cancelled our subscription
Mikael Berthe <mikael@lilotux.net>
parents:
609
diff
changeset
|
1514 roster_unsubscribed(from); |
859
cb2a3a1d985f
Make sure we update the roster when a subscription is cancelled
Mikael Berthe <mikael@lilotux.net>
parents:
845
diff
changeset
|
1515 update_roster = TRUE; |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1516 buf = g_strdup_printf("<%s> has cancelled your subscription to " |
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1517 "their presence updates", from); |
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1282
diff
changeset
|
1518 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0); |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1519 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); |
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1520 g_free(buf); |
603 | 1521 } else { |
1598 | 1522 return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
818
55cd45481a07
Fix a buddylist bug when receiving a subscription request
Mikael Berthe <mikael@lilotux.net>
parents:
793
diff
changeset
|
1523 } |
55cd45481a07
Fix a buddylist bug when receiving a subscription request
Mikael Berthe <mikael@lilotux.net>
parents:
793
diff
changeset
|
1524 |
1010
54405d09b15a
Add a call to buddylist_build()
Mikael Berthe <mikael@lilotux.net>
parents:
1008
diff
changeset
|
1525 if (newbuddy) |
818
55cd45481a07
Fix a buddylist bug when receiving a subscription request
Mikael Berthe <mikael@lilotux.net>
parents:
793
diff
changeset
|
1526 update_roster = TRUE; |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
1527 g_free(r); |
1598 | 1528 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
1529 } | |
1530 | |
1531 //TODO: Use the enum of loudmouth, when it's included in the header... | |
1532 typedef enum { | |
1533 LM_LOG_LEVEL_VERBOSE = 1 << (G_LOG_LEVEL_USER_SHIFT), | |
1534 LM_LOG_LEVEL_NET = 1 << (G_LOG_LEVEL_USER_SHIFT + 1), | |
1535 LM_LOG_LEVEL_PARSER = 1 << (G_LOG_LEVEL_USER_SHIFT + 2), | |
1536 LM_LOG_LEVEL_SSL = 1 << (G_LOG_LEVEL_USER_SHIFT + 3), | |
1537 LM_LOG_LEVEL_SASL = 1 << (G_LOG_LEVEL_USER_SHIFT + 4), | |
1538 LM_LOG_LEVEL_ALL = (LM_LOG_LEVEL_NET | | |
1539 LM_LOG_LEVEL_VERBOSE | | |
1540 LM_LOG_LEVEL_PARSER | | |
1541 LM_LOG_LEVEL_SSL | | |
1542 LM_LOG_LEVEL_SASL) | |
1543 } LmLogLevelFlags; | |
1544 | |
1545 static void lm_debug_handler (const gchar *log_domain, | |
1546 GLogLevelFlags log_level, | |
1547 const gchar *message, | |
1548 gpointer user_data) | |
1549 { | |
1550 if (settings_opt_get_int("tracelog_level") != 2) | |
1551 return; | |
1552 if (message) { | |
1553 char *msg; | |
1554 if (message[0] == '\n') | |
1555 msg = g_strdup(&message[1]); | |
1556 else | |
1557 msg = g_strdup(message); | |
1558 if (msg[strlen(msg)-1] == '\n') msg[strlen(msg)-1] = '\0'; | |
1559 | |
1560 if (log_level & LM_LOG_LEVEL_VERBOSE) { | |
1561 scr_LogPrint(LPRINT_DEBUG, "LM-VERBOSE: %s", msg); | |
1562 } | |
1563 if ((LmLogLevelFlags)log_level & LM_LOG_LEVEL_NET) { | |
1564 scr_LogPrint(LPRINT_DEBUG, "LM-NET: %s", msg); | |
1565 } | |
1566 else if (log_level & LM_LOG_LEVEL_PARSER) { | |
1567 scr_LogPrint(LPRINT_DEBUG, "LM-PARSER: %s", msg); | |
1568 } | |
1569 else if (log_level & LM_LOG_LEVEL_SASL) { | |
1570 scr_LogPrint(LPRINT_DEBUG, "LM-SASL: %s", msg); | |
1571 } | |
1572 else if (log_level & LM_LOG_LEVEL_SSL) { | |
1573 scr_LogPrint(LPRINT_DEBUG, "LM-SSL: %s", msg); | |
1574 } | |
1575 g_free(msg); | |
1576 } | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1577 } |
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1578 |
1598 | 1579 |
1580 void xmpp_connect(void) | |
31 | 1581 { |
1598 | 1582 const char *username, *password, *resource, *servername, *ssl_fpr; |
1583 char *dynresource = NULL; | |
1584 char fpr[16]; | |
1585 const char *proxy_host; | |
1586 const char *resource_prefix = PACKAGE_NAME; | |
1587 char *fjid; | |
1588 int ssl, tls; | |
1589 LmSSL *lssl; | |
1590 unsigned int port; | |
1591 unsigned int ping; | |
1592 LmMessageHandler *handler; | |
1593 GError *error = NULL; | |
1594 | |
1595 if (lconnection && lm_connection_is_open(lconnection)) | |
1596 xmpp_disconnect(); | |
1597 | |
1598 servername = settings_opt_get("server"); | |
1599 username = settings_opt_get("username"); | |
1600 password = settings_opt_get("password"); | |
1601 resource = settings_opt_get("resource"); | |
1602 proxy_host = settings_opt_get("proxy_host"); | |
1603 ssl_fpr = settings_opt_get("ssl_fingerprint"); | |
1604 | |
1605 if (!servername) { | |
1606 scr_LogPrint(LPRINT_LOGNORM, "Server name has not been specified!"); | |
1607 return; | |
1608 } | |
1609 | |
1610 if (!username) { | |
1611 scr_LogPrint(LPRINT_LOGNORM, "User name has not been specified!"); | |
1612 return; | |
1613 } | |
1614 if (!password) { | |
1615 scr_LogPrint(LPRINT_LOGNORM, "Password has not been specified!"); | |
1616 return; | |
1617 } | |
1618 | |
1619 lconnection = lm_connection_new_with_context | |
1620 (NULL, g_main_loop_get_context(main_loop)); | |
1621 | |
1622 g_log_set_handler("LM", LM_LOG_LEVEL_ALL, lm_debug_handler, NULL); | |
1623 | |
1624 ping = 40; | |
1625 if (settings_opt_get("pinginterval")) | |
1626 ping = (unsigned int) settings_opt_get_int("pinginterval"); | |
1627 lm_connection_set_keep_alive_rate(lconnection, ping); | |
1628 scr_LogPrint(LPRINT_DEBUG, "Ping interval established: %d secs", ping); | |
1629 | |
1630 lm_connection_set_disconnect_function(lconnection, connection_close_cb, | |
1631 NULL, NULL); | |
1632 | |
1633 handler = lm_message_handler_new(handle_messages, NULL, NULL); | |
1634 lm_connection_register_message_handler(lconnection, handler, | |
1635 LM_MESSAGE_TYPE_MESSAGE, | |
1636 LM_HANDLER_PRIORITY_NORMAL); | |
1637 lm_message_handler_unref(handler); | |
1638 | |
1639 handler = lm_message_handler_new(handle_iq, NULL, NULL); | |
1640 lm_connection_register_message_handler(lconnection, handler, | |
1641 LM_MESSAGE_TYPE_IQ, | |
1642 LM_HANDLER_PRIORITY_NORMAL); | |
1643 lm_message_handler_unref(handler); | |
1644 | |
1645 handler = lm_message_handler_new(handle_presence, NULL, NULL); | |
1646 lm_connection_register_message_handler(lconnection, handler, | |
1647 LM_MESSAGE_TYPE_PRESENCE, | |
1648 LM_HANDLER_PRIORITY_LAST); | |
1649 lm_message_handler_unref(handler); | |
1650 | |
1651 handler = lm_message_handler_new(handle_s10n, NULL, NULL); | |
1652 lm_connection_register_message_handler(lconnection, handler, | |
1653 LM_MESSAGE_TYPE_PRESENCE, | |
1654 LM_HANDLER_PRIORITY_NORMAL); | |
1655 lm_message_handler_unref(handler); | |
1656 | |
1657 /* Connect to server */ | |
1658 scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, "Connecting to server: %s", | |
1659 servername); | |
1660 if (!resource) | |
1661 resource = resource_prefix; | |
31 | 1662 |
1598 | 1663 if (!settings_opt_get("disable_random_resource")) { |
1664 #if HAVE_ARC4RANDOM | |
1665 dynresource = g_strdup_printf("%s.%08x", resource, arc4random()); | |
1666 #else | |
1667 unsigned int tab[2]; | |
1668 srand(time(NULL)); | |
1669 tab[0] = (unsigned int) (0xffff * (rand() / (RAND_MAX + 1.0))); | |
1670 tab[1] = (unsigned int) (0xffff * (rand() / (RAND_MAX + 1.0))); | |
1671 dynresource = g_strdup_printf("%s.%04x%04x", resource, tab[0], tab[1]); | |
1672 #endif | |
1673 resource = dynresource; | |
1674 } | |
1675 | |
1676 port = (unsigned int) settings_opt_get_int("port"); | |
1677 | |
1678 if (port) | |
1679 scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, " using port %d", port); | |
1680 scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, " resource %s", resource); | |
1681 | |
1682 if (proxy_host) { | |
1683 int proxy_port = settings_opt_get_int("proxy_port"); | |
1684 if (proxy_port <= 0 || proxy_port > 65535) { | |
1685 scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, "Invalid proxy port: %d", | |
1686 proxy_port); | |
1687 } else { | |
1688 const char *proxy_user, *proxy_pass; | |
1689 LmProxy *lproxy; | |
1690 proxy_user = settings_opt_get("proxy_user"); | |
1691 proxy_pass = settings_opt_get("proxy_pass"); | |
1692 // Proxy initialization | |
1693 lproxy = lm_proxy_new_with_server(LM_PROXY_TYPE_HTTP, | |
1694 proxy_host, proxy_port); | |
1695 lm_proxy_set_username(lproxy, proxy_user); | |
1696 lm_proxy_set_password(lproxy, proxy_pass); | |
1697 lm_connection_set_proxy(lconnection, lproxy); | |
1698 lm_proxy_unref(lproxy); | |
1699 scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, " using proxy %s:%d", | |
1700 proxy_host, proxy_port); | |
1701 } | |
1702 } | |
31 | 1703 |
1598 | 1704 fjid = compose_jid(username, servername, resource); |
1705 lm_connection_set_jid(lconnection, fjid); | |
1706 #if defined(HAVE_LIBOTR) | |
1707 otr_init(fjid); | |
1708 #endif | |
1709 g_free(fjid); | |
1710 g_free(dynresource); | |
1711 | |
1712 ssl = settings_opt_get_int("ssl"); | |
1713 tls = settings_opt_get_int("tls"); | |
1714 | |
1715 if (!lm_ssl_is_supported()) { | |
1716 if (ssl || tls) { | |
1717 scr_LogPrint(LPRINT_LOGNORM, "** Error: SSL is NOT available, " | |
1718 "please recompile loudmouth with SSL enabled."); | |
1719 return; | |
1720 } | |
1721 } | |
1722 | |
1723 if (ssl && tls) { | |
1724 scr_LogPrint(LPRINT_LOGNORM, "You can only set ssl or tls, not both."); | |
1725 return; | |
1726 } | |
1727 | |
1728 if (!port) | |
1729 port = (ssl ? LM_CONNECTION_DEFAULT_PORT_SSL : LM_CONNECTION_DEFAULT_PORT); | |
1730 lm_connection_set_port(lconnection, port); | |
1731 scr_LogPrint(LPRINT_LOGNORM, "Port: %i\n", port); | |
1732 | |
1733 if (ssl_fpr && (!hex_to_fingerprint(ssl_fpr, fpr))) { | |
1734 scr_LogPrint(LPRINT_LOGNORM, "** Plese set the fingerprint in the format " | |
1735 "97:5C:00:3F:1D:77:45:25:E2:C5:70:EC:83:C8:87:EE"); | |
1736 return; | |
1737 } | |
1738 | |
1739 lssl = lm_ssl_new((ssl_fpr ? fpr : NULL), ssl_cb, NULL, NULL); | |
1740 if (lssl) { | |
1741 lm_ssl_use_starttls(lssl, !ssl, tls); | |
1742 lm_connection_set_ssl(lconnection, lssl); | |
1743 lm_ssl_unref(lssl); | |
1744 } else if (ssl || tls) { | |
1745 scr_LogPrint(LPRINT_LOGNORM, "** Error: Couldn't create SSL struct."); | |
671
c5da36fd437a
Do not process packet if type = 0
Mikael Berthe <mikael@lilotux.net>
parents:
668
diff
changeset
|
1746 return; |
c5da36fd437a
Do not process packet if type = 0
Mikael Berthe <mikael@lilotux.net>
parents:
668
diff
changeset
|
1747 } |
c5da36fd437a
Do not process packet if type = 0
Mikael Berthe <mikael@lilotux.net>
parents:
668
diff
changeset
|
1748 |
1598 | 1749 if (!lm_connection_open(lconnection, connection_open_cb, |
1750 NULL, FALSE, &error)) { | |
1751 _try_to_reconnect(); | |
1752 scr_LogPrint(LPRINT_LOGNORM, "Failed to open: %s\n", error->message); | |
1753 } | |
1754 } | |
1755 | |
1756 // insert_entity_capabilities(presence_stanza) | |
1757 // Entity Capabilities (XEP-0115) | |
1600 | 1758 static void insert_entity_capabilities(LmMessageNode *x, enum imstatus status) |
1598 | 1759 { |
1760 LmMessageNode *y; | |
1600 | 1761 const char *ver = entity_version(status); |
1598 | 1762 |
1763 y = lm_message_node_add_child(x, "c", NULL); | |
1764 lm_message_node_set_attribute(y, "xmlns", NS_CAPS); | |
1600 | 1765 lm_message_node_set_attribute(y, "hash", "sha-1"); |
1598 | 1766 lm_message_node_set_attribute(y, "node", MCABBER_CAPS_NODE); |
1767 lm_message_node_set_attribute(y, "ver", ver); | |
1768 } | |
1769 | |
1770 void xmpp_disconnect(void) | |
1771 { | |
1772 if (!lconnection || !lm_connection_is_authenticated(lconnection)) | |
1773 return; | |
1774 | |
1775 // Launch pre-disconnect internal hook | |
1776 hook_execute_internal("hook-pre-disconnect"); | |
1777 // Announce it to everyone else | |
1778 xmpp_setstatus(offline, NULL, "", FALSE); | |
1779 lm_connection_close(lconnection, NULL); | |
1780 } | |
1781 | |
1782 void xmpp_setstatus(enum imstatus st, const char *recipient, const char *msg, | |
1783 int do_not_sign) | |
1784 { | |
1785 LmMessage *m; | |
1786 | |
1787 if (msg) { | |
1788 // The status message has been specified. We'll use it, unless it is | |
1789 // "-" which is a special case (option meaning "no status message"). | |
1790 if (!strcmp(msg, "-")) | |
1791 msg = ""; | |
1792 } else { | |
1793 // No status message specified; we'll use: | |
1794 // a) the default status message (if provided by the user); | |
1795 // b) the current status message; | |
1796 // c) no status message (i.e. an empty one). | |
1797 msg = settings_get_status_msg(st); | |
1798 if (!msg) { | |
1799 if (mystatusmsg) | |
1800 msg = mystatusmsg; | |
1801 else | |
1802 msg = ""; | |
1803 } | |
1804 } | |
1805 | |
1806 // Only send the packet if we're online. | |
1807 // (But we want to update internal status even when disconnected, | |
1808 // in order to avoid some problems during network failures) | |
1809 if (lm_connection_is_authenticated(lconnection)) { | |
1810 const char *s_msg = (st != invisible ? msg : NULL); | |
1811 m = lm_message_new_presence(st, recipient, s_msg); | |
1600 | 1812 insert_entity_capabilities(m->node, st); // Entity Capabilities (XEP-0115) |
1598 | 1813 #ifdef HAVE_GPGME |
1814 if (!do_not_sign && gpg_enabled()) { | |
1815 char *signature; | |
1816 signature = gpg_sign(s_msg ? s_msg : ""); | |
1817 if (signature) { | |
1818 LmMessageNode *y; | |
1819 y = lm_message_node_add_child(m->node, "x", signature); | |
1820 lm_message_node_set_attribute(y, "xmlns", NS_SIGNED); | |
1821 g_free(signature); | |
1822 } | |
1823 } | |
1824 #endif | |
1825 lm_connection_send(lconnection, m, NULL); | |
1826 lm_message_unref(m); | |
1827 } | |
1828 | |
1829 // If we didn't change our _global_ status, we are done | |
1830 if (recipient) return; | |
1831 | |
1832 if (lm_connection_is_authenticated(lconnection)) { | |
1833 // Send presence to chatrooms | |
1834 if (st != invisible) { | |
1835 struct T_presence room_presence; | |
1836 room_presence.st = st; | |
1837 room_presence.msg = msg; | |
1838 foreach_buddy(ROSTER_TYPE_ROOM, &roompresence, &room_presence); | |
1839 } | |
1840 | |
1841 // We'll have to update the roster if we switch to/from offline because | |
1842 // we don't know the presences of buddies when offline... | |
1843 if (mystatus == offline || st == offline) | |
1844 update_roster = TRUE; | |
1845 | |
1846 hk_mystatuschange(0, mystatus, st, (st != invisible ? msg : "")); | |
1847 mystatus = st; | |
1848 } | |
1849 | |
1850 if (st) | |
1851 mywantedstatus = st; | |
1852 | |
1853 if (msg != mystatusmsg) { | |
1854 g_free(mystatusmsg); | |
1855 if (*msg) | |
1856 mystatusmsg = g_strdup(msg); | |
1857 else | |
1858 mystatusmsg = NULL; | |
1859 } | |
1860 | |
1861 if (!Autoaway) | |
1862 update_last_use(); | |
1863 | |
1864 // Update status line | |
1865 scr_UpdateMainStatus(TRUE); | |
1866 } | |
1867 | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1868 |
1598 | 1869 enum imstatus xmpp_getstatus(void) |
1870 { | |
1871 return mystatus; | |
1872 } | |
1873 | |
1874 const char *xmpp_getstatusmsg(void) | |
1875 { | |
1876 return mystatusmsg; | |
1877 } | |
1878 | |
1879 // xmpp_setprevstatus() | |
1880 // Set previous status. This wrapper function is used after a disconnection. | |
1881 void xmpp_setprevstatus(void) | |
1882 { | |
1883 xmpp_setstatus(mywantedstatus, NULL, mystatusmsg, FALSE); | |
1884 } | |
1885 | |
1886 // send_storage(store) | |
1887 // Send the node "store" to update the server. | |
1888 // Note: the sender should check we're online. | |
1889 void send_storage(LmMessageNode *store) | |
1890 { | |
1891 LmMessage *iq; | |
1892 LmMessageNode *query; | |
1893 | |
1894 if (!rosternotes) return; | |
1895 | |
1896 iq = lm_message_new_with_sub_type(NULL, LM_MESSAGE_TYPE_IQ, | |
1897 LM_MESSAGE_SUB_TYPE_SET); | |
1898 query = lm_message_node_add_child(iq->node, "query", NULL); | |
1899 lm_message_node_set_attribute(query, "xmlns", NS_PRIVATE); | |
1900 lm_message_node_insert_childnode(query, store); | |
1901 | |
1902 lm_connection_send(lconnection, iq, NULL); | |
1903 lm_message_unref(iq); | |
1904 } | |
1905 | |
1906 | |
1907 // xmpp_is_bookmarked(roomjid) | |
1908 // Return TRUE if there's a bookmark for the given jid. | |
1909 guint xmpp_is_bookmarked(const char *bjid) | |
1910 { | |
1911 LmMessageNode *x; | |
1912 | |
1913 if (!bookmarks) | |
1914 return FALSE; | |
1915 | |
1916 // Walk through the storage bookmark tags | |
1917 for (x = bookmarks->children ; x; x = x->next) { | |
1918 // If the node is a conference item, check the jid. | |
1919 if (x->name && !strcmp(x->name, "conference")) { | |
1920 const char *fjid = lm_message_node_get_attribute(x, "jid"); | |
1921 if (fjid && !strcasecmp(bjid, fjid)) | |
1922 return TRUE; | |
1923 } | |
1924 } | |
1925 return FALSE; | |
1926 } | |
1927 | |
1928 // xmpp_get_bookmark_nick(roomjid) | |
1929 // Return the room nickname if it is present in a bookmark. | |
1930 const char *xmpp_get_bookmark_nick(const char *bjid) | |
1931 { | |
1932 LmMessageNode *x; | |
1933 | |
1934 if (!bookmarks || !bjid) | |
1935 return NULL; | |
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
1936 |
1598 | 1937 // Walk through the storage bookmark tags |
1938 for (x = bookmarks->children ; x; x = x->next) { | |
1939 // If the node is a conference item, check the jid. | |
1940 if (x->name && !strcmp(x->name, "conference")) { | |
1941 const char *fjid = lm_message_node_get_attribute(x, "jid"); | |
1942 if (fjid && !strcasecmp(bjid, fjid)) | |
1943 return lm_message_node_get_child_value(x, "nick"); | |
1944 } | |
1945 } | |
1946 return NULL; | |
1947 } | |
1948 | |
1949 | |
1950 // xmpp_get_all_storage_bookmarks() | |
1951 // Return a GSList with all storage bookmarks. | |
1952 // The caller should g_free the list (not the MUC jids). | |
1953 GSList *xmpp_get_all_storage_bookmarks(void) | |
1954 { | |
1955 LmMessageNode *x; | |
1956 GSList *sl_bookmarks = NULL; | |
1957 | |
1958 // If we have no bookmarks, probably the server doesn't support them. | |
1959 if (!bookmarks) | |
1960 return NULL; | |
1961 | |
1962 // Walk through the storage bookmark tags | |
1963 for (x = bookmarks->children ; x; x = x->next) { | |
1964 // If the node is a conference item, let's add the note to our list. | |
1965 if (x->name && !strcmp(x->name, "conference")) { | |
1966 struct bookmark *bm_elt; | |
1967 const char *autojoin, *name, *nick; | |
1968 const char *fjid = lm_message_node_get_attribute(x, "jid"); | |
1969 if (!fjid) | |
1970 continue; | |
1971 bm_elt = g_new0(struct bookmark, 1); | |
1972 bm_elt->roomjid = g_strdup(fjid); | |
1973 autojoin = lm_message_node_get_attribute(x, "autojoin"); | |
1974 nick = lm_message_node_get_attribute(x, "nick"); | |
1975 name = lm_message_node_get_attribute(x, "name"); | |
1976 if (autojoin && !strcmp(autojoin, "1")) | |
1977 bm_elt->autojoin = 1; | |
1978 if (nick) | |
1979 bm_elt->nick = g_strdup(nick); | |
1980 if (name) | |
1981 bm_elt->name = g_strdup(name); | |
1982 sl_bookmarks = g_slist_append(sl_bookmarks, bm_elt); | |
1983 } | |
1984 } | |
1985 return sl_bookmarks; | |
1986 } | |
1987 | |
1988 // xmpp_set_storage_bookmark(roomid, name, nick, passwd, autojoin, | |
1989 // printstatus, autowhois) | |
1990 // Update the private storage bookmarks: add a conference room. | |
1991 // If name is nil, we remove the bookmark. | |
1992 void xmpp_set_storage_bookmark(const char *roomid, const char *name, | |
1993 const char *nick, const char *passwd, | |
1994 int autojoin, enum room_printstatus pstatus, | |
1995 enum room_autowhois awhois) | |
1996 { | |
1997 LmMessageNode *x; | |
1998 bool changed = FALSE; | |
1999 | |
2000 if (!roomid) | |
2001 return; | |
2002 | |
2003 // If we have no bookmarks, probably the server doesn't support them. | |
2004 if (!bookmarks) { | |
2005 scr_LogPrint(LPRINT_NORMAL, | |
2006 "Sorry, your server doesn't seem to support private storage."); | |
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
2007 return; |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
2008 } |
31 | 2009 |
1598 | 2010 // Walk through the storage tags |
2011 for (x = bookmarks->children ; x; x = x->next) { | |
2012 // If the current node is a conference item, see if we have to replace it. | |
2013 if (x->name && !strcmp(x->name, "conference")) { | |
2014 const char *fjid = lm_message_node_get_attribute(x, "jid"); | |
2015 if (!fjid) | |
2016 continue; | |
2017 if (!strcmp(fjid, roomid)) { | |
2018 // We've found a bookmark for this room. Let's hide it and we'll | |
2019 // create a new one. | |
2020 lm_message_node_hide(x); | |
2021 changed = TRUE; | |
2022 if (!name) | |
2023 scr_LogPrint(LPRINT_LOGNORM, "Deleting bookmark..."); | |
2024 } | |
2025 } | |
2026 } | |
31 | 2027 |
1598 | 2028 // Let's create a node/bookmark for this roomid, if the name is not NULL. |
2029 if (name) { | |
2030 x = lm_message_node_add_child(bookmarks, "conference", NULL); | |
2031 lm_message_node_set_attributes(x, | |
2032 "jid", roomid, | |
2033 "name", name, | |
2034 "autojoin", autojoin ? "1" : "0", | |
2035 NULL); | |
2036 if (nick) | |
2037 lm_message_node_add_child(x, "nick", nick); | |
2038 if (passwd) | |
2039 lm_message_node_add_child(x, "password", passwd); | |
2040 if (pstatus) | |
2041 lm_message_node_add_child(x, "print_status", strprintstatus[pstatus]); | |
2042 if (awhois) | |
2043 lm_message_node_add_child(x, "autowhois", | |
2044 (awhois == autowhois_on) ? "1" : "0"); | |
2045 changed = TRUE; | |
2046 scr_LogPrint(LPRINT_LOGNORM, "Updating bookmarks..."); | |
2047 } | |
2048 | |
2049 if (!changed) | |
2050 return; | |
31 | 2051 |
1598 | 2052 if (lm_connection_is_authenticated(lconnection)) |
2053 send_storage(bookmarks); | |
2054 else | |
2055 scr_LogPrint(LPRINT_LOGNORM, | |
2056 "Warning: you're not connected to the server."); | |
2057 } | |
2058 | |
2059 static struct annotation *parse_storage_rosternote(LmMessageNode *notenode) | |
2060 { | |
2061 const char *p; | |
2062 struct annotation *note = g_new0(struct annotation, 1); | |
2063 p = lm_message_node_get_attribute(notenode, "cdate"); | |
2064 if (p) | |
2065 note->cdate = from_iso8601(p, 1); | |
2066 p = lm_message_node_get_attribute(notenode, "mdate"); | |
2067 if (p) | |
2068 note->mdate = from_iso8601(p, 1); | |
2069 note->text = g_strdup(lm_message_node_get_value(notenode)); | |
2070 note->jid = g_strdup(lm_message_node_get_attribute(notenode, "jid")); | |
2071 return note; | |
2072 } | |
31 | 2073 |
1598 | 2074 // xmpp_get_all_storage_rosternotes() |
2075 // Return a GSList with all storage annotations. | |
2076 // The caller should g_free the list and its contents. | |
2077 GSList *xmpp_get_all_storage_rosternotes(void) | |
2078 { | |
2079 LmMessageNode *x; | |
2080 GSList *sl_notes = NULL; | |
2081 | |
2082 // If we have no rosternotes, probably the server doesn't support them. | |
2083 if (!rosternotes) | |
2084 return NULL; | |
31 | 2085 |
1598 | 2086 // Walk through the storage rosternotes tags |
2087 for (x = rosternotes->children ; x; x = x->next) { | |
2088 struct annotation *note; | |
2089 | |
2090 // We want a note item | |
2091 if (!x->name || strcmp(x->name, "note")) | |
2092 continue; | |
2093 // Just in case, check the jid... | |
2094 if (!lm_message_node_get_attribute(x, "jid")) | |
2095 continue; | |
2096 // Ok, let's add the note to our list | |
2097 note = parse_storage_rosternote(x); | |
2098 sl_notes = g_slist_append(sl_notes, note); | |
31 | 2099 } |
1598 | 2100 return sl_notes; |
31 | 2101 } |
2102 | |
1598 | 2103 // xmpp_get_storage_rosternotes(barejid, silent) |
2104 // Return the annotation associated with this jid. | |
2105 // If silent is TRUE, no warning is displayed when rosternotes is disabled | |
2106 // The caller should g_free the string and structure after use. | |
2107 struct annotation *xmpp_get_storage_rosternotes(const char *barejid, int silent) | |
2108 { | |
2109 LmMessageNode *x; | |
2110 | |
2111 if (!barejid) | |
2112 return NULL; | |
2113 | |
2114 // If we have no rosternotes, probably the server doesn't support them. | |
2115 if (!rosternotes) { | |
2116 if (!silent) | |
2117 scr_LogPrint(LPRINT_NORMAL, "Sorry, " | |
2118 "your server doesn't seem to support private storage."); | |
2119 return NULL; | |
2120 } | |
2121 | |
2122 // Walk through the storage rosternotes tags | |
2123 for (x = rosternotes->children ; x; x = x->next) { | |
2124 const char *fjid; | |
2125 // We want a note item | |
2126 if (!x->name || strcmp(x->name, "note")) | |
2127 continue; | |
2128 // Just in case, check the jid... | |
2129 fjid = lm_message_node_get_attribute(x, "jid"); | |
2130 if (fjid && !strcmp(fjid, barejid)) // We've found a note for this contact. | |
2131 return parse_storage_rosternote(x); | |
2132 } | |
2133 return NULL; // No note found | |
2134 } | |
2135 | |
2136 // xmpp_set_storage_rosternotes(barejid, note) | |
2137 // Update the private storage rosternotes: add/delete a note. | |
2138 // If note is nil, we remove the existing note. | |
2139 void xmpp_set_storage_rosternotes(const char *barejid, const char *note) | |
2140 { | |
2141 LmMessageNode *x; | |
2142 bool changed = FALSE; | |
2143 const char *cdate = NULL; | |
2144 | |
2145 if (!barejid) | |
2146 return; | |
2147 | |
2148 // If we have no rosternotes, probably the server doesn't support them. | |
2149 if (!rosternotes) { | |
2150 scr_LogPrint(LPRINT_NORMAL, | |
2151 "Sorry, your server doesn't seem to support private storage."); | |
2152 return; | |
2153 } | |
2154 | |
2155 // Walk through the storage tags | |
2156 for (x = rosternotes->children ; x; x = x->next) { | |
2157 // If the current node is a conference item, see if we have to replace it. | |
2158 if (x->name && !strcmp(x->name, "note")) { | |
2159 const char *fjid = lm_message_node_get_attribute(x, "jid"); | |
2160 if (!fjid) | |
2161 continue; | |
2162 if (!strcmp(fjid, barejid)) { | |
2163 // We've found a note for this jid. Let's hide it and we'll | |
2164 // create a new one. | |
2165 cdate = lm_message_node_get_attribute(x, "cdate"); | |
2166 lm_message_node_hide(x); | |
2167 changed = TRUE; | |
2168 break; | |
2169 } | |
2170 } | |
2171 } | |
2172 | |
2173 // Let's create a node for this jid, if the note is not NULL. | |
2174 if (note) { | |
2175 char mdate[20]; | |
2176 time_t now; | |
2177 time(&now); | |
2178 to_iso8601(mdate, now); | |
2179 if (!cdate) | |
2180 cdate = mdate; | |
2181 x = lm_message_node_add_child(rosternotes, "note", note); | |
2182 lm_message_node_set_attributes(x, | |
2183 "jid", barejid, | |
2184 "cdate", cdate, | |
2185 "mdate", mdate, | |
2186 NULL); | |
2187 changed = TRUE; | |
2188 } | |
2189 | |
2190 if (!changed) | |
2191 return; | |
2192 | |
2193 if (lm_connection_is_authenticated(lconnection)) | |
2194 send_storage(rosternotes); | |
2195 else | |
2196 scr_LogPrint(LPRINT_LOGNORM, | |
2197 "Warning: you're not connected to the server."); | |
2198 } | |
1599 | 2199 |
2200 /* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */ |