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