author | Mikael Berthe <mikael@lilotux.net> |
Sun, 28 Apr 2013 11:25:13 +0200 | |
changeset 2066 | 69699ba3010f |
parent 2065 | c09fc3834c69 |
child 2067 | 79659eb4f66f |
permissions | -rw-r--r-- |
1599 | 1 |
/* |
2 |
* xmpp_iq.c -- Jabber protocol IQ-related stuff |
|
3 |
* |
|
1729
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1701
diff
changeset
|
4 |
* Copyright (C) 2008-2010 Frank Zschockelt <mcabber@freakysoft.de> |
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1701
diff
changeset
|
5 |
* Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> |
1599 | 6 |
* Parts come from the centericq project: |
7 |
* Copyright (C) 2002-2005 by Konstantin Klyagin <konst@konst.org.ua> |
|
8 |
* Some small parts come from the Pidgin project <http://pidgin.im/> |
|
9 |
* |
|
10 |
* This program is free software; you can redistribute it and/or modify |
|
11 |
* it under the terms of the GNU General Public License as published by |
|
12 |
* the Free Software Foundation; either version 2 of the License, or (at |
|
13 |
* your option) any later version. |
|
14 |
* |
|
15 |
* This program is distributed in the hope that it will be useful, but |
|
16 |
* WITHOUT ANY WARRANTY; without even the implied warranty of |
|
17 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
18 |
* General Public License for more details. |
|
19 |
* |
|
20 |
* You should have received a copy of the GNU General Public License |
|
21 |
* along with this program; if not, write to the Free Software |
|
22 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 |
|
23 |
* USA |
|
24 |
*/ |
|
1598 | 25 |
|
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
26 |
#include <string.h> |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
27 |
#include <sys/utsname.h> |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
28 |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
29 |
#include "xmpp_helper.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
30 |
#include "commands.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
31 |
#include "screen.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
32 |
#include "utils.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
33 |
#include "logprint.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
34 |
#include "settings.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
35 |
#include "caps.h" |
1653
fca9a4c17432
Improve UI latency and CPU usage
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1652
diff
changeset
|
36 |
#include "main.h" |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
37 |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
38 |
extern struct xmpp_error xmpp_errors[]; |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
39 |
|
1598 | 40 |
static LmHandlerResult handle_iq_command_set_status(LmMessageHandler *h, |
41 |
LmConnection *c, |
|
42 |
LmMessage *m, |
|
43 |
gpointer ud); |
|
29 | 44 |
|
1598 | 45 |
static LmHandlerResult handle_iq_command_leave_groupchats(LmMessageHandler *h, |
46 |
LmConnection *c, |
|
47 |
LmMessage *m, |
|
48 |
gpointer ud); |
|
29 | 49 |
|
1598 | 50 |
inline double seconds_since_last_use(void); |
29 | 51 |
|
1598 | 52 |
struct adhoc_command { |
53 |
char *name; |
|
54 |
char *description; |
|
55 |
bool only_for_self; |
|
56 |
LmHandleMessageFunction callback; |
|
1378 | 57 |
}; |
58 |
||
1598 | 59 |
const struct adhoc_command adhoc_command_list[] = { |
60 |
{ "http://jabber.org/protocol/rc#set-status", |
|
61 |
"Change client status", |
|
62 |
1, |
|
63 |
&handle_iq_command_set_status }, |
|
64 |
{ "http://jabber.org/protocol/rc#leave-groupchats", |
|
65 |
"Leave groupchat(s)", |
|
66 |
1, |
|
67 |
&handle_iq_command_leave_groupchats }, |
|
68 |
{ NULL, NULL, 0, NULL }, |
|
69 |
}; |
|
1383 | 70 |
|
1598 | 71 |
struct adhoc_status { |
72 |
char *name; // the name used by adhoc |
|
73 |
char *description; |
|
74 |
char *status; // the string, used by setstus |
|
75 |
}; |
|
76 |
// It has to match imstatus of roster.h! |
|
77 |
const struct adhoc_status adhoc_status_list[] = { |
|
78 |
{"offline", "Offline", "offline"}, |
|
79 |
{"online", "Online", "avail"}, |
|
80 |
{"chat", "Chat", "free"}, |
|
81 |
{"dnd", "Do not disturb", "dnd"}, |
|
82 |
{"xd", "Extended away", "notavail"}, |
|
83 |
{"away", "Away", "away"}, |
|
2002
a0437e179b35
Remove invisible status from remote command form
Hermitifier
parents:
1999
diff
changeset
|
84 |
#ifdef WITH_DEPRECATED_STATUS_INVISIBLE |
1598 | 85 |
{"invisible", "Invisible", "invisible"}, |
2002
a0437e179b35
Remove invisible status from remote command form
Hermitifier
parents:
1999
diff
changeset
|
86 |
#endif |
1598 | 87 |
{NULL, NULL, NULL}, |
88 |
}; |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
89 |
|
1598 | 90 |
static char *generate_session_id(char *prefix) |
29 | 91 |
{ |
1598 | 92 |
char *result; |
93 |
static int counter = 0; |
|
94 |
counter++; |
|
95 |
// TODO better use timestamp? |
|
96 |
result = g_strdup_printf("%s-%i", prefix, counter); |
|
97 |
return result; |
|
29 | 98 |
} |
99 |
||
1598 | 100 |
static LmMessage *lm_message_new_iq_error(LmMessage *m, guint error) |
29 | 101 |
{ |
1598 | 102 |
LmMessage *r; |
103 |
LmMessageNode *err; |
|
104 |
int i; |
|
105 |
||
106 |
for (i = 0; xmpp_errors[i].code; ++i) |
|
107 |
if (xmpp_errors[i].code == error) |
|
108 |
break; |
|
109 |
g_return_val_if_fail(xmpp_errors[i].code > 0, NULL); |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
110 |
|
1598 | 111 |
r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_ERROR); |
112 |
err = lm_message_node_add_child(r->node, "error", NULL); |
|
113 |
lm_message_node_set_attribute(err, "code", xmpp_errors[i].code_str); |
|
114 |
lm_message_node_set_attribute(err, "type", xmpp_errors[i].type); |
|
115 |
lm_message_node_set_attribute |
|
116 |
(lm_message_node_add_child(err, |
|
117 |
xmpp_errors[i].condition, NULL), |
|
118 |
"xmlns", NS_XMPP_STANZAS); |
|
634
f3c05d5fe459
Send "</stream:stream>" when disconnecting from the server
Mikael Berthe <mikael@lilotux.net>
parents:
633
diff
changeset
|
119 |
|
1598 | 120 |
return r; |
436 | 121 |
} |
122 |
||
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
123 |
void send_iq_error(LmConnection *c, LmMessage *m, guint error) |
1001
dff25377c11f
Auto-reconnect after a network/server failure
Mikael Berthe <mikael@lilotux.net>
parents:
999
diff
changeset
|
124 |
{ |
1598 | 125 |
LmMessage *r; |
126 |
r = lm_message_new_iq_error(m, error); |
|
127 |
lm_connection_send(c, r, NULL); |
|
128 |
lm_message_unref(r); |
|
1001
dff25377c11f
Auto-reconnect after a network/server failure
Mikael Berthe <mikael@lilotux.net>
parents:
999
diff
changeset
|
129 |
} |
dff25377c11f
Auto-reconnect after a network/server failure
Mikael Berthe <mikael@lilotux.net>
parents:
999
diff
changeset
|
130 |
|
1598 | 131 |
static void lm_message_node_add_dataform_result(LmMessageNode *node, |
132 |
const char *message) |
|
29 | 133 |
{ |
1598 | 134 |
LmMessageNode *x, *field; |
939
12fa2ae6445d
Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
135 |
|
1598 | 136 |
x = lm_message_node_add_child(node, "x", NULL); |
137 |
lm_message_node_set_attributes(x, |
|
138 |
"type", "result", |
|
139 |
"xmlns", "jabber:x:data", |
|
140 |
NULL); |
|
141 |
field = lm_message_node_add_child(x, "field", NULL); |
|
142 |
lm_message_node_set_attributes(field, |
|
143 |
"type", "text-single", |
|
144 |
"var", "message", |
|
145 |
NULL); |
|
146 |
lm_message_node_add_child(field, "value", message); |
|
147 |
} |
|
1439
fd09c95bc2b5
Wake up less often when not connected to the server
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
148 |
|
1701
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
149 |
// Dummy handler to ignore IQ response |
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
150 |
LmHandlerResult handle_iq_dummy(LmMessageHandler *h, LmConnection *c, |
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
151 |
LmMessage *m, gpointer ud) |
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
152 |
{ |
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
153 |
LmMessageSubType mstype = lm_message_get_sub_type(m); |
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
154 |
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
|
155 |
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
|
156 |
lm_message_get_from(m)); |
1701
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
157 |
} |
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
158 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
159 |
} |
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
160 |
|
1598 | 161 |
static LmHandlerResult handle_iq_commands_list(LmMessageHandler *h, |
162 |
LmConnection *c, |
|
163 |
LmMessage *m, gpointer ud) |
|
164 |
{ |
|
165 |
LmMessage *iq; |
|
166 |
LmMessageNode *query; |
|
167 |
const char *requester_jid; |
|
168 |
const struct adhoc_command *command; |
|
169 |
const char *node; |
|
170 |
gboolean from_self; |
|
940 | 171 |
|
1598 | 172 |
iq = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
173 |
query = lm_message_node_add_child(iq->node, "query", NULL); |
|
1667
8af0e0ad20ad
Fix some more xmlns attributes in IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1666
diff
changeset
|
174 |
lm_message_node_set_attribute(query, "xmlns", NS_COMMANDS); |
1598 | 175 |
node = lm_message_node_get_attribute |
176 |
(lm_message_node_get_child(m->node, "query"), |
|
177 |
"node"); |
|
178 |
if (node) |
|
179 |
lm_message_node_set_attribute(query, "node", node); |
|
29 | 180 |
|
1598 | 181 |
requester_jid = lm_message_get_from(m); |
182 |
from_self = jid_equal(lm_connection_get_jid(c), requester_jid); |
|
686
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
684
diff
changeset
|
183 |
|
1598 | 184 |
for (command = adhoc_command_list ; command->name ; command++) { |
185 |
if (!command->only_for_self || from_self) { |
|
186 |
lm_message_node_set_attributes |
|
187 |
(lm_message_node_add_child(query, "item", NULL), |
|
188 |
"node", command->name, |
|
189 |
"name", command->description, |
|
190 |
"jid", lm_connection_get_jid(c), |
|
191 |
NULL); |
|
29 | 192 |
} |
193 |
} |
|
194 |
||
1598 | 195 |
lm_connection_send(c, iq, NULL); |
196 |
lm_message_unref(iq); |
|
197 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
534 | 198 |
} |
199 |
||
1598 | 200 |
static LmHandlerResult handle_iq_command_set_status(LmMessageHandler *h, |
201 |
LmConnection *c, |
|
202 |
LmMessage *m, gpointer ud) |
|
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
203 |
{ |
1598 | 204 |
const char *action, *node; |
205 |
char *sessionid; |
|
206 |
LmMessage *iq; |
|
207 |
LmMessageNode *command, *x, *y; |
|
208 |
const struct adhoc_status *s; |
|
209 |
||
210 |
x = lm_message_node_get_child(m->node, "command"); |
|
211 |
action = lm_message_node_get_attribute(x, "action"); |
|
212 |
node = lm_message_node_get_attribute(x, "node"); |
|
213 |
sessionid = (char *)lm_message_node_get_attribute(x, "sessionid"); |
|
214 |
||
215 |
iq = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
|
216 |
command = lm_message_node_add_child(iq->node, "command", NULL); |
|
217 |
lm_message_node_set_attribute(command, "node", node); |
|
218 |
lm_message_node_set_attribute(command, "xmlns", NS_COMMANDS); |
|
219 |
||
220 |
if (!sessionid) { |
|
221 |
sessionid = generate_session_id("set-status"); |
|
222 |
lm_message_node_set_attribute(command, "sessionid", sessionid); |
|
223 |
g_free(sessionid); |
|
224 |
sessionid = NULL; |
|
225 |
lm_message_node_set_attribute(command, "status", "executing"); |
|
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
226 |
|
1598 | 227 |
x = lm_message_node_add_child(command, "x", NULL); |
228 |
lm_message_node_set_attribute(x, "type", "form"); |
|
229 |
lm_message_node_set_attribute(x, "xmlns", "jabber:x:data"); |
|
230 |
||
231 |
lm_message_node_add_child(x, "title", "Change Status"); |
|
232 |
||
233 |
lm_message_node_add_child(x, "instructions", |
|
234 |
"Choose the status and status message"); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
235 |
|
1598 | 236 |
// TODO see if factorisation is possible |
237 |
y = lm_message_node_add_child(x, "field", NULL); |
|
238 |
lm_message_node_set_attribute(y, "type", "hidden"); |
|
239 |
lm_message_node_set_attribute(y, "var", "FORM_TYPE"); |
|
240 |
||
241 |
lm_message_node_add_child(y, "value", "http://jabber.org/protocol/rc"); |
|
1055
6eb1efea75d0
PGP: Visual encryption flag
Mikael Berthe <mikael@lilotux.net>
parents:
1053
diff
changeset
|
242 |
|
1598 | 243 |
y = lm_message_node_add_child(x, "field", NULL); |
244 |
lm_message_node_set_attributes(y, |
|
245 |
"type", "list-single", |
|
246 |
"var", "status", |
|
247 |
"label", "Status", |
|
248 |
NULL); |
|
249 |
lm_message_node_add_child(y, "required", NULL); |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
250 |
|
1598 | 251 |
// XXX: ugly |
252 |
lm_message_node_add_child(y, "value", |
|
253 |
adhoc_status_list[xmpp_getstatus()].name); |
|
254 |
for (s = adhoc_status_list; s->name; s++) { |
|
255 |
LmMessageNode *option = lm_message_node_add_child(y, "option", NULL); |
|
256 |
lm_message_node_add_child(option, "value", s->name); |
|
257 |
lm_message_node_set_attribute(option, "label", s->description); |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
258 |
} |
1598 | 259 |
// TODO add priority ? |
260 |
// I do not think this is useful, user should not have to care of the |
|
261 |
// priority like gossip and gajim do (misc) |
|
262 |
lm_message_node_set_attributes |
|
263 |
(lm_message_node_add_child(x, "field", NULL), |
|
264 |
"type", "text-multi", |
|
265 |
"var", "status-message", |
|
266 |
"label", "Message", |
|
267 |
NULL); |
|
268 |
} else if (action && !strcmp(action, "cancel")) { |
|
269 |
lm_message_node_set_attribute(command, "status", "canceled"); |
|
270 |
} else { // (if sessionid and not canceled) |
|
271 |
y = lm_message_node_find_xmlns(x, "jabber:x:data"); //x?xmlns=jabber:x:data |
|
272 |
if (y) { |
|
273 |
const char *value=NULL, *message=NULL; |
|
274 |
LmMessageNode *fields, *field; |
|
275 |
field = fields = lm_message_node_get_child(y, "field"); //field?var=status |
|
276 |
while (field && strcmp("status", |
|
277 |
lm_message_node_get_attribute(field, "var"))) |
|
278 |
field = field->next; |
|
279 |
field = lm_message_node_get_child(field, "value"); |
|
280 |
if (field) |
|
281 |
value = lm_message_node_get_value(field); |
|
282 |
field = fields; //field?var=status-message |
|
283 |
while (field && strcmp("status-message", |
|
284 |
lm_message_node_get_attribute(field, "var"))) |
|
285 |
field = field->next; |
|
286 |
field = lm_message_node_get_child(field, "value"); |
|
287 |
if (field) |
|
288 |
message = lm_message_node_get_value(field); |
|
289 |
if (value) { |
|
290 |
for (s = adhoc_status_list; !s->name || strcmp(s->name, value); s++); |
|
291 |
if (s->name) { |
|
292 |
char *status = g_strdup_printf("%s %s", s->status, |
|
293 |
message ? message : ""); |
|
294 |
cmd_setstatus(NULL, status); |
|
295 |
g_free(status); |
|
296 |
lm_message_node_set_attribute(command, "status", "completed"); |
|
297 |
lm_message_node_add_dataform_result(command, |
|
298 |
"Status has been changed"); |
|
1197 | 299 |
} |
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
300 |
} |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1058
diff
changeset
|
301 |
} |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
302 |
} |
1598 | 303 |
if (sessionid) |
304 |
lm_message_node_set_attribute(command, "sessionid", sessionid); |
|
305 |
lm_connection_send(c, iq, NULL); |
|
306 |
lm_message_unref(iq); |
|
307 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
308 |
} |
|
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
309 |
|
1598 | 310 |
static void _callback_foreach_buddy_groupchat(gpointer rosterdata, void *param) |
311 |
{ |
|
1665
1a4890514eb9
Clean up some dead assignments/dead variables
Ulrich Spörlein
parents:
1653
diff
changeset
|
312 |
LmMessageNode *field, *option; |
1598 | 313 |
const char *room_jid, *nickname; |
314 |
char *desc; |
|
315 |
||
316 |
room_jid = buddy_getjid(rosterdata); |
|
317 |
if (!room_jid) return; |
|
318 |
nickname = buddy_getnickname(rosterdata); |
|
319 |
if (!nickname) return; |
|
320 |
field = param; |
|
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
321 |
|
1598 | 322 |
option = lm_message_node_add_child(field, "option", NULL); |
1665
1a4890514eb9
Clean up some dead assignments/dead variables
Ulrich Spörlein
parents:
1653
diff
changeset
|
323 |
lm_message_node_add_child(option, "value", room_jid); |
1598 | 324 |
desc = g_strdup_printf("%s on %s", nickname, room_jid); |
325 |
lm_message_node_set_attribute(option, "label", desc); |
|
326 |
g_free(desc); |
|
327 |
} |
|
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
328 |
|
1598 | 329 |
static LmHandlerResult handle_iq_command_leave_groupchats(LmMessageHandler *h, |
330 |
LmConnection *c, |
|
331 |
LmMessage *m, |
|
332 |
gpointer ud) |
|
333 |
{ |
|
334 |
const char *action, *node; |
|
335 |
char *sessionid; |
|
336 |
LmMessage *iq; |
|
337 |
LmMessageNode *command, *x; |
|
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
338 |
|
1598 | 339 |
x = lm_message_node_get_child(m->node, "command"); |
340 |
action = lm_message_node_get_attribute(x, "action"); |
|
341 |
node = lm_message_node_get_attribute(x, "node"); |
|
342 |
sessionid = (char*)lm_message_node_get_attribute(x, "sessionid"); |
|
343 |
||
344 |
iq = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
|
345 |
command = lm_message_node_add_child(iq->node, "command", NULL); |
|
346 |
lm_message_node_set_attributes(command, |
|
347 |
"node", node, |
|
348 |
"xmlns", NS_COMMANDS, |
|
349 |
NULL); |
|
350 |
||
351 |
if (!sessionid) { |
|
352 |
LmMessageNode *field; |
|
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
353 |
|
1598 | 354 |
sessionid = generate_session_id("leave-groupchats"); |
355 |
lm_message_node_set_attribute(command, "sessionid", sessionid); |
|
356 |
g_free(sessionid); |
|
357 |
sessionid = NULL; |
|
358 |
lm_message_node_set_attribute(command, "status", "executing"); |
|
359 |
||
360 |
x = lm_message_node_add_child(command, "x", NULL); |
|
361 |
lm_message_node_set_attributes(x, |
|
362 |
"type", "form", |
|
363 |
"xmlns", "jabber:x:data", |
|
364 |
NULL); |
|
365 |
||
366 |
lm_message_node_add_child(x, "title", "Leave groupchat(s)"); |
|
367 |
||
368 |
lm_message_node_add_child(x, "instructions", |
|
369 |
"What groupchats do you want to leave?"); |
|
370 |
||
371 |
field = lm_message_node_add_child(x, "field", NULL); |
|
372 |
lm_message_node_set_attributes(field, |
|
373 |
"type", "hidden", |
|
374 |
"var", "FORM_TYPE", |
|
375 |
NULL); |
|
376 |
||
377 |
lm_message_node_add_child(field, "value", |
|
378 |
"http://jabber.org/protocol/rc"); |
|
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
379 |
|
1598 | 380 |
field = lm_message_node_add_child(x, "field", NULL); |
381 |
lm_message_node_set_attributes(field, |
|
382 |
"type", "list-multi", |
|
383 |
"var", "groupchats", |
|
384 |
"label", "Groupchats: ", |
|
385 |
NULL); |
|
386 |
lm_message_node_add_child(field, "required", NULL); |
|
387 |
||
388 |
foreach_buddy(ROSTER_TYPE_ROOM, &_callback_foreach_buddy_groupchat, field); |
|
1729
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1701
diff
changeset
|
389 |
// TODO: return an error if we are not connected to groupchats |
1598 | 390 |
} else if (action && !strcmp(action, "cancel")) { |
391 |
lm_message_node_set_attribute(command, "status", "canceled"); |
|
392 |
} else { // (if sessionid and not canceled) |
|
1729
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1701
diff
changeset
|
393 |
LmMessageNode *form = lm_message_node_find_xmlns(x, "jabber:x:data");// TODO |
1598 | 394 |
if (form) { |
395 |
LmMessageNode *field; |
|
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
396 |
|
1598 | 397 |
lm_message_node_set_attribute(command, "status", "completed"); |
1729
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1701
diff
changeset
|
398 |
// TODO: implement sth. like "field?var=groupchats" in xmlnode... |
1598 | 399 |
field = lm_message_node_get_child(form, "field"); |
400 |
while (field && strcmp("groupchats", |
|
401 |
lm_message_node_get_attribute(field, "var"))) |
|
402 |
field = field->next; |
|
403 |
||
1652
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
404 |
if (field) |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
405 |
for (x = field->children ; x ; x = x->next) |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
406 |
{ |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
407 |
if (!strcmp (x->name, "value")) { |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
408 |
GList* b = buddy_search_jid(lm_message_node_get_value(x)); |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
409 |
if (b) |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
410 |
cmd_room_leave(b->data, "Requested by remote command"); |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
411 |
} |
1598 | 412 |
} |
413 |
lm_message_node_add_dataform_result(command, |
|
414 |
"Groupchats have been left"); |
|
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
415 |
} |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
416 |
} |
1598 | 417 |
if (sessionid) |
418 |
lm_message_node_set_attribute(command, "sessionid", sessionid); |
|
419 |
lm_connection_send(c, iq, NULL); |
|
420 |
lm_message_unref(iq); |
|
421 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
422 |
} |
|
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
423 |
|
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
424 |
LmHandlerResult handle_iq_commands(LmMessageHandler *h, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
425 |
LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
426 |
LmMessage *m, gpointer ud) |
1598 | 427 |
{ |
428 |
const char *requester_jid = NULL; |
|
429 |
LmMessageNode *cmd; |
|
430 |
const struct adhoc_command *command; |
|
431 |
||
432 |
// mcabber has only partial XEP-0146 support... |
|
433 |
if (LM_MESSAGE_SUB_TYPE_SET != lm_message_get_sub_type(m)) |
|
434 |
return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
|
435 |
||
436 |
requester_jid = lm_message_get_from(m); |
|
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
437 |
|
1598 | 438 |
cmd = lm_message_node_get_child(m->node, "command"); |
439 |
if (jid_equal(lm_connection_get_jid(c), requester_jid)) { |
|
440 |
const char *action, *node; |
|
441 |
action = lm_message_node_get_attribute(cmd, "action"); |
|
442 |
node = lm_message_node_get_attribute(cmd, "node"); |
|
443 |
// action can be NULL, in which case it seems to take the default, |
|
444 |
// ie execute |
|
445 |
if (!action || !strcmp(action, "execute") || !strcmp(action, "cancel") |
|
446 |
|| !strcmp(action, "next") || !strcmp(action, "complete")) { |
|
447 |
for (command = adhoc_command_list; command->name; command++) { |
|
448 |
if (!strcmp(node, command->name)) |
|
449 |
command->callback(h, c, m, ud); |
|
450 |
} |
|
451 |
// "prev" action will get there, as we do not implement it, |
|
452 |
// and do not authorize it |
|
453 |
} else { |
|
454 |
LmMessage *r; |
|
455 |
LmMessageNode *err; |
|
456 |
r = lm_message_new_iq_error(m, XMPP_ERROR_BAD_REQUEST); |
|
457 |
err = lm_message_node_get_child(r->node, "error"); |
|
458 |
lm_message_node_set_attribute |
|
459 |
(lm_message_node_add_child(err, "malformed-action", NULL), |
|
460 |
"xmlns", NS_COMMANDS); |
|
461 |
lm_connection_send(c, r, NULL); |
|
462 |
lm_message_unref(r); |
|
463 |
} |
|
464 |
} else { |
|
465 |
send_iq_error(c, m, XMPP_ERROR_FORBIDDEN); |
|
466 |
} |
|
467 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
35 | 468 |
} |
469 |
||
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
470 |
|
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
471 |
LmHandlerResult handle_iq_disco_items(LmMessageHandler *h, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
472 |
LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
473 |
LmMessage *m, gpointer ud) |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
474 |
{ |
1598 | 475 |
LmMessageNode *query; |
476 |
const char *node; |
|
477 |
query = lm_message_node_get_child(m->node, "query"); |
|
478 |
node = lm_message_node_get_attribute(query, "node"); |
|
479 |
if (node) { |
|
480 |
if (!strcmp(node, NS_COMMANDS)) { |
|
481 |
return handle_iq_commands_list(NULL, c, m, ud); |
|
482 |
} else { |
|
483 |
send_iq_error(c, m, XMPP_ERROR_NOT_IMPLEMENTED); |
|
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
484 |
} |
1598 | 485 |
} else { |
486 |
// not sure about this one |
|
487 |
send_iq_error(c, m, XMPP_ERROR_NOT_IMPLEMENTED); |
|
205 | 488 |
} |
1598 | 489 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
1395
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1385
diff
changeset
|
490 |
} |
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1385
diff
changeset
|
491 |
|
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1385
diff
changeset
|
492 |
|
1600 | 493 |
void _disco_add_feature_helper(gpointer data, gpointer user_data) |
1163
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1161
diff
changeset
|
494 |
{ |
1600 | 495 |
LmMessageNode *node = user_data; |
496 |
lm_message_node_set_attribute |
|
497 |
(lm_message_node_add_child(node, "feature", NULL), "var", data); |
|
1016 | 498 |
} |
499 |
||
1600 | 500 |
// disco_info_set_caps(ansquery, entitycaps) |
501 |
// Add features attributes to ansquery. entitycaps should either be a |
|
502 |
// valid capabilities hash or NULL. If it is NULL, the node attribute won't |
|
503 |
// be added to the query child and Entity Capabilities will be announced |
|
504 |
// as a feature. |
|
1598 | 505 |
// Please change the entity version string if you modify mcabber disco |
506 |
// source code, so that it doesn't conflict with the upstream client. |
|
1600 | 507 |
static void disco_info_set_caps(LmMessageNode *ansquery, |
508 |
const char *entitycaps) |
|
1016 | 509 |
{ |
1600 | 510 |
if (entitycaps) { |
511 |
char *eversion; |
|
512 |
eversion = g_strdup_printf("%s#%s", MCABBER_CAPS_NODE, entitycaps); |
|
513 |
lm_message_node_set_attribute(ansquery, "node", eversion); |
|
514 |
g_free(eversion); |
|
515 |
} |
|
1016 | 516 |
|
1600 | 517 |
lm_message_node_set_attributes |
518 |
(lm_message_node_add_child(ansquery, "identity", NULL), |
|
519 |
"category", "client", |
|
520 |
"name", PACKAGE_STRING, |
|
521 |
"type", "pc", |
|
522 |
NULL); |
|
1016 | 523 |
|
1600 | 524 |
if (entitycaps) |
525 |
caps_foreach_feature(entitycaps, _disco_add_feature_helper, ansquery); |
|
1999
51f032d5ca22
Add support for XEP-0115 Entity Capabilities, with offline cache
Hermitifier
parents:
1919
diff
changeset
|
526 |
else |
1600 | 527 |
caps_foreach_feature(entity_version(xmpp_getstatus()), |
528 |
_disco_add_feature_helper, |
|
529 |
ansquery); |
|
1016 | 530 |
} |
531 |
||
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
532 |
LmHandlerResult handle_iq_disco_info(LmMessageHandler *h, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
533 |
LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
534 |
LmMessage *m, gpointer ud) |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
535 |
{ |
1598 | 536 |
LmMessage *r; |
537 |
LmMessageNode *query, *tmp; |
|
538 |
const char *node = NULL; |
|
1600 | 539 |
const char *param = NULL; |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
540 |
|
1636
e38300775548
Do not reply to disco "result" IQ messages
Mikael Berthe <mikael@lilotux.net>
parents:
1615
diff
changeset
|
541 |
if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_RESULT) |
e38300775548
Do not reply to disco "result" IQ messages
Mikael Berthe <mikael@lilotux.net>
parents:
1615
diff
changeset
|
542 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
e38300775548
Do not reply to disco "result" IQ messages
Mikael Berthe <mikael@lilotux.net>
parents:
1615
diff
changeset
|
543 |
|
1598 | 544 |
r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
545 |
query = lm_message_node_add_child(r->node, "query", NULL); |
|
546 |
lm_message_node_set_attribute(query, "xmlns", NS_DISCO_INFO); |
|
547 |
tmp = lm_message_node_find_child(m->node, "query"); |
|
1600 | 548 |
if (tmp) { |
1598 | 549 |
node = lm_message_node_get_attribute(tmp, "node"); |
1600 | 550 |
param = node+strlen(MCABBER_CAPS_NODE)+1; |
551 |
} |
|
552 |
if (node && startswith(node, MCABBER_CAPS_NODE "#", FALSE)) |
|
553 |
disco_info_set_caps(query, param); // client#version |
|
554 |
else |
|
1598 | 555 |
// Basic discovery request |
1600 | 556 |
disco_info_set_caps(query, NULL); |
1347
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
557 |
|
1598 | 558 |
lm_connection_send(c, r, NULL); |
559 |
lm_message_unref(r); |
|
560 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
624
diff
changeset
|
561 |
} |
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
624
diff
changeset
|
562 |
|
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
563 |
LmHandlerResult handle_iq_roster(LmMessageHandler *h, LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
564 |
LmMessage *m, gpointer ud) |
579
0c67755e0fa7
Introduce a handle_presence_muc() function
Mikael Berthe <mikael@lilotux.net>
parents:
578
diff
changeset
|
565 |
{ |
1598 | 566 |
LmMessageNode *y; |
567 |
const char *fjid, *name, *group, *sub, *ask; |
|
568 |
char *cleanalias; |
|
569 |
enum subscr esub; |
|
570 |
int need_refresh = FALSE; |
|
571 |
guint roster_type; |
|
581
ad07c868ff43
Tell the user when he or she has been kicked/banned
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
572 |
|
1701
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
573 |
y = lm_message_node_find_child(lm_message_node_find_xmlns(m->node, NS_ROSTER), |
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
574 |
"item"); |
44e023ad99ed
Add dummy handler for roster manipulation IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1668
diff
changeset
|
575 |
for ( ; y; y = y->next) { |
1598 | 576 |
char *name_tmp = NULL; |
864
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
577 |
|
1598 | 578 |
fjid = lm_message_node_get_attribute(y, "jid"); |
579 |
name = lm_message_node_get_attribute(y, "name"); |
|
580 |
sub = lm_message_node_get_attribute(y, "subscription"); |
|
581 |
ask = lm_message_node_get_attribute(y, "ask"); |
|
581
ad07c868ff43
Tell the user when he or she has been kicked/banned
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
582 |
|
1598 | 583 |
if (lm_message_node_find_child(y, "group")) |
584 |
group = lm_message_node_get_value(lm_message_node_find_child(y, "group")); |
|
585 |
else |
|
586 |
group = NULL; |
|
1396
8f9928839a36
Automatically unlock new rooms (suggested by Michael Weiser)
Mikael Berthe <mikael@lilotux.net>
parents:
1395
diff
changeset
|
587 |
|
1598 | 588 |
if (!fjid) |
589 |
continue; |
|
590 |
||
591 |
cleanalias = jidtodisp(fjid); |
|
579
0c67755e0fa7
Introduce a handle_presence_muc() function
Mikael Berthe <mikael@lilotux.net>
parents:
578
diff
changeset
|
592 |
|
1598 | 593 |
esub = sub_none; |
594 |
if (sub) { |
|
595 |
if (!strcmp(sub, "to")) esub = sub_to; |
|
596 |
else if (!strcmp(sub, "from")) esub = sub_from; |
|
597 |
else if (!strcmp(sub, "both")) esub = sub_both; |
|
598 |
else if (!strcmp(sub, "remove")) esub = sub_remove; |
|
583
32ae027a3238
MUC: clean up departure message code
Mikael Berthe <mikael@lilotux.net>
parents:
581
diff
changeset
|
599 |
} |
581
ad07c868ff43
Tell the user when he or she has been kicked/banned
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
600 |
|
1598 | 601 |
if (esub == sub_remove) { |
602 |
roster_del_user(cleanalias); |
|
603 |
scr_LogPrint(LPRINT_LOGNORM, "Buddy <%s> has been removed " |
|
604 |
"from the roster", cleanalias); |
|
605 |
g_free(cleanalias); |
|
606 |
need_refresh = TRUE; |
|
607 |
continue; |
|
608 |
} |
|
583
32ae027a3238
MUC: clean up departure message code
Mikael Berthe <mikael@lilotux.net>
parents:
581
diff
changeset
|
609 |
|
1598 | 610 |
if (ask && !strcmp(ask, "subscribe")) |
611 |
esub |= sub_pending; |
|
612 |
||
613 |
if (!name) { |
|
614 |
if (!settings_opt_get_int("roster_hide_domain")) { |
|
615 |
name = cleanalias; |
|
583
32ae027a3238
MUC: clean up departure message code
Mikael Berthe <mikael@lilotux.net>
parents:
581
diff
changeset
|
616 |
} else { |
1598 | 617 |
char *p; |
618 |
name = name_tmp = g_strdup(cleanalias); |
|
619 |
p = strchr(name_tmp, JID_DOMAIN_SEPARATOR); |
|
620 |
if (p) *p = '\0'; |
|
581
ad07c868ff43
Tell the user when he or she has been kicked/banned
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
621 |
} |
583
32ae027a3238
MUC: clean up departure message code
Mikael Berthe <mikael@lilotux.net>
parents:
581
diff
changeset
|
622 |
} |
32ae027a3238
MUC: clean up departure message code
Mikael Berthe <mikael@lilotux.net>
parents:
581
diff
changeset
|
623 |
|
1598 | 624 |
// Tricky... :-\ My guess is that if there is no JID_DOMAIN_SEPARATOR, |
625 |
// this is an agent. |
|
626 |
if (strchr(cleanalias, JID_DOMAIN_SEPARATOR)) |
|
627 |
roster_type = ROSTER_TYPE_USER; |
|
628 |
else |
|
629 |
roster_type = ROSTER_TYPE_AGENT; |
|
1377
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
630 |
|
1598 | 631 |
roster_add_user(cleanalias, name, group, roster_type, esub, 1); |
579
0c67755e0fa7
Introduce a handle_presence_muc() function
Mikael Berthe <mikael@lilotux.net>
parents:
578
diff
changeset
|
632 |
|
1598 | 633 |
g_free(name_tmp); |
634 |
g_free(cleanalias); |
|
1446
49c8be874344
Add option 'ignore_self_presence'
Mikael Berthe <mikael@lilotux.net>
parents:
1439
diff
changeset
|
635 |
} |
49c8be874344
Add option 'ignore_self_presence'
Mikael Berthe <mikael@lilotux.net>
parents:
1439
diff
changeset
|
636 |
|
1919
fba12c1f6386
Send a result message when we receive a roster push
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
637 |
// Acknowledge IQ message |
fba12c1f6386
Send a result message when we receive a roster push
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
638 |
if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_SET) { |
fba12c1f6386
Send a result message when we receive a roster push
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
639 |
LmMessage *result; |
fba12c1f6386
Send a result message when we receive a roster push
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
640 |
result = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
fba12c1f6386
Send a result message when we receive a roster push
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
641 |
lm_connection_send(c, result, NULL); |
fba12c1f6386
Send a result message when we receive a roster push
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
642 |
lm_message_unref(result); |
fba12c1f6386
Send a result message when we receive a roster push
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
643 |
} |
fba12c1f6386
Send a result message when we receive a roster push
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
644 |
|
1598 | 645 |
buddylist_build(); |
646 |
update_roster = TRUE; |
|
647 |
if (need_refresh) |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
648 |
scr_update_buddy_window(); |
1598 | 649 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
650 |
} |
|
644
68fb0c1dfb15
MUC: better nickname check when entering a room
Mikael Berthe <mikael@lilotux.net>
parents:
643
diff
changeset
|
651 |
|
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
652 |
LmHandlerResult handle_iq_ping(LmMessageHandler *h, LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
653 |
LmMessage *m, gpointer ud) |
1598 | 654 |
{ |
655 |
LmMessage *r; |
|
644
68fb0c1dfb15
MUC: better nickname check when entering a room
Mikael Berthe <mikael@lilotux.net>
parents:
643
diff
changeset
|
656 |
|
1598 | 657 |
r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
658 |
lm_connection_send(c, r, NULL); |
|
659 |
lm_message_unref(r); |
|
660 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
661 |
} |
|
662 |
||
663 |
double seconds_since_last_use(void) |
|
664 |
{ |
|
665 |
return difftime(time(NULL), iqlast); |
|
666 |
} |
|
644
68fb0c1dfb15
MUC: better nickname check when entering a room
Mikael Berthe <mikael@lilotux.net>
parents:
643
diff
changeset
|
667 |
|
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
668 |
LmHandlerResult handle_iq_last(LmMessageHandler *h, LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
669 |
LmMessage *m, gpointer ud) |
1598 | 670 |
{ |
671 |
LmMessage *r; |
|
672 |
LmMessageNode *query; |
|
673 |
char *seconds; |
|
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
674 |
|
1598 | 675 |
if (!settings_opt_get_int("iq_hide_requests")) { |
676 |
scr_LogPrint(LPRINT_LOGNORM, "Received an IQ last time request from <%s>", |
|
677 |
lm_message_get_from(m)); |
|
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
678 |
} |
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
679 |
|
1598 | 680 |
if (settings_opt_get_int("iq_last_disable") || |
681 |
(settings_opt_get_int("iq_last_disable_when_notavail") && |
|
682 |
xmpp_getstatus() == notavail)) |
|
683 |
{ |
|
684 |
send_iq_error(c, m, XMPP_ERROR_SERVICE_UNAVAILABLE); |
|
685 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
686 |
} |
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
687 |
|
1598 | 688 |
r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
689 |
query = lm_message_node_add_child(r->node, "query", NULL); |
|
1667
8af0e0ad20ad
Fix some more xmlns attributes in IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1666
diff
changeset
|
690 |
lm_message_node_set_attribute(query, "xmlns", NS_LAST); |
1598 | 691 |
seconds = g_strdup_printf("%.0f", seconds_since_last_use()); |
692 |
lm_message_node_set_attribute(query, "seconds", seconds); |
|
693 |
g_free(seconds); |
|
1236
f7b35b1c343d
Fix a roster bug when receiving a MUC invitation
Mikael Berthe <mikael@lilotux.net>
parents:
1215
diff
changeset
|
694 |
|
1598 | 695 |
lm_connection_send(c, r, NULL); |
696 |
lm_message_unref(r); |
|
697 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
1128 | 698 |
} |
699 |
||
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
700 |
LmHandlerResult handle_iq_version(LmMessageHandler *h, LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
701 |
LmMessage *m, gpointer ud) |
1128 | 702 |
{ |
1598 | 703 |
LmMessage *r; |
704 |
LmMessageNode *query; |
|
1128 | 705 |
|
1598 | 706 |
if (!settings_opt_get_int("iq_hide_requests")) { |
707 |
scr_LogPrint(LPRINT_LOGNORM, "Received an IQ version request from <%s>", |
|
708 |
lm_message_get_from(m)); |
|
709 |
} |
|
2066
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
710 |
|
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
711 |
if (settings_opt_get_int("iq_version_hide")) { |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
712 |
send_iq_error(c, m, XMPP_ERROR_SERVICE_UNAVAILABLE); |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
713 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
1128 | 714 |
} |
1598 | 715 |
|
716 |
r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
|
717 |
||
718 |
query = lm_message_node_add_child(r->node, "query", NULL); |
|
1666
68c57f52d05a
Fix iq version reply (issue #42, patch from foxfell)
Mikael Berthe <mikael@lilotux.net>
parents:
1665
diff
changeset
|
719 |
lm_message_node_set_attribute(query, "xmlns", NS_VERSION); |
1598 | 720 |
|
721 |
lm_message_node_add_child(query, "name", PACKAGE_NAME); |
|
2066
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
722 |
|
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
723 |
// MCabber version |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
724 |
if (!settings_opt_get_int("iq_version_hide_version")) { |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
725 |
char *ver = mcabber_version(); |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
726 |
lm_message_node_add_child(query, "version", ver); |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
727 |
g_free(ver); |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
728 |
} |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
729 |
|
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
730 |
// OS details |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
731 |
if (!settings_opt_get_int("iq_version_hide_os")) { |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
732 |
char *os; |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
733 |
struct utsname osinfo; |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
734 |
uname(&osinfo); |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
735 |
os = g_strdup_printf("%s %s %s", osinfo.sysname, osinfo.release, |
69699ba3010f
Add 'iq_version_hide', 'iq_version_hide_version'
Mikael Berthe <mikael@lilotux.net>
parents:
2065
diff
changeset
|
736 |
osinfo.machine); |
1598 | 737 |
lm_message_node_add_child(query, "os", os); |
738 |
g_free(os); |
|
739 |
} |
|
740 |
||
741 |
lm_connection_send(c, r, NULL); |
|
742 |
lm_message_unref(r); |
|
743 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
1128 | 744 |
} |
745 |
||
1598 | 746 |
// This function borrows some code from the Pidgin project |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
747 |
LmHandlerResult handle_iq_time(LmMessageHandler *h, LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
748 |
LmMessage *m, gpointer ud) |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
749 |
{ |
1598 | 750 |
LmMessage *r; |
751 |
LmMessageNode *query; |
|
752 |
char *buf, *utf8_buf; |
|
753 |
time_t now_t; |
|
754 |
struct tm *now; |
|
1528
4b4b3948420c
MUC fix: the topic couldn't be cleared
Mikael Berthe <mikael@lilotux.net>
parents:
1525
diff
changeset
|
755 |
|
1598 | 756 |
time(&now_t); |
757 |
||
758 |
if (!settings_opt_get_int("iq_hide_requests")) { |
|
759 |
scr_LogPrint(LPRINT_LOGNORM, "Received an IQ time request from <%s>", |
|
760 |
lm_message_get_from(m)); |
|
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
761 |
} |
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
762 |
|
2065
c09fc3834c69
Add option 'iq_version_hide_time'
Mikael Berthe <mikael@lilotux.net>
parents:
2002
diff
changeset
|
763 |
if (settings_opt_get_int("iq_version_hide_time")) { |
c09fc3834c69
Add option 'iq_version_hide_time'
Mikael Berthe <mikael@lilotux.net>
parents:
2002
diff
changeset
|
764 |
send_iq_error(c, m, XMPP_ERROR_SERVICE_UNAVAILABLE); |
c09fc3834c69
Add option 'iq_version_hide_time'
Mikael Berthe <mikael@lilotux.net>
parents:
2002
diff
changeset
|
765 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
c09fc3834c69
Add option 'iq_version_hide_time'
Mikael Berthe <mikael@lilotux.net>
parents:
2002
diff
changeset
|
766 |
} |
c09fc3834c69
Add option 'iq_version_hide_time'
Mikael Berthe <mikael@lilotux.net>
parents:
2002
diff
changeset
|
767 |
|
1598 | 768 |
buf = g_new0(char, 512); |
769 |
||
770 |
r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
|
771 |
query = lm_message_node_add_child(r->node, "query", NULL); |
|
1667
8af0e0ad20ad
Fix some more xmlns attributes in IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1666
diff
changeset
|
772 |
lm_message_node_set_attribute(query, "xmlns", NS_TIME); |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
773 |
|
1598 | 774 |
now = gmtime(&now_t); |
1128 | 775 |
|
1598 | 776 |
strftime(buf, 512, "%Y%m%dT%T", now); |
777 |
lm_message_node_add_child(query, "utc", buf); |
|
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
778 |
|
1598 | 779 |
now = localtime(&now_t); |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
780 |
|
1598 | 781 |
strftime(buf, 512, "%Z", now); |
782 |
if ((utf8_buf = to_utf8(buf))) { |
|
783 |
lm_message_node_add_child(query, "tz", utf8_buf); |
|
784 |
g_free(utf8_buf); |
|
785 |
} |
|
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
786 |
|
1598 | 787 |
strftime(buf, 512, "%d %b %Y %T", now); |
788 |
if ((utf8_buf = to_utf8(buf))) { |
|
789 |
lm_message_node_add_child(query, "display", utf8_buf); |
|
790 |
g_free(utf8_buf); |
|
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
791 |
} |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
792 |
|
1598 | 793 |
lm_connection_send(c, r, NULL); |
794 |
lm_message_unref(r); |
|
795 |
g_free(buf); |
|
796 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
797 |
} |
|
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
798 |
|
1598 | 799 |
// This function borrows some code from the Pidgin project |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
800 |
LmHandlerResult handle_iq_time202(LmMessageHandler *h, LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
801 |
LmMessage *m, gpointer ud) |
1598 | 802 |
{ |
803 |
LmMessage *r; |
|
804 |
LmMessageNode *query; |
|
805 |
char *buf, *utf8_buf; |
|
806 |
time_t now_t; |
|
807 |
struct tm *now; |
|
808 |
char const *sign; |
|
809 |
int diff = 0; |
|
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
810 |
|
1598 | 811 |
time(&now_t); |
812 |
||
813 |
if (!settings_opt_get_int("iq_hide_requests")) { |
|
814 |
scr_LogPrint(LPRINT_LOGNORM, "Received an IQ time request from <%s>", |
|
815 |
lm_message_get_from(m)); |
|
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
816 |
} |
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
817 |
|
2065
c09fc3834c69
Add option 'iq_version_hide_time'
Mikael Berthe <mikael@lilotux.net>
parents:
2002
diff
changeset
|
818 |
if (settings_opt_get_int("iq_version_hide_time")) { |
c09fc3834c69
Add option 'iq_version_hide_time'
Mikael Berthe <mikael@lilotux.net>
parents:
2002
diff
changeset
|
819 |
send_iq_error(c, m, XMPP_ERROR_SERVICE_UNAVAILABLE); |
c09fc3834c69
Add option 'iq_version_hide_time'
Mikael Berthe <mikael@lilotux.net>
parents:
2002
diff
changeset
|
820 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
c09fc3834c69
Add option 'iq_version_hide_time'
Mikael Berthe <mikael@lilotux.net>
parents:
2002
diff
changeset
|
821 |
} |
c09fc3834c69
Add option 'iq_version_hide_time'
Mikael Berthe <mikael@lilotux.net>
parents:
2002
diff
changeset
|
822 |
|
1598 | 823 |
buf = g_new0(char, 512); |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
824 |
|
1598 | 825 |
r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
826 |
query = lm_message_node_add_child(r->node, "time", NULL); |
|
827 |
lm_message_node_set_attribute(query, "xmlns", NS_XMPP_TIME); |
|
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
828 |
|
1598 | 829 |
now = localtime(&now_t); |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
830 |
|
1598 | 831 |
if (now->tm_isdst >= 0) { |
832 |
#if defined HAVE_TM_GMTOFF |
|
833 |
diff = now->tm_gmtoff; |
|
834 |
#elif defined HAVE_TIMEZONE |
|
835 |
tzset(); |
|
836 |
diff = -timezone; |
|
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
837 |
#endif |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
838 |
} |
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
839 |
|
1598 | 840 |
if (diff < 0) { |
841 |
sign = "-"; |
|
842 |
diff = -diff; |
|
749
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
843 |
} else { |
1598 | 844 |
sign = "+"; |
749
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
845 |
} |
1598 | 846 |
diff /= 60; |
847 |
snprintf(buf, 512, "%c%02d:%02d", *sign, diff / 60, diff % 60); |
|
848 |
if ((utf8_buf = to_utf8(buf))) { |
|
849 |
lm_message_node_add_child(query, "tzo", utf8_buf); |
|
850 |
g_free(utf8_buf); |
|
1128 | 851 |
} |
852 |
||
1598 | 853 |
now = gmtime(&now_t); |
818
55cd45481a07
Fix a buddylist bug when receiving a subscription request
Mikael Berthe <mikael@lilotux.net>
parents:
793
diff
changeset
|
854 |
|
1598 | 855 |
strftime(buf, 512, "%Y-%m-%dT%TZ", now); |
856 |
lm_message_node_add_child(query, "utc", buf); |
|
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
857 |
|
1598 | 858 |
lm_connection_send(c, r, NULL); |
859 |
lm_message_unref(r); |
|
860 |
g_free(buf); |
|
861 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
862 |
} |
1599 | 863 |
|
1615
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
864 |
LmHandlerResult handle_iq_vcard(LmMessageHandler *h, LmConnection *c, |
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
865 |
LmMessage *m, gpointer ud) |
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
866 |
{ |
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
867 |
send_iq_error(c, m, XMPP_ERROR_SERVICE_UNAVAILABLE); |
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
868 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
869 |
} |
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
870 |
|
1811 | 871 |
/* vim: set et cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */ |