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