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