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