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