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