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