author | Mikael Berthe <mikael@lilotux.net> |
Thu, 15 Sep 2005 23:22:12 +0200 | |
changeset 436 | 802da817a684 |
parent 430 | d03663d2e7d9 |
child 438 | b44be19d6229 |
permissions | -rw-r--r-- |
29 | 1 |
/* |
2 |
* jabglue.c -- Jabber protocol handling |
|
393 | 3 |
* |
29 | 4 |
* Copyright (C) 2005 Mikael Berthe <bmikael@lists.lilotux.net> |
5 |
* Parts come from the centericq project: |
|
6 |
* Copyright (C) 2002-2005 by Konstantin Klyagin <konst@konst.org.ua> |
|
7 |
* |
|
8 |
* This program is free software; you can redistribute it and/or modify |
|
9 |
* it under the terms of the GNU General Public License as published by |
|
10 |
* the Free Software Foundation; either version 2 of the License, or (at |
|
11 |
* your option) any later version. |
|
12 |
* |
|
13 |
* This program is distributed in the hope that it will be useful, but |
|
14 |
* WITHOUT ANY WARRANTY; without even the implied warranty of |
|
15 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
16 |
* General Public License for more details. |
|
17 |
* |
|
18 |
* You should have received a copy of the GNU General Public License |
|
19 |
* along with this program; if not, write to the Free Software |
|
20 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 |
|
21 |
* USA |
|
22 |
*/ |
|
23 |
||
237 | 24 |
#define _GNU_SOURCE /* We need glibc for strptime */ |
29 | 25 |
#include "../libjabber/jabber.h" |
26 |
#include "jabglue.h" |
|
81 | 27 |
#include "roster.h" |
29 | 28 |
#include "screen.h" |
113 | 29 |
#include "hooks.h" |
29 | 30 |
#include "utils.h" |
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
31 |
#include "settings.h" |
29 | 32 |
|
33 |
#define JABBERPORT 5222 |
|
34 |
#define JABBERSSLPORT 5223 |
|
35 |
||
194 | 36 |
#define JABBER_AGENT_GROUP "Jabber Agents" |
37 |
||
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
38 |
#define to_utf8(s) ((s) ? g_locale_to_utf8((s), -1, NULL,NULL,NULL) : NULL) |
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
39 |
#define from_utf8(s) ((s) ? g_locale_from_utf8((s), -1, NULL,NULL,NULL) : NULL) |
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
40 |
|
29 | 41 |
jconn jc; |
311
1d6b16d9c577
Make some global variables static
Mikael Berthe <mikael@lilotux.net>
parents:
300
diff
changeset
|
42 |
static time_t LastPingTime; |
1d6b16d9c577
Make some global variables static
Mikael Berthe <mikael@lilotux.net>
parents:
300
diff
changeset
|
43 |
static unsigned int KeepaliveDelay; |
272 | 44 |
static unsigned int prio; |
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
45 |
static int s_id; |
31 | 46 |
static int regmode, regdone; |
116 | 47 |
static enum imstatus mystatus = offline; |
112 | 48 |
unsigned char online; |
29 | 49 |
|
353
3fe43f6daa5a
Make imstatus2char a null-terminated string
Mikael Berthe <mikael@lilotux.net>
parents:
325
diff
changeset
|
50 |
char imstatus2char[imstatus_size+1] = { |
3fe43f6daa5a
Make imstatus2char a null-terminated string
Mikael Berthe <mikael@lilotux.net>
parents:
325
diff
changeset
|
51 |
'_', 'o', 'i', 'f', 'd', 'n', 'a', '\0' |
46 | 52 |
}; |
53 |
||
31 | 54 |
static enum { |
29 | 55 |
STATE_CONNECTING, |
56 |
STATE_GETAUTH, |
|
57 |
STATE_SENDAUTH, |
|
58 |
STATE_LOGGED |
|
59 |
} jstate; |
|
60 |
||
61 |
||
31 | 62 |
void statehandler(jconn, int); |
63 |
void packethandler(jconn, jpacket); |
|
64 |
||
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
65 |
static void logger(jconn j, int io, const char *buf) |
31 | 66 |
{ |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
67 |
scr_LogPrint(LPRINT_DEBUG, "%03s: %s", ((io == 0) ? "OUT" : "IN"), buf); |
31 | 68 |
} |
69 |
||
113 | 70 |
/* |
29 | 71 |
static void jidsplit(const char *jid, char **user, char **host, |
72 |
char **res) |
|
73 |
{ |
|
74 |
char *tmp, *ptr; |
|
75 |
tmp = strdup(jid); |
|
76 |
||
77 |
if ((ptr = strchr(tmp, '/')) != NULL) { |
|
78 |
*res = strdup(ptr+1); |
|
79 |
*ptr = 0; |
|
80 |
} else |
|
81 |
*res = NULL; |
|
82 |
||
83 |
if ((ptr = strchr(tmp, '@')) != NULL) { |
|
84 |
*host = strdup(ptr+1); |
|
85 |
*ptr = 0; |
|
86 |
} else |
|
87 |
*host = NULL; |
|
88 |
||
89 |
*user = strdup(tmp); |
|
90 |
free(tmp); |
|
91 |
} |
|
113 | 92 |
*/ |
29 | 93 |
|
192 | 94 |
// jidtodisp(jid) |
95 |
// Strips the resource part from the jid |
|
96 |
// The caller should g_free the result after use. |
|
29 | 97 |
char *jidtodisp(const char *jid) |
98 |
{ |
|
99 |
char *ptr; |
|
165 | 100 |
char *alias; |
101 |
||
102 |
while ((alias = g_strdup(jid)) == NULL) |
|
419 | 103 |
safe_usleep(100); |
165 | 104 |
|
29 | 105 |
if ((ptr = strchr(alias, '/')) != NULL) { |
106 |
*ptr = 0; |
|
107 |
} |
|
108 |
return alias; |
|
109 |
} |
|
110 |
||
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
111 |
char *compose_jid(const char *username, const char *servername, |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
112 |
const char *resource) |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
113 |
{ |
393 | 114 |
char *jid = g_new(char, 3 + |
115 |
strlen(username) + strlen(servername) + strlen(resource)); |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
116 |
strcpy(jid, username); |
403
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
393
diff
changeset
|
117 |
if (!strchr(jid, '@')) { |
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
393
diff
changeset
|
118 |
strcat(jid, "@"); |
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
393
diff
changeset
|
119 |
strcat(jid, servername); |
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
393
diff
changeset
|
120 |
} |
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
121 |
strcat(jid, "/"); |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
122 |
strcat(jid, resource); |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
123 |
return jid; |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
124 |
} |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
125 |
|
403
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
393
diff
changeset
|
126 |
jconn jb_connect(const char *jid, const char *server, unsigned int port, |
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
393
diff
changeset
|
127 |
int ssl, const char *pass) |
29 | 128 |
{ |
129 |
if (!port) { |
|
130 |
if (ssl) |
|
131 |
port = JABBERSSLPORT; |
|
132 |
else |
|
133 |
port = JABBERPORT; |
|
134 |
} |
|
135 |
||
357
e8adc3c96e68
Better messages for server connection states
Mikael Berthe <mikael@lilotux.net>
parents:
353
diff
changeset
|
136 |
jb_disconnect(); |
29 | 137 |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
138 |
s_id = 1; |
403
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
393
diff
changeset
|
139 |
jc = jab_new((char*)jid, (char*)pass, (char*)server, port, ssl); |
29 | 140 |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
141 |
/* These 3 functions can deal with a NULL jc, no worry... */ |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
142 |
jab_logger(jc, logger); |
29 | 143 |
jab_packet_handler(jc, &packethandler); |
144 |
jab_state_handler(jc, &statehandler); |
|
145 |
||
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
146 |
if (jc && jc->user) { |
112 | 147 |
online = TRUE; |
29 | 148 |
jstate = STATE_CONNECTING; |
149 |
statehandler(0, -1); |
|
150 |
jab_start(jc); |
|
151 |
} |
|
152 |
||
153 |
return jc; |
|
154 |
} |
|
155 |
||
156 |
void jb_disconnect(void) |
|
157 |
{ |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
158 |
if (!jc) return; |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
159 |
|
416
48e7808c4191
Allow offline status message
Mikael Berthe <mikael@lilotux.net>
parents:
411
diff
changeset
|
160 |
// announce it to everyone else |
48e7808c4191
Allow offline status message
Mikael Berthe <mikael@lilotux.net>
parents:
411
diff
changeset
|
161 |
jb_setstatus(offline, ""); |
48e7808c4191
Allow offline status message
Mikael Berthe <mikael@lilotux.net>
parents:
411
diff
changeset
|
162 |
|
48e7808c4191
Allow offline status message
Mikael Berthe <mikael@lilotux.net>
parents:
411
diff
changeset
|
163 |
// announce it to the user |
29 | 164 |
statehandler(jc, JCONN_STATE_OFF); |
416
48e7808c4191
Allow offline status message
Mikael Berthe <mikael@lilotux.net>
parents:
411
diff
changeset
|
165 |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
166 |
jab_delete(jc); |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
167 |
//free(jc); XXX |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
168 |
jc = NULL; |
29 | 169 |
} |
170 |
||
112 | 171 |
inline void jb_reset_keepalive() |
172 |
{ |
|
173 |
time(&LastPingTime); |
|
174 |
} |
|
175 |
||
436 | 176 |
void jb_send_raw(const char *str) |
177 |
{ |
|
178 |
if (jc && online) |
|
179 |
jab_send_raw(jc, str); |
|
180 |
} |
|
181 |
||
29 | 182 |
void jb_keepalive() |
183 |
{ |
|
113 | 184 |
if (jc && online) |
112 | 185 |
jab_send_raw(jc, " \t "); |
186 |
jb_reset_keepalive(); |
|
187 |
} |
|
188 |
||
189 |
void jb_set_keepalive_delay(unsigned int delay) |
|
190 |
{ |
|
191 |
KeepaliveDelay = delay; |
|
29 | 192 |
} |
193 |
||
272 | 194 |
inline void jb_set_priority(unsigned int priority) |
195 |
{ |
|
196 |
prio = priority; |
|
197 |
} |
|
198 |
||
29 | 199 |
void jb_main() |
200 |
{ |
|
201 |
xmlnode x, z; |
|
202 |
char *cid; |
|
203 |
||
406 | 204 |
if (!online) { |
419 | 205 |
safe_usleep(10000); |
406 | 206 |
return; |
207 |
} |
|
164 | 208 |
|
29 | 209 |
if (jc && jc->state == JCONN_STATE_CONNECTING) { |
419 | 210 |
safe_usleep(75000); |
29 | 211 |
jab_start(jc); |
212 |
return; |
|
213 |
} |
|
214 |
||
31 | 215 |
jab_poll(jc, 50); |
29 | 216 |
|
217 |
if (jstate == STATE_CONNECTING) { |
|
218 |
if (jc) { |
|
219 |
x = jutil_iqnew(JPACKET__GET, NS_AUTH); |
|
220 |
cid = jab_getid(jc); |
|
221 |
xmlnode_put_attrib(x, "id", cid); |
|
222 |
// id = atoi(cid); |
|
223 |
||
224 |
z = xmlnode_insert_tag(xmlnode_get_tag(x, "query"), "username"); |
|
225 |
xmlnode_insert_cdata(z, jc->user->user, (unsigned) -1); |
|
226 |
jab_send(jc, x); |
|
227 |
xmlnode_free(x); |
|
228 |
||
229 |
jstate = STATE_GETAUTH; |
|
230 |
} |
|
231 |
||
232 |
if (!jc || jc->state == JCONN_STATE_OFF) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
233 |
scr_LogPrint(LPRINT_LOGNORM, "Unable to connect to the server"); |
112 | 234 |
online = FALSE; |
29 | 235 |
} |
236 |
} |
|
237 |
||
238 |
if (!jc) { |
|
239 |
statehandler(jc, JCONN_STATE_OFF); |
|
240 |
} else if (jc->state == JCONN_STATE_OFF || jc->fd == -1) { |
|
241 |
statehandler(jc, JCONN_STATE_OFF); |
|
242 |
} |
|
112 | 243 |
|
244 |
// Keepalive |
|
245 |
if (KeepaliveDelay) { |
|
246 |
time_t now; |
|
247 |
time(&now); |
|
248 |
if (now > LastPingTime + KeepaliveDelay) |
|
249 |
jb_keepalive(); |
|
250 |
} |
|
29 | 251 |
} |
252 |
||
116 | 253 |
inline enum imstatus jb_getstatus() |
254 |
{ |
|
255 |
return mystatus; |
|
256 |
} |
|
257 |
||
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
258 |
void jb_setstatus(enum imstatus st, const char *msg) |
29 | 259 |
{ |
116 | 260 |
xmlnode x; |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
261 |
gchar *utf8_msg; |
116 | 262 |
|
164 | 263 |
if (!online) return; |
116 | 264 |
|
265 |
x = jutil_presnew(JPACKET__UNKNOWN, 0, 0); |
|
29 | 266 |
|
267 |
switch(st) { |
|
268 |
case away: |
|
269 |
xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "away", |
|
270 |
(unsigned) -1); |
|
271 |
break; |
|
272 |
||
273 |
case dontdisturb: |
|
274 |
xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "dnd", |
|
275 |
(unsigned) -1); |
|
276 |
break; |
|
277 |
||
278 |
case freeforchat: |
|
279 |
xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "chat", |
|
280 |
(unsigned) -1); |
|
281 |
break; |
|
282 |
||
283 |
case notavail: |
|
284 |
xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "xa", |
|
285 |
(unsigned) -1); |
|
286 |
break; |
|
287 |
||
288 |
case invisible: |
|
289 |
xmlnode_put_attrib(x, "type", "invisible"); |
|
290 |
break; |
|
51 | 291 |
|
118 | 292 |
case offline: |
293 |
xmlnode_put_attrib(x, "type", "unavailable"); |
|
294 |
break; |
|
295 |
||
51 | 296 |
default: |
297 |
break; |
|
29 | 298 |
} |
299 |
||
272 | 300 |
if (prio) { |
301 |
char strprio[8]; |
|
302 |
snprintf(strprio, 8, "%u", prio); |
|
29 | 303 |
xmlnode_insert_cdata(xmlnode_insert_tag(x, "priority"), |
272 | 304 |
strprio, (unsigned) -1); |
305 |
} |
|
29 | 306 |
|
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
307 |
if (!msg) |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
308 |
msg = settings_get_status_msg(st); |
29 | 309 |
|
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
310 |
utf8_msg = to_utf8(msg); |
321
59193965f2cb
Convert status messages to/from UTF-8
Mikael Berthe <mikael@lilotux.net>
parents:
319
diff
changeset
|
311 |
xmlnode_insert_cdata(xmlnode_insert_tag(x, "status"), utf8_msg, |
29 | 312 |
(unsigned) -1); |
313 |
||
314 |
jab_send(jc, x); |
|
315 |
xmlnode_free(x); |
|
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
316 |
g_free(utf8_msg); |
29 | 317 |
|
116 | 318 |
//sendvisibility(); ??? |
29 | 319 |
|
164 | 320 |
// We'll need to update the roster if we switch to/from offline because |
321 |
// we don't know the presences of buddies when offline... |
|
322 |
if (mystatus == offline || st == offline) |
|
323 |
update_roster = TRUE; |
|
324 |
||
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
311
diff
changeset
|
325 |
hk_mystatuschange(0, mystatus, st, msg); |
116 | 326 |
mystatus = st; |
29 | 327 |
} |
328 |
||
35 | 329 |
void jb_send_msg(const char *jid, const char *text) |
330 |
{ |
|
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
331 |
gchar *buffer = to_utf8(text); |
213 | 332 |
xmlnode x = jutil_msgnew(TMSG_CHAT, (char*)jid, 0, (char*)buffer); |
35 | 333 |
jab_send(jc, x); |
334 |
xmlnode_free(x); |
|
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
335 |
g_free(buffer); |
114 | 336 |
jb_reset_keepalive(); |
35 | 337 |
} |
338 |
||
213 | 339 |
// Note: the caller should check the jid is correct |
244 | 340 |
void jb_addbuddy(const char *jid, const char *name, const char *group) |
124 | 341 |
{ |
342 |
xmlnode x, y, z; |
|
192 | 343 |
char *cleanjid; |
124 | 344 |
|
208 | 345 |
if (!online) return; |
124 | 346 |
|
347 |
// We don't check if the jabber user already exists in the roster, |
|
348 |
// because it allows to re-ask for notification. |
|
349 |
||
350 |
//x = jutil_presnew(JPACKET__SUBSCRIBE, jid, NULL); |
|
125 | 351 |
x = jutil_presnew(JPACKET__SUBSCRIBE, (char*)jid, "online"); |
124 | 352 |
jab_send(jc, x); |
353 |
xmlnode_free(x); |
|
354 |
||
355 |
x = jutil_iqnew(JPACKET__SET, NS_ROSTER); |
|
356 |
y = xmlnode_get_tag(x, "query"); |
|
357 |
z = xmlnode_insert_tag(y, "item"); |
|
358 |
xmlnode_put_attrib(z, "jid", jid); |
|
359 |
||
244 | 360 |
if (name) { |
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
361 |
gchar *name_utf8 = to_utf8(name); |
244 | 362 |
z = xmlnode_insert_tag(z, "name"); |
363 |
xmlnode_insert_cdata(z, name_utf8, (unsigned) -1); |
|
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
364 |
g_free(name_utf8); |
244 | 365 |
} |
366 |
||
124 | 367 |
if (group) { |
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
368 |
char *group_utf8 = to_utf8(group); |
124 | 369 |
z = xmlnode_insert_tag(z, "group"); |
213 | 370 |
xmlnode_insert_cdata(z, group_utf8, (unsigned) -1); |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
371 |
g_free(group_utf8); |
124 | 372 |
} |
373 |
||
374 |
jab_send(jc, x); |
|
375 |
xmlnode_free(x); |
|
376 |
||
192 | 377 |
cleanjid = jidtodisp(jid); |
244 | 378 |
roster_add_user(cleanjid, name, group, ROSTER_TYPE_USER); |
192 | 379 |
g_free(cleanjid); |
124 | 380 |
buddylist_build(); |
381 |
||
244 | 382 |
update_roster = TRUE; |
124 | 383 |
} |
384 |
||
205 | 385 |
void jb_delbuddy(const char *jid) |
386 |
{ |
|
387 |
xmlnode x, y, z; |
|
388 |
char *cleanjid; |
|
389 |
||
390 |
if (!online) return; |
|
391 |
||
392 |
cleanjid = jidtodisp(jid); |
|
393 |
||
394 |
// If the current buddy is an agent, unsubscribe from it |
|
395 |
if (roster_gettype(cleanjid) == ROSTER_TYPE_AGENT) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
396 |
scr_LogPrint(LPRINT_LOGNORM, "Unregistering from the %s agent", cleanjid); |
205 | 397 |
|
398 |
x = jutil_iqnew(JPACKET__SET, NS_REGISTER); |
|
399 |
xmlnode_put_attrib(x, "to", cleanjid); |
|
400 |
y = xmlnode_get_tag(x, "query"); |
|
401 |
xmlnode_insert_tag(y, "remove"); |
|
402 |
jab_send(jc, x); |
|
403 |
xmlnode_free(x); |
|
404 |
} |
|
405 |
||
406 |
// Unsubscribe this buddy from our presence notification |
|
407 |
x = jutil_presnew(JPACKET__UNSUBSCRIBE, cleanjid, 0); |
|
408 |
jab_send(jc, x); |
|
409 |
xmlnode_free(x); |
|
410 |
||
411 |
// Ask for removal from roster |
|
412 |
x = jutil_iqnew(JPACKET__SET, NS_ROSTER); |
|
413 |
y = xmlnode_get_tag(x, "query"); |
|
414 |
z = xmlnode_insert_tag(y, "item"); |
|
415 |
xmlnode_put_attrib(z, "jid", cleanjid); |
|
416 |
xmlnode_put_attrib(z, "subscription", "remove"); |
|
417 |
jab_send(jc, x); |
|
418 |
xmlnode_free(x); |
|
419 |
||
420 |
roster_del_user(cleanjid); |
|
421 |
g_free(cleanjid); |
|
422 |
buddylist_build(); |
|
423 |
||
424 |
update_roster = TRUE; |
|
425 |
} |
|
426 |
||
208 | 427 |
void jb_updatebuddy(const char *jid, const char *name, const char *group) |
428 |
{ |
|
429 |
xmlnode x, y; |
|
430 |
char *cleanjid; |
|
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
431 |
gchar *name_utf8; |
208 | 432 |
|
433 |
if (!online) return; |
|
434 |
||
435 |
// XXX We should check name's and group's correctness |
|
436 |
||
437 |
cleanjid = jidtodisp(jid); |
|
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
438 |
name_utf8 = to_utf8(name); |
208 | 439 |
|
440 |
x = jutil_iqnew(JPACKET__SET, NS_ROSTER); |
|
441 |
y = xmlnode_insert_tag(xmlnode_get_tag(x, "query"), "item"); |
|
442 |
xmlnode_put_attrib(y, "jid", cleanjid); |
|
213 | 443 |
xmlnode_put_attrib(y, "name", name_utf8); |
208 | 444 |
|
445 |
if (group) { |
|
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
446 |
gchar *group_utf8 = to_utf8(group); |
208 | 447 |
y = xmlnode_insert_tag(y, "group"); |
213 | 448 |
xmlnode_insert_cdata(y, group_utf8, (unsigned) -1); |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
449 |
g_free(group_utf8); |
208 | 450 |
} |
451 |
||
452 |
jab_send(jc, x); |
|
453 |
xmlnode_free(x); |
|
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
454 |
g_free(name_utf8); |
208 | 455 |
g_free(cleanjid); |
456 |
} |
|
457 |
||
31 | 458 |
void postlogin() |
459 |
{ |
|
460 |
//int i; |
|
461 |
||
462 |
//flogged = TRUE; |
|
463 |
//ourstatus = available; |
|
464 |
||
465 |
//setautostatus(jhook.manualstatus); |
|
466 |
||
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
467 |
jb_setstatus(available, NULL); |
81 | 468 |
buddylist_build(); |
31 | 469 |
/* |
470 |
for (i = 0; i < clist.count; i++) { |
|
471 |
c = (icqcontact *) clist.at(i); |
|
472 |
||
473 |
if (c->getdesc().pname == proto) |
|
474 |
if (ischannel(c)) |
|
475 |
if (c->getbasicinfo().requiresauth) |
|
476 |
c->setstatus(available); |
|
477 |
} |
|
478 |
*/ |
|
479 |
||
480 |
/* |
|
481 |
agents.insert(agents.begin(), agent("vcard", "Jabber VCard", "", agent::atStandard)); |
|
482 |
agents.begin()->params[agent::ptRegister].enabled = TRUE; |
|
483 |
||
484 |
string buf; |
|
485 |
ifstream f(conf.getconfigfname("jabber-infoset").c_str()); |
|
486 |
||
487 |
if (f.is_open()) { |
|
488 |
icqcontact *c = clist.get(contactroot); |
|
489 |
||
490 |
c->clear(); |
|
491 |
icqcontact::basicinfo bi = c->getbasicinfo(); |
|
492 |
icqcontact::reginfo ri = c->getreginfo(); |
|
493 |
||
494 |
ri.service = agents.begin()->name; |
|
495 |
getstring(f, buf); c->setnick(buf); |
|
496 |
getstring(f, buf); bi.email = buf; |
|
497 |
getstring(f, buf); bi.fname = buf; |
|
498 |
getstring(f, buf); bi.lname = buf; |
|
499 |
f.close(); |
|
500 |
||
501 |
c->setbasicinfo(bi); |
|
502 |
c->setreginfo(ri); |
|
503 |
||
504 |
sendupdateuserinfo(*c); |
|
505 |
unlink(conf.getconfigfname("jabber-infoset").c_str()); |
|
506 |
} |
|
507 |
*/ |
|
508 |
} |
|
509 |
||
29 | 510 |
void gotloggedin(void) |
511 |
{ |
|
512 |
xmlnode x; |
|
513 |
||
514 |
x = jutil_iqnew(JPACKET__GET, NS_AGENTS); |
|
515 |
xmlnode_put_attrib(x, "id", "Agent List"); |
|
516 |
jab_send(jc, x); |
|
517 |
xmlnode_free(x); |
|
518 |
||
519 |
x = jutil_iqnew(JPACKET__GET, NS_ROSTER); |
|
520 |
xmlnode_put_attrib(x, "id", "Roster"); |
|
521 |
jab_send(jc, x); |
|
522 |
xmlnode_free(x); |
|
523 |
} |
|
524 |
||
525 |
void gotroster(xmlnode x) |
|
526 |
{ |
|
33 | 527 |
xmlnode y, z; |
29 | 528 |
|
529 |
for (y = xmlnode_get_tag(x, "item"); y; y = xmlnode_get_nextsibling(y)) { |
|
530 |
const char *alias = xmlnode_get_attrib(y, "jid"); |
|
51 | 531 |
//const char *sub = xmlnode_get_attrib(y, "subscription"); // TODO Not used |
29 | 532 |
const char *name = xmlnode_get_attrib(y, "name"); |
213 | 533 |
char *group = NULL; |
29 | 534 |
|
33 | 535 |
z = xmlnode_get_tag(y, "group"); |
536 |
if (z) group = xmlnode_get_data(z); |
|
29 | 537 |
|
538 |
if (alias) { |
|
35 | 539 |
char *buddyname; |
192 | 540 |
char *cleanalias = jidtodisp(alias); |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
541 |
gchar *name_noutf8 = NULL; |
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
542 |
gchar *group_noutf8 = NULL; |
213 | 543 |
|
544 |
if (name) { |
|
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
545 |
name_noutf8 = from_utf8(name); |
213 | 546 |
buddyname = name_noutf8; |
547 |
} else |
|
192 | 548 |
buddyname = cleanalias; |
35 | 549 |
|
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
550 |
if (group) |
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
551 |
group_noutf8 = from_utf8(group); |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
552 |
|
213 | 553 |
roster_add_user(cleanalias, buddyname, group_noutf8, ROSTER_TYPE_USER); |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
554 |
if (name_noutf8) g_free(name_noutf8); |
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
555 |
if (group_noutf8) g_free(group_noutf8); |
192 | 556 |
g_free(cleanalias); |
29 | 557 |
} |
558 |
} |
|
559 |
||
560 |
postlogin(); |
|
561 |
} |
|
562 |
||
563 |
void gotmessage(char *type, const char *from, const char *body, |
|
223 | 564 |
const char *enc, time_t timestamp) |
29 | 565 |
{ |
113 | 566 |
char *jid; |
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
567 |
gchar *buffer = from_utf8(body); |
29 | 568 |
|
35 | 569 |
/* |
113 | 570 |
//char *u, *h, *r; |
571 |
//jidsplit(from, &u, &h, &r); |
|
35 | 572 |
// Maybe we should remember the resource? |
573 |
if (r) |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
574 |
scr_LogPrint(LPRINT_NORMAL, |
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
575 |
"There is an extra part in message (resource?): %s", r); |
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
576 |
//scr_LogPrint(LPRINT_NORMAL, "Msg from <%s>, type=%s", |
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
577 |
// jidtodisp(from), type); |
35 | 578 |
*/ |
579 |
||
113 | 580 |
jid = jidtodisp(from); |
325
ff6fb51bfd78
Handle "error" message type
Mikael Berthe <mikael@lilotux.net>
parents:
321
diff
changeset
|
581 |
hk_message_in(jid, timestamp, buffer, type); |
192 | 582 |
g_free(jid); |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
583 |
g_free(buffer); |
29 | 584 |
} |
585 |
||
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
586 |
const char *defaulterrormsg(int code) |
420
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
587 |
{ |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
588 |
const char *desc; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
589 |
|
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
590 |
switch(code) { |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
591 |
case 401: desc = "Unauthorized"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
592 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
593 |
case 302: desc = "Redirect"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
594 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
595 |
case 400: desc = "Bad request"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
596 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
597 |
case 402: desc = "Payment Required"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
598 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
599 |
case 403: desc = "Forbidden"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
600 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
601 |
case 404: desc = "Not Found"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
602 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
603 |
case 405: desc = "Not Allowed"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
604 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
605 |
case 406: desc = "Not Acceptable"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
606 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
607 |
case 407: desc = "Registration Required"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
608 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
609 |
case 408: desc = "Request Timeout"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
610 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
611 |
case 409: desc = "Conflict"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
612 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
613 |
case 500: desc = "Internal Server Error"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
614 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
615 |
case 501: desc = "Not Implemented"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
616 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
617 |
case 502: desc = "Remote Server Error"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
618 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
619 |
case 503: desc = "Service Unavailable"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
620 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
621 |
case 504: desc = "Remote Server Timeout"; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
622 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
623 |
default: |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
624 |
desc = NULL; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
625 |
} |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
626 |
|
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
627 |
return desc; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
628 |
} |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
629 |
|
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
630 |
// display_server_error(x) |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
631 |
// Display the error to the user |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
632 |
// x: error tag xmlnode pointer |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
633 |
void display_server_error(xmlnode x) |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
634 |
{ |
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
635 |
const char *desc = NULL; |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
636 |
int code = 0; |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
637 |
char *s; |
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
638 |
const char *p; |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
639 |
|
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
640 |
/* RFC3920: |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
641 |
* The <error/> element: |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
642 |
* o MUST contain a child element corresponding to one of the defined |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
643 |
* stanza error conditions specified below; this element MUST be |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
644 |
* qualified by the 'urn:ietf:params:xml:ns:xmpp-stanzas' namespace. |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
645 |
*/ |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
646 |
p = xmlnode_get_name(xmlnode_get_firstchild(x)); |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
647 |
if (p) |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
648 |
scr_LogPrint(LPRINT_LOGNORM, "Received error packet [%s]", p); |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
649 |
|
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
650 |
// For backward compatibility |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
651 |
if ((s = xmlnode_get_attrib(x, "code")) != NULL) { |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
652 |
code = atoi(s); |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
653 |
// Default message |
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
654 |
desc = defaulterrormsg(code); |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
655 |
} |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
656 |
|
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
657 |
// Error tag data is better, if available |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
658 |
s = xmlnode_get_data(x); |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
659 |
if (s && *s) desc = s; |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
660 |
|
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
661 |
// And sometimes there is a text message |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
662 |
s = xmlnode_get_tag_data(x, "text"); |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
663 |
if (s && *s) desc = s; // FIXME utf8?? |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
664 |
|
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
665 |
scr_LogPrint(LPRINT_LOGNORM, "Error code from server: %d %s", code, desc); |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
666 |
} |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
667 |
|
31 | 668 |
void statehandler(jconn conn, int state) |
669 |
{ |
|
670 |
static int previous_state = -1; |
|
671 |
||
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
672 |
scr_LogPrint(LPRINT_DEBUG, "StateHandler called (state=%d).", state); |
31 | 673 |
|
674 |
switch(state) { |
|
675 |
case JCONN_STATE_OFF: |
|
192 | 676 |
if (previous_state != JCONN_STATE_OFF) |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
677 |
scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Not connected to the server"); |
37 | 678 |
|
112 | 679 |
online = FALSE; |
159 | 680 |
mystatus = offline; |
164 | 681 |
roster_free(); |
682 |
update_roster = TRUE; |
|
31 | 683 |
break; |
684 |
||
685 |
case JCONN_STATE_CONNECTED: |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
686 |
scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Connected to the server"); |
31 | 687 |
break; |
688 |
||
689 |
case JCONN_STATE_AUTH: |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
690 |
scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Authenticating to the server"); |
31 | 691 |
break; |
692 |
||
693 |
case JCONN_STATE_ON: |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
694 |
scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Communication with the server " |
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
695 |
"established"); |
112 | 696 |
online = TRUE; |
31 | 697 |
break; |
698 |
||
35 | 699 |
case JCONN_STATE_CONNECTING: |
357
e8adc3c96e68
Better messages for server connection states
Mikael Berthe <mikael@lilotux.net>
parents:
353
diff
changeset
|
700 |
if (previous_state != state) |
408
73433860665c
Tune previous usleep() change
Mikael Berthe <mikael@lilotux.net>
parents:
407
diff
changeset
|
701 |
scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Connecting to the server"); |
35 | 702 |
break; |
703 |
||
31 | 704 |
default: |
705 |
break; |
|
706 |
} |
|
707 |
previous_state = state; |
|
708 |
} |
|
709 |
||
710 |
void packethandler(jconn conn, jpacket packet) |
|
711 |
{ |
|
91 | 712 |
char *p, *r; |
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
311
diff
changeset
|
713 |
const char *m; |
37 | 714 |
xmlnode x, y; |
31 | 715 |
char *from=NULL, *type=NULL, *body=NULL, *enc=NULL; |
716 |
char *ns=NULL; |
|
717 |
char *id=NULL; |
|
35 | 718 |
enum imstatus ust; |
31 | 719 |
|
112 | 720 |
jb_reset_keepalive(); // reset keepalive delay |
31 | 721 |
jpacket_reset(packet); |
722 |
||
723 |
p = xmlnode_get_attrib(packet->x, "from"); if (p) from = p; |
|
724 |
p = xmlnode_get_attrib(packet->x, "type"); if (p) type = p; |
|
725 |
||
726 |
switch (packet->type) { |
|
727 |
case JPACKET_MESSAGE: |
|
52 | 728 |
{ |
729 |
char *tmp = NULL; |
|
223 | 730 |
time_t timestamp = 0; |
731 |
||
52 | 732 |
x = xmlnode_get_tag(packet->x, "body"); |
733 |
p = xmlnode_get_data(x); if (p) body = p; |
|
31 | 734 |
|
52 | 735 |
if ((x = xmlnode_get_tag(packet->x, "subject")) != NULL) |
736 |
if ((p = xmlnode_get_data(x)) != NULL) { |
|
165 | 737 |
tmp = g_new(char, strlen(body)+strlen(p)+4); |
52 | 738 |
*tmp = '['; |
739 |
strcpy(tmp+1, p); |
|
740 |
strcat(tmp, "]\n"); |
|
741 |
strcat(tmp, body); |
|
742 |
body = tmp; |
|
743 |
} |
|
744 |
||
745 |
/* there can be multiple <x> tags. we're looking for one with |
|
746 |
xmlns = jabber:x:encrypted */ |
|
747 |
||
420
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
748 |
x = xmlnode_get_firstchild(packet->x); |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
749 |
for ( ; x; x = xmlnode_get_nextsibling(x)) { |
52 | 750 |
if ((p = xmlnode_get_name(x)) && !strcmp(p, "x")) |
751 |
if ((p = xmlnode_get_attrib(x, "xmlns")) && |
|
752 |
!strcasecmp(p, "jabber:x:encrypted")) |
|
753 |
if ((p = xmlnode_get_data(x)) != NULL) { |
|
754 |
enc = p; |
|
755 |
break; |
|
756 |
} |
|
31 | 757 |
} |
758 |
||
223 | 759 |
// Timestamp? |
760 |
if ((x = xmlnode_get_tag(packet->x, "x")) != NULL) { |
|
241 | 761 |
if ((p = xmlnode_get_attrib(x, "stamp")) != NULL) |
762 |
timestamp = from_iso8601(p, 1); |
|
223 | 763 |
} |
764 |
||
420
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
765 |
if (type && !strcmp(type, "error")) { |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
766 |
if ((x = xmlnode_get_tag(packet->x, "error")) != NULL) |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
767 |
display_server_error(x); |
420
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
768 |
} |
165 | 769 |
if (from && body) |
223 | 770 |
gotmessage(type, from, body, enc, timestamp); |
52 | 771 |
if (tmp) |
159 | 772 |
g_free(tmp); |
31 | 773 |
} |
774 |
break; |
|
775 |
||
776 |
case JPACKET_IQ: |
|
777 |
if (!strcmp(type, "result")) { |
|
778 |
||
51 | 779 |
if ((p = xmlnode_get_attrib(packet->x, "id")) != NULL) { |
31 | 780 |
int iid = atoi(p); |
781 |
||
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
782 |
scr_LogPrint(LPRINT_DEBUG, "iid = %d", iid); |
31 | 783 |
if (iid == s_id) { |
784 |
if (!regmode) { |
|
785 |
if (jstate == STATE_GETAUTH) { |
|
51 | 786 |
if ((x = xmlnode_get_tag(packet->x, "query")) != NULL) |
31 | 787 |
if (!xmlnode_get_tag(x, "digest")) { |
788 |
jc->sid = 0; |
|
789 |
} |
|
790 |
||
791 |
s_id = atoi(jab_auth(jc)); |
|
792 |
jstate = STATE_SENDAUTH; |
|
793 |
} else { |
|
794 |
gotloggedin(); |
|
795 |
jstate = STATE_LOGGED; |
|
796 |
} |
|
797 |
} else { |
|
798 |
regdone = TRUE; |
|
799 |
} |
|
800 |
return; |
|
801 |
} |
|
802 |
||
803 |
if (!strcmp(p, "VCARDreq")) { |
|
804 |
x = xmlnode_get_firstchild(packet->x); |
|
805 |
if (!x) x = packet->x; |
|
806 |
||
807 |
//jhook.gotvcard(ic, x); TODO |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
808 |
scr_LogPrint(LPRINT_LOGNORM, "Got VCARD"); |
31 | 809 |
return; |
810 |
} else if (!strcmp(p, "versionreq")) { |
|
811 |
// jhook.gotversion(ic, packet->x); TODO |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
812 |
scr_LogPrint(LPRINT_LOGNORM, "Got version"); |
31 | 813 |
return; |
814 |
} |
|
815 |
} |
|
816 |
||
51 | 817 |
if ((x = xmlnode_get_tag(packet->x, "query")) != NULL) { |
31 | 818 |
p = xmlnode_get_attrib(x, "xmlns"); if (p) ns = p; |
819 |
||
820 |
if (!strcmp(ns, NS_ROSTER)) { |
|
821 |
gotroster(x); |
|
822 |
} else if (!strcmp(ns, NS_AGENTS)) { |
|
823 |
for (y = xmlnode_get_tag(x, "agent"); y; y = xmlnode_get_nextsibling(y)) { |
|
824 |
const char *alias = xmlnode_get_attrib(y, "jid"); |
|
825 |
||
826 |
if (alias) { |
|
827 |
const char *name = xmlnode_get_tag_data(y, "name"); |
|
828 |
const char *desc = xmlnode_get_tag_data(y, "description"); |
|
51 | 829 |
// const char *service = xmlnode_get_tag_data(y, "service"); TODO |
37 | 830 |
enum agtype atype = unknown; |
31 | 831 |
|
37 | 832 |
if (xmlnode_get_tag(y, "groupchat")) atype = groupchat; else |
833 |
if (xmlnode_get_tag(y, "transport")) atype = transport; else |
|
834 |
if (xmlnode_get_tag(y, "search")) atype = search; |
|
31 | 835 |
|
192 | 836 |
if (atype == transport) { |
837 |
char *cleanjid = jidtodisp(alias); |
|
194 | 838 |
roster_add_user(cleanjid, NULL, JABBER_AGENT_GROUP, |
839 |
ROSTER_TYPE_AGENT); |
|
192 | 840 |
g_free(cleanjid); |
841 |
} |
|
31 | 842 |
if (alias && name && desc) { |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
843 |
scr_LogPrint(LPRINT_LOGNORM, "Agent: %s / %s / %s / type=%d", |
37 | 844 |
alias, name, desc, atype); |
31 | 845 |
|
37 | 846 |
if (atype == search) { |
31 | 847 |
x = jutil_iqnew (JPACKET__GET, NS_SEARCH); |
848 |
xmlnode_put_attrib(x, "to", alias); |
|
849 |
xmlnode_put_attrib(x, "id", "Agent info"); |
|
850 |
jab_send(conn, x); |
|
851 |
xmlnode_free(x); |
|
852 |
} |
|
853 |
||
854 |
if (xmlnode_get_tag(y, "register")) { |
|
855 |
x = jutil_iqnew (JPACKET__GET, NS_REGISTER); |
|
856 |
xmlnode_put_attrib(x, "to", alias); |
|
857 |
xmlnode_put_attrib(x, "id", "Agent info"); |
|
858 |
jab_send(conn, x); |
|
859 |
xmlnode_free(x); |
|
860 |
} |
|
861 |
} |
|
862 |
} |
|
863 |
} |
|
864 |
||
37 | 865 |
/* |
31 | 866 |
if (find(jhook.agents.begin(), jhook.agents.end(), DEFAULT_CONFSERV) == jhook.agents.end()) |
867 |
jhook.agents.insert(jhook.agents.begin(), agent(DEFAULT_CONFSERV, DEFAULT_CONFSERV, |
|
868 |
_("Default Jabber conference server"), agent::atGroupchat)); |
|
869 |
||
870 |
*/ |
|
871 |
} else if (!strcmp(ns, NS_SEARCH) || !strcmp(ns, NS_REGISTER)) { |
|
872 |
p = xmlnode_get_attrib(packet->x, "id"); id = p ? p : (char*)""; |
|
873 |
||
874 |
if (!strcmp(id, "Agent info")) { |
|
875 |
// jhook.gotagentinfo(packet->x); TODO |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
876 |
scr_LogPrint(LPRINT_LOGNORM, "Got agent info"); |
31 | 877 |
} else if (!strcmp(id, "Lookup")) { |
878 |
// jhook.gotsearchresults(packet->x); TODO |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
879 |
scr_LogPrint(LPRINT_LOGNORM, "Got search results"); |
31 | 880 |
} else if (!strcmp(id, "Register")) { |
881 |
x = jutil_iqnew(JPACKET__GET, NS_REGISTER); |
|
882 |
xmlnode_put_attrib(x, "to", from); |
|
883 |
xmlnode_put_attrib(x, "id", "Agent info"); |
|
884 |
jab_send(conn, x); |
|
885 |
xmlnode_free(x); |
|
886 |
} |
|
887 |
||
888 |
} |
|
889 |
} |
|
890 |
} else if (!strcmp(type, "set")) { |
|
891 |
} else if (!strcmp(type, "error")) { |
|
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
892 |
if ((x = xmlnode_get_tag(packet->x, "error")) != NULL) |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
893 |
display_server_error(x); |
31 | 894 |
} |
895 |
break; |
|
896 |
||
897 |
case JPACKET_PRESENCE: |
|
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
898 |
r = jidtodisp(from); |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
899 |
if (type && !strcmp(type, "error")) { |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
900 |
scr_LogPrint(LPRINT_LOGNORM, "Error presence packet from <%s>", r); |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
901 |
if ((x = xmlnode_get_tag(packet->x, "error")) != NULL) |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
902 |
display_server_error(x); |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
903 |
g_free(r); |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
904 |
break; |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
905 |
} |
31 | 906 |
x = xmlnode_get_tag(packet->x, "show"); |
35 | 907 |
ust = available; |
31 | 908 |
|
909 |
if (x) { |
|
910 |
p = xmlnode_get_data(x); if (p) ns = p; |
|
911 |
||
912 |
if (ns) { |
|
35 | 913 |
if (!strcmp(ns, "away")) ust = away; |
914 |
else if (!strcmp(ns, "dnd")) ust = dontdisturb; |
|
915 |
else if (!strcmp(ns, "xa")) ust = notavail; |
|
916 |
else if (!strcmp(ns, "chat")) ust = freeforchat; |
|
31 | 917 |
} |
918 |
} |
|
919 |
||
321
59193965f2cb
Convert status messages to/from UTF-8
Mikael Berthe <mikael@lilotux.net>
parents:
319
diff
changeset
|
920 |
if (type && !strcmp(type, "unavailable")) |
35 | 921 |
ust = offline; |
31 | 922 |
|
221 | 923 |
if ((x = xmlnode_get_tag(packet->x, "status")) != NULL) |
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
924 |
p = from_utf8(xmlnode_get_data(x)); |
221 | 925 |
else |
926 |
p = NULL; |
|
927 |
||
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
311
diff
changeset
|
928 |
// Call hk_statuschange() if status has changed or if the |
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
311
diff
changeset
|
929 |
// status message is different |
319 | 930 |
m = roster_getstatusmsg(r); |
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
311
diff
changeset
|
931 |
if ((ust != roster_getstatus(r)) || (p && (!m || strcmp(p, m)))) |
221 | 932 |
hk_statuschange(r, 0, ust, p); |
159 | 933 |
g_free(r); |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
934 |
if (p) g_free(p); |
31 | 935 |
break; |
936 |
||
937 |
case JPACKET_S10N: |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
938 |
scr_LogPrint(LPRINT_LOGNORM, "Received (un)subscription packet " |
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
939 |
"(type=%s)", ((type) ? type : "")); |
31 | 940 |
|
43 | 941 |
if (!strcmp(type, "subscribe")) { |
91 | 942 |
int isagent; |
943 |
r = jidtodisp(from); |
|
944 |
isagent = (roster_gettype(r) & ROSTER_TYPE_AGENT) != 0; |
|
159 | 945 |
g_free(r); |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
946 |
scr_LogPrint(LPRINT_LOGNORM, "isagent=%d", isagent); // XXX DBG |
91 | 947 |
if (!isagent) { |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
948 |
scr_LogPrint(LPRINT_LOGNORM, "<%s> wants to subscribe " |
43 | 949 |
"to your network presence updates", from); |
125 | 950 |
// FIXME we accept everybody... |
951 |
x = jutil_presnew(JPACKET__SUBSCRIBED, from, 0); |
|
952 |
jab_send(jc, x); |
|
953 |
xmlnode_free(x); |
|
91 | 954 |
} else { |
955 |
x = jutil_presnew(JPACKET__SUBSCRIBED, from, 0); |
|
31 | 956 |
jab_send(jc, x); |
957 |
xmlnode_free(x); |
|
91 | 958 |
} |
43 | 959 |
} else if (!strcmp(type, "unsubscribe")) { |
960 |
x = jutil_presnew(JPACKET__UNSUBSCRIBED, from, 0); |
|
31 | 961 |
jab_send(jc, x); |
962 |
xmlnode_free(x); |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
963 |
scr_LogPrint(LPRINT_LOGNORM, "<%s> has unsubscribed to " |
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
964 |
"your presence updates", from); |
31 | 965 |
} |
966 |
break; |
|
967 |
||
968 |
default: |
|
969 |
break; |
|
970 |
} |
|
971 |
} |
|
972 |