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