author | Mikael Berthe <mikael@lilotux.net> |
Sun, 02 Oct 2005 18:05:34 +0200 | |
changeset 472 | 75442262c082 |
parent 470 | eaa2ad773192 |
child 473 | c024d1d5d350 |
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" |
441
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
32 |
#include "hbuf.h" |
29 | 33 |
|
34 |
#define JABBERPORT 5222 |
|
35 |
#define JABBERSSLPORT 5223 |
|
36 |
||
194 | 37 |
#define JABBER_AGENT_GROUP "Jabber Agents" |
38 |
||
29 | 39 |
jconn jc; |
311
1d6b16d9c577
Make some global variables static
Mikael Berthe <mikael@lilotux.net>
parents:
300
diff
changeset
|
40 |
static time_t LastPingTime; |
1d6b16d9c577
Make some global variables static
Mikael Berthe <mikael@lilotux.net>
parents:
300
diff
changeset
|
41 |
static unsigned int KeepaliveDelay; |
272 | 42 |
static unsigned int prio; |
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
43 |
static int s_id; |
31 | 44 |
static int regmode, regdone; |
116 | 45 |
static enum imstatus mystatus = offline; |
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
46 |
static unsigned char online; |
29 | 47 |
|
353
3fe43f6daa5a
Make imstatus2char a null-terminated string
Mikael Berthe <mikael@lilotux.net>
parents:
325
diff
changeset
|
48 |
char imstatus2char[imstatus_size+1] = { |
3fe43f6daa5a
Make imstatus2char a null-terminated string
Mikael Berthe <mikael@lilotux.net>
parents:
325
diff
changeset
|
49 |
'_', 'o', 'i', 'f', 'd', 'n', 'a', '\0' |
46 | 50 |
}; |
51 |
||
31 | 52 |
static enum { |
29 | 53 |
STATE_CONNECTING, |
54 |
STATE_GETAUTH, |
|
55 |
STATE_SENDAUTH, |
|
56 |
STATE_LOGGED |
|
57 |
} jstate; |
|
58 |
||
59 |
||
31 | 60 |
void statehandler(jconn, int); |
61 |
void packethandler(jconn, jpacket); |
|
62 |
||
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
63 |
static void logger(jconn j, int io, const char *buf) |
31 | 64 |
{ |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
65 |
scr_LogPrint(LPRINT_DEBUG, "%03s: %s", ((io == 0) ? "OUT" : "IN"), buf); |
31 | 66 |
} |
67 |
||
113 | 68 |
/* |
29 | 69 |
static void jidsplit(const char *jid, char **user, char **host, |
70 |
char **res) |
|
71 |
{ |
|
72 |
char *tmp, *ptr; |
|
73 |
tmp = strdup(jid); |
|
74 |
||
75 |
if ((ptr = strchr(tmp, '/')) != NULL) { |
|
76 |
*res = strdup(ptr+1); |
|
77 |
*ptr = 0; |
|
78 |
} else |
|
79 |
*res = NULL; |
|
80 |
||
81 |
if ((ptr = strchr(tmp, '@')) != NULL) { |
|
82 |
*host = strdup(ptr+1); |
|
83 |
*ptr = 0; |
|
84 |
} else |
|
85 |
*host = NULL; |
|
86 |
||
87 |
*user = strdup(tmp); |
|
88 |
free(tmp); |
|
89 |
} |
|
113 | 90 |
*/ |
29 | 91 |
|
192 | 92 |
// jidtodisp(jid) |
93 |
// Strips the resource part from the jid |
|
94 |
// The caller should g_free the result after use. |
|
29 | 95 |
char *jidtodisp(const char *jid) |
96 |
{ |
|
97 |
char *ptr; |
|
165 | 98 |
char *alias; |
99 |
||
438
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
100 |
alias = g_strdup(jid); |
165 | 101 |
|
29 | 102 |
if ((ptr = strchr(alias, '/')) != NULL) { |
103 |
*ptr = 0; |
|
104 |
} |
|
105 |
return alias; |
|
106 |
} |
|
107 |
||
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
108 |
char *compose_jid(const char *username, const char *servername, |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
109 |
const char *resource) |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
110 |
{ |
393 | 111 |
char *jid = g_new(char, 3 + |
112 |
strlen(username) + strlen(servername) + strlen(resource)); |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
113 |
strcpy(jid, username); |
403
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
393
diff
changeset
|
114 |
if (!strchr(jid, '@')) { |
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
393
diff
changeset
|
115 |
strcat(jid, "@"); |
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
393
diff
changeset
|
116 |
strcat(jid, servername); |
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
393
diff
changeset
|
117 |
} |
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
118 |
strcat(jid, "/"); |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
119 |
strcat(jid, resource); |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
120 |
return jid; |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
121 |
} |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
122 |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
123 |
inline unsigned char jb_getonline(void) |
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
124 |
{ |
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
125 |
return online; |
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
126 |
} |
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
127 |
|
403
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
393
diff
changeset
|
128 |
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
|
129 |
int ssl, const char *pass) |
29 | 130 |
{ |
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
131 |
char *utf8_jid; |
29 | 132 |
if (!port) { |
133 |
if (ssl) |
|
134 |
port = JABBERSSLPORT; |
|
135 |
else |
|
136 |
port = JABBERPORT; |
|
137 |
} |
|
138 |
||
357
e8adc3c96e68
Better messages for server connection states
Mikael Berthe <mikael@lilotux.net>
parents:
353
diff
changeset
|
139 |
jb_disconnect(); |
29 | 140 |
|
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
141 |
utf8_jid = to_utf8(jid); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
142 |
if (!utf8_jid) return jc; |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
143 |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
144 |
s_id = 1; |
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
145 |
jc = jab_new(utf8_jid, (char*)pass, (char*)server, port, ssl); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
146 |
g_free(utf8_jid); |
29 | 147 |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
148 |
/* 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
|
149 |
jab_logger(jc, logger); |
29 | 150 |
jab_packet_handler(jc, &packethandler); |
151 |
jab_state_handler(jc, &statehandler); |
|
152 |
||
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
153 |
if (jc && jc->user) { |
112 | 154 |
online = TRUE; |
29 | 155 |
jstate = STATE_CONNECTING; |
156 |
statehandler(0, -1); |
|
157 |
jab_start(jc); |
|
158 |
} |
|
159 |
||
160 |
return jc; |
|
161 |
} |
|
162 |
||
163 |
void jb_disconnect(void) |
|
164 |
{ |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
165 |
if (!jc) return; |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
166 |
|
416
48e7808c4191
Allow offline status message
Mikael Berthe <mikael@lilotux.net>
parents:
411
diff
changeset
|
167 |
// announce it to everyone else |
444 | 168 |
jb_setstatus(offline, NULL, ""); |
416
48e7808c4191
Allow offline status message
Mikael Berthe <mikael@lilotux.net>
parents:
411
diff
changeset
|
169 |
|
48e7808c4191
Allow offline status message
Mikael Berthe <mikael@lilotux.net>
parents:
411
diff
changeset
|
170 |
// announce it to the user |
29 | 171 |
statehandler(jc, JCONN_STATE_OFF); |
416
48e7808c4191
Allow offline status message
Mikael Berthe <mikael@lilotux.net>
parents:
411
diff
changeset
|
172 |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
173 |
jab_delete(jc); |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
174 |
//free(jc); XXX |
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
175 |
jc = NULL; |
29 | 176 |
} |
177 |
||
112 | 178 |
inline void jb_reset_keepalive() |
179 |
{ |
|
180 |
time(&LastPingTime); |
|
181 |
} |
|
182 |
||
436 | 183 |
void jb_send_raw(const char *str) |
184 |
{ |
|
461
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
449
diff
changeset
|
185 |
if (jc && online && str) |
436 | 186 |
jab_send_raw(jc, str); |
187 |
} |
|
188 |
||
29 | 189 |
void jb_keepalive() |
190 |
{ |
|
113 | 191 |
if (jc && online) |
112 | 192 |
jab_send_raw(jc, " \t "); |
193 |
jb_reset_keepalive(); |
|
194 |
} |
|
195 |
||
196 |
void jb_set_keepalive_delay(unsigned int delay) |
|
197 |
{ |
|
198 |
KeepaliveDelay = delay; |
|
29 | 199 |
} |
200 |
||
272 | 201 |
inline void jb_set_priority(unsigned int priority) |
202 |
{ |
|
203 |
prio = priority; |
|
204 |
} |
|
205 |
||
29 | 206 |
void jb_main() |
207 |
{ |
|
208 |
xmlnode x, z; |
|
209 |
char *cid; |
|
210 |
||
406 | 211 |
if (!online) { |
419 | 212 |
safe_usleep(10000); |
406 | 213 |
return; |
214 |
} |
|
164 | 215 |
|
29 | 216 |
if (jc && jc->state == JCONN_STATE_CONNECTING) { |
419 | 217 |
safe_usleep(75000); |
29 | 218 |
jab_start(jc); |
219 |
return; |
|
220 |
} |
|
221 |
||
31 | 222 |
jab_poll(jc, 50); |
29 | 223 |
|
224 |
if (jstate == STATE_CONNECTING) { |
|
225 |
if (jc) { |
|
226 |
x = jutil_iqnew(JPACKET__GET, NS_AUTH); |
|
227 |
cid = jab_getid(jc); |
|
228 |
xmlnode_put_attrib(x, "id", cid); |
|
229 |
// id = atoi(cid); |
|
230 |
||
231 |
z = xmlnode_insert_tag(xmlnode_get_tag(x, "query"), "username"); |
|
232 |
xmlnode_insert_cdata(z, jc->user->user, (unsigned) -1); |
|
233 |
jab_send(jc, x); |
|
234 |
xmlnode_free(x); |
|
235 |
||
236 |
jstate = STATE_GETAUTH; |
|
237 |
} |
|
238 |
||
239 |
if (!jc || jc->state == JCONN_STATE_OFF) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
240 |
scr_LogPrint(LPRINT_LOGNORM, "Unable to connect to the server"); |
112 | 241 |
online = FALSE; |
29 | 242 |
} |
243 |
} |
|
244 |
||
245 |
if (!jc) { |
|
246 |
statehandler(jc, JCONN_STATE_OFF); |
|
247 |
} else if (jc->state == JCONN_STATE_OFF || jc->fd == -1) { |
|
248 |
statehandler(jc, JCONN_STATE_OFF); |
|
249 |
} |
|
112 | 250 |
|
251 |
// Keepalive |
|
252 |
if (KeepaliveDelay) { |
|
253 |
time_t now; |
|
254 |
time(&now); |
|
255 |
if (now > LastPingTime + KeepaliveDelay) |
|
256 |
jb_keepalive(); |
|
257 |
} |
|
29 | 258 |
} |
259 |
||
116 | 260 |
inline enum imstatus jb_getstatus() |
261 |
{ |
|
262 |
return mystatus; |
|
263 |
} |
|
264 |
||
444 | 265 |
void jb_setstatus(enum imstatus st, const char *recipient, const char *msg) |
29 | 266 |
{ |
116 | 267 |
xmlnode x; |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
268 |
gchar *utf8_msg; |
116 | 269 |
|
164 | 270 |
if (!online) return; |
116 | 271 |
|
272 |
x = jutil_presnew(JPACKET__UNKNOWN, 0, 0); |
|
29 | 273 |
|
444 | 274 |
if (recipient) |
275 |
xmlnode_put_attrib(x, "to", recipient); |
|
276 |
||
29 | 277 |
switch(st) { |
278 |
case away: |
|
279 |
xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "away", |
|
280 |
(unsigned) -1); |
|
281 |
break; |
|
282 |
||
283 |
case dontdisturb: |
|
284 |
xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "dnd", |
|
285 |
(unsigned) -1); |
|
286 |
break; |
|
287 |
||
288 |
case freeforchat: |
|
289 |
xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "chat", |
|
290 |
(unsigned) -1); |
|
291 |
break; |
|
292 |
||
293 |
case notavail: |
|
294 |
xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "xa", |
|
295 |
(unsigned) -1); |
|
296 |
break; |
|
297 |
||
298 |
case invisible: |
|
299 |
xmlnode_put_attrib(x, "type", "invisible"); |
|
300 |
break; |
|
51 | 301 |
|
118 | 302 |
case offline: |
303 |
xmlnode_put_attrib(x, "type", "unavailable"); |
|
304 |
break; |
|
305 |
||
51 | 306 |
default: |
307 |
break; |
|
29 | 308 |
} |
309 |
||
272 | 310 |
if (prio) { |
311 |
char strprio[8]; |
|
312 |
snprintf(strprio, 8, "%u", prio); |
|
29 | 313 |
xmlnode_insert_cdata(xmlnode_insert_tag(x, "priority"), |
272 | 314 |
strprio, (unsigned) -1); |
315 |
} |
|
29 | 316 |
|
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
317 |
if (!msg) |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
318 |
msg = settings_get_status_msg(st); |
29 | 319 |
|
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
320 |
utf8_msg = to_utf8(msg); |
321
59193965f2cb
Convert status messages to/from UTF-8
Mikael Berthe <mikael@lilotux.net>
parents:
319
diff
changeset
|
321 |
xmlnode_insert_cdata(xmlnode_insert_tag(x, "status"), utf8_msg, |
29 | 322 |
(unsigned) -1); |
323 |
||
324 |
jab_send(jc, x); |
|
325 |
xmlnode_free(x); |
|
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
326 |
g_free(utf8_msg); |
29 | 327 |
|
444 | 328 |
// If we didn't change our _global_ status, we are done |
329 |
if (recipient) return; |
|
330 |
||
331 |
// Buddy per buddy invisibility handling |
|
332 |
//sendvisibility(); |
|
29 | 333 |
|
164 | 334 |
// We'll need to update the roster if we switch to/from offline because |
335 |
// we don't know the presences of buddies when offline... |
|
336 |
if (mystatus == offline || st == offline) |
|
337 |
update_roster = TRUE; |
|
338 |
||
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
311
diff
changeset
|
339 |
hk_mystatuschange(0, mystatus, st, msg); |
116 | 340 |
mystatus = st; |
29 | 341 |
} |
342 |
||
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
343 |
void jb_send_msg(const char *jid, const char *text, int type) |
35 | 344 |
{ |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
345 |
gchar *strtype; |
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
346 |
gchar *buffer = to_utf8(text); |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
347 |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
348 |
if (!online) return; |
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
349 |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
350 |
if (type == ROSTER_TYPE_ROOM) |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
351 |
strtype = TMSG_GROUPCHAT; |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
352 |
else |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
353 |
strtype = TMSG_CHAT; |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
354 |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
355 |
xmlnode x = jutil_msgnew(strtype, (char*)jid, 0, (char*)buffer); |
35 | 356 |
jab_send(jc, x); |
357 |
xmlnode_free(x); |
|
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
358 |
g_free(buffer); |
114 | 359 |
jb_reset_keepalive(); |
35 | 360 |
} |
361 |
||
213 | 362 |
// Note: the caller should check the jid is correct |
244 | 363 |
void jb_addbuddy(const char *jid, const char *name, const char *group) |
124 | 364 |
{ |
365 |
xmlnode x, y, z; |
|
192 | 366 |
char *cleanjid; |
124 | 367 |
|
208 | 368 |
if (!online) return; |
124 | 369 |
|
370 |
// We don't check if the jabber user already exists in the roster, |
|
371 |
// because it allows to re-ask for notification. |
|
372 |
||
373 |
//x = jutil_presnew(JPACKET__SUBSCRIBE, jid, NULL); |
|
125 | 374 |
x = jutil_presnew(JPACKET__SUBSCRIBE, (char*)jid, "online"); |
124 | 375 |
jab_send(jc, x); |
376 |
xmlnode_free(x); |
|
377 |
||
378 |
x = jutil_iqnew(JPACKET__SET, NS_ROSTER); |
|
379 |
y = xmlnode_get_tag(x, "query"); |
|
380 |
z = xmlnode_insert_tag(y, "item"); |
|
381 |
xmlnode_put_attrib(z, "jid", jid); |
|
382 |
||
244 | 383 |
if (name) { |
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
384 |
gchar *name_utf8 = to_utf8(name); |
244 | 385 |
z = xmlnode_insert_tag(z, "name"); |
386 |
xmlnode_insert_cdata(z, name_utf8, (unsigned) -1); |
|
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
387 |
g_free(name_utf8); |
244 | 388 |
} |
389 |
||
124 | 390 |
if (group) { |
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
391 |
char *group_utf8 = to_utf8(group); |
124 | 392 |
z = xmlnode_insert_tag(z, "group"); |
213 | 393 |
xmlnode_insert_cdata(z, group_utf8, (unsigned) -1); |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
394 |
g_free(group_utf8); |
124 | 395 |
} |
396 |
||
397 |
jab_send(jc, x); |
|
398 |
xmlnode_free(x); |
|
399 |
||
192 | 400 |
cleanjid = jidtodisp(jid); |
244 | 401 |
roster_add_user(cleanjid, name, group, ROSTER_TYPE_USER); |
192 | 402 |
g_free(cleanjid); |
124 | 403 |
buddylist_build(); |
404 |
||
244 | 405 |
update_roster = TRUE; |
124 | 406 |
} |
407 |
||
205 | 408 |
void jb_delbuddy(const char *jid) |
409 |
{ |
|
410 |
xmlnode x, y, z; |
|
411 |
char *cleanjid; |
|
412 |
||
413 |
if (!online) return; |
|
414 |
||
415 |
cleanjid = jidtodisp(jid); |
|
416 |
||
417 |
// If the current buddy is an agent, unsubscribe from it |
|
418 |
if (roster_gettype(cleanjid) == ROSTER_TYPE_AGENT) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
419 |
scr_LogPrint(LPRINT_LOGNORM, "Unregistering from the %s agent", cleanjid); |
205 | 420 |
|
421 |
x = jutil_iqnew(JPACKET__SET, NS_REGISTER); |
|
422 |
xmlnode_put_attrib(x, "to", cleanjid); |
|
423 |
y = xmlnode_get_tag(x, "query"); |
|
424 |
xmlnode_insert_tag(y, "remove"); |
|
425 |
jab_send(jc, x); |
|
426 |
xmlnode_free(x); |
|
427 |
} |
|
428 |
||
429 |
// Unsubscribe this buddy from our presence notification |
|
430 |
x = jutil_presnew(JPACKET__UNSUBSCRIBE, cleanjid, 0); |
|
431 |
jab_send(jc, x); |
|
432 |
xmlnode_free(x); |
|
433 |
||
434 |
// Ask for removal from roster |
|
435 |
x = jutil_iqnew(JPACKET__SET, NS_ROSTER); |
|
436 |
y = xmlnode_get_tag(x, "query"); |
|
437 |
z = xmlnode_insert_tag(y, "item"); |
|
438 |
xmlnode_put_attrib(z, "jid", cleanjid); |
|
439 |
xmlnode_put_attrib(z, "subscription", "remove"); |
|
440 |
jab_send(jc, x); |
|
441 |
xmlnode_free(x); |
|
442 |
||
443 |
roster_del_user(cleanjid); |
|
444 |
g_free(cleanjid); |
|
445 |
buddylist_build(); |
|
446 |
||
447 |
update_roster = TRUE; |
|
448 |
} |
|
449 |
||
208 | 450 |
void jb_updatebuddy(const char *jid, const char *name, const char *group) |
451 |
{ |
|
452 |
xmlnode x, y; |
|
453 |
char *cleanjid; |
|
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
454 |
gchar *name_utf8; |
208 | 455 |
|
456 |
if (!online) return; |
|
457 |
||
458 |
// XXX We should check name's and group's correctness |
|
459 |
||
460 |
cleanjid = jidtodisp(jid); |
|
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
461 |
name_utf8 = to_utf8(name); |
208 | 462 |
|
463 |
x = jutil_iqnew(JPACKET__SET, NS_ROSTER); |
|
464 |
y = xmlnode_insert_tag(xmlnode_get_tag(x, "query"), "item"); |
|
465 |
xmlnode_put_attrib(y, "jid", cleanjid); |
|
213 | 466 |
xmlnode_put_attrib(y, "name", name_utf8); |
208 | 467 |
|
468 |
if (group) { |
|
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
469 |
gchar *group_utf8 = to_utf8(group); |
208 | 470 |
y = xmlnode_insert_tag(y, "group"); |
213 | 471 |
xmlnode_insert_cdata(y, group_utf8, (unsigned) -1); |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
472 |
g_free(group_utf8); |
208 | 473 |
} |
474 |
||
475 |
jab_send(jc, x); |
|
476 |
xmlnode_free(x); |
|
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
477 |
g_free(name_utf8); |
208 | 478 |
g_free(cleanjid); |
479 |
} |
|
480 |
||
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
481 |
// Join a MUC room |
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
482 |
void jb_room_join(const char *room, const char *nickname) |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
483 |
{ |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
484 |
xmlnode x, y; |
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
485 |
gchar *roomid, *utf8_nickname; |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
486 |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
487 |
if (!online || !room) return; |
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
488 |
if (!nickname) return; |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
489 |
|
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
490 |
utf8_nickname = to_utf8(nickname); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
491 |
roomid = g_strdup_printf("%s/%s", room, utf8_nickname); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
492 |
g_free(utf8_nickname); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
493 |
if (check_jid_syntax(roomid)) { |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
494 |
scr_LogPrint(LPRINT_NORMAL, "<%s/%s> is not a valid Jabber room", room, |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
495 |
nickname); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
496 |
g_free(roomid); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
497 |
return; |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
498 |
} |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
499 |
|
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
500 |
// Send the XML request |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
501 |
x = jutil_presnew(JPACKET__UNKNOWN, 0, 0); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
502 |
xmlnode_put_attrib(x, "from", jid_full(jc->user)); |
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
503 |
xmlnode_put_attrib(x, "to", roomid); |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
504 |
y = xmlnode_insert_tag(x, "x"); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
505 |
xmlnode_put_attrib(y, "xmlns", "http://jabber.org/protocol/muc"); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
506 |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
507 |
jab_send(jc, x); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
508 |
xmlnode_free(x); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
509 |
jb_reset_keepalive(); |
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
510 |
g_free(roomid); |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
511 |
} |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
512 |
|
449 | 513 |
// Unlock a MUC room |
514 |
// room syntax: "room@server" |
|
515 |
void jb_room_unlock(const char *room) |
|
516 |
{ |
|
517 |
xmlnode x, y, z; |
|
518 |
||
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
519 |
if (!online || !room) return; |
449 | 520 |
|
521 |
x = jutil_iqnew(JPACKET__SET, "http://jabber.org/protocol/muc#owner"); |
|
522 |
xmlnode_put_attrib(x, "id", "unlock1"); // XXX |
|
523 |
xmlnode_put_attrib(x, "to", room); |
|
524 |
y = xmlnode_get_tag(x, "query"); |
|
525 |
z = xmlnode_insert_tag(y, "x"); |
|
526 |
xmlnode_put_attrib(z, "xmlns", "jabber:x:data"); |
|
527 |
xmlnode_put_attrib(z, "type", "submit"); |
|
528 |
||
529 |
jab_send(jc, x); |
|
530 |
xmlnode_free(x); |
|
531 |
jb_reset_keepalive(); |
|
532 |
} |
|
533 |
||
31 | 534 |
void postlogin() |
535 |
{ |
|
536 |
//int i; |
|
537 |
||
538 |
//flogged = TRUE; |
|
539 |
//ourstatus = available; |
|
540 |
||
541 |
//setautostatus(jhook.manualstatus); |
|
542 |
||
444 | 543 |
jb_setstatus(available, NULL, NULL); |
81 | 544 |
buddylist_build(); |
31 | 545 |
/* |
546 |
for (i = 0; i < clist.count; i++) { |
|
547 |
c = (icqcontact *) clist.at(i); |
|
548 |
||
549 |
if (c->getdesc().pname == proto) |
|
550 |
if (ischannel(c)) |
|
551 |
if (c->getbasicinfo().requiresauth) |
|
552 |
c->setstatus(available); |
|
553 |
} |
|
554 |
*/ |
|
555 |
||
556 |
/* |
|
557 |
agents.insert(agents.begin(), agent("vcard", "Jabber VCard", "", agent::atStandard)); |
|
558 |
agents.begin()->params[agent::ptRegister].enabled = TRUE; |
|
559 |
||
560 |
string buf; |
|
561 |
ifstream f(conf.getconfigfname("jabber-infoset").c_str()); |
|
562 |
||
563 |
if (f.is_open()) { |
|
564 |
icqcontact *c = clist.get(contactroot); |
|
565 |
||
566 |
c->clear(); |
|
567 |
icqcontact::basicinfo bi = c->getbasicinfo(); |
|
568 |
icqcontact::reginfo ri = c->getreginfo(); |
|
569 |
||
570 |
ri.service = agents.begin()->name; |
|
571 |
getstring(f, buf); c->setnick(buf); |
|
572 |
getstring(f, buf); bi.email = buf; |
|
573 |
getstring(f, buf); bi.fname = buf; |
|
574 |
getstring(f, buf); bi.lname = buf; |
|
575 |
f.close(); |
|
576 |
||
577 |
c->setbasicinfo(bi); |
|
578 |
c->setreginfo(ri); |
|
579 |
||
580 |
sendupdateuserinfo(*c); |
|
581 |
unlink(conf.getconfigfname("jabber-infoset").c_str()); |
|
582 |
} |
|
583 |
*/ |
|
584 |
} |
|
585 |
||
29 | 586 |
void gotloggedin(void) |
587 |
{ |
|
588 |
xmlnode x; |
|
589 |
||
590 |
x = jutil_iqnew(JPACKET__GET, NS_AGENTS); |
|
591 |
xmlnode_put_attrib(x, "id", "Agent List"); |
|
592 |
jab_send(jc, x); |
|
593 |
xmlnode_free(x); |
|
594 |
||
595 |
x = jutil_iqnew(JPACKET__GET, NS_ROSTER); |
|
596 |
xmlnode_put_attrib(x, "id", "Roster"); |
|
597 |
jab_send(jc, x); |
|
598 |
xmlnode_free(x); |
|
599 |
} |
|
600 |
||
601 |
void gotroster(xmlnode x) |
|
602 |
{ |
|
33 | 603 |
xmlnode y, z; |
29 | 604 |
|
605 |
for (y = xmlnode_get_tag(x, "item"); y; y = xmlnode_get_nextsibling(y)) { |
|
606 |
const char *alias = xmlnode_get_attrib(y, "jid"); |
|
51 | 607 |
//const char *sub = xmlnode_get_attrib(y, "subscription"); // TODO Not used |
29 | 608 |
const char *name = xmlnode_get_attrib(y, "name"); |
213 | 609 |
char *group = NULL; |
29 | 610 |
|
33 | 611 |
z = xmlnode_get_tag(y, "group"); |
612 |
if (z) group = xmlnode_get_data(z); |
|
29 | 613 |
|
614 |
if (alias) { |
|
35 | 615 |
char *buddyname; |
192 | 616 |
char *cleanalias = jidtodisp(alias); |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
617 |
gchar *name_noutf8 = NULL; |
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
618 |
gchar *group_noutf8 = NULL; |
213 | 619 |
|
441
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
620 |
buddyname = cleanalias; |
213 | 621 |
if (name) { |
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
622 |
name_noutf8 = from_utf8(name); |
441
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
623 |
if (name_noutf8) buddyname = name_noutf8; |
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
624 |
} |
35 | 625 |
|
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
626 |
if (group) |
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
627 |
group_noutf8 = from_utf8(group); |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
628 |
|
213 | 629 |
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
|
630 |
if (name_noutf8) g_free(name_noutf8); |
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
631 |
if (group_noutf8) g_free(group_noutf8); |
192 | 632 |
g_free(cleanalias); |
29 | 633 |
} |
634 |
} |
|
635 |
||
636 |
postlogin(); |
|
637 |
} |
|
638 |
||
639 |
void gotmessage(char *type, const char *from, const char *body, |
|
223 | 640 |
const char *enc, time_t timestamp) |
29 | 641 |
{ |
113 | 642 |
char *jid; |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
643 |
const char *rname; |
387
2bbeef7b4fdd
Do non UTF8-encode/decode null pointers
Mikael Berthe <mikael@lilotux.net>
parents:
384
diff
changeset
|
644 |
gchar *buffer = from_utf8(body); |
29 | 645 |
|
441
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
646 |
jid = jidtodisp(from); |
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
647 |
|
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
648 |
if (!buffer && body) { |
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
649 |
scr_LogPrint(LPRINT_LOGNORM, "Decoding of message from <%s> has failed", |
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
650 |
from); |
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
651 |
scr_WriteIncomingMessage(jid, "Cannot display message: " |
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
652 |
"UTF-8 conversion failure", |
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
653 |
0, HBB_PREFIX_ERR | HBB_PREFIX_IN); |
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
654 |
g_free(jid); |
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
655 |
return; |
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
656 |
} |
51b8f10cfeb8
Handle g_locale_from_utf8() failures
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
657 |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
658 |
rname = strchr(from, '/'); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
659 |
if (rname) rname++; |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
660 |
hk_message_in(jid, rname, timestamp, buffer, type); |
192 | 661 |
g_free(jid); |
383
39c5da51b387
Remove utf8 files, use Glib
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
662 |
g_free(buffer); |
29 | 663 |
} |
664 |
||
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
665 |
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
|
666 |
{ |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
667 |
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
|
668 |
|
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
669 |
switch(code) { |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
670 |
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
|
671 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
672 |
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
|
673 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
674 |
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
|
675 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
676 |
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
|
677 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
678 |
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
|
679 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
680 |
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
|
681 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
682 |
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
|
683 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
684 |
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
|
685 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
686 |
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
|
687 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
688 |
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
|
689 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
690 |
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
|
691 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
692 |
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
|
693 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
694 |
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
|
695 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
696 |
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
|
697 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
698 |
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
|
699 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
700 |
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
|
701 |
break; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
702 |
default: |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
703 |
desc = NULL; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
704 |
} |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
705 |
|
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
706 |
return desc; |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
707 |
} |
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
708 |
|
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
709 |
// display_server_error(x) |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
710 |
// 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
|
711 |
// x: error tag xmlnode pointer |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
712 |
void display_server_error(xmlnode x) |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
713 |
{ |
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
714 |
const char *desc = NULL; |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
715 |
int code = 0; |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
716 |
char *s; |
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
717 |
const char *p; |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
718 |
|
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
719 |
/* RFC3920: |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
720 |
* The <error/> element: |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
721 |
* 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
|
722 |
* 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
|
723 |
* 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
|
724 |
*/ |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
725 |
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
|
726 |
if (p) |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
727 |
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
|
728 |
|
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
729 |
// For backward compatibility |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
730 |
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
|
731 |
code = atoi(s); |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
732 |
// Default message |
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
733 |
desc = defaulterrormsg(code); |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
734 |
} |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
735 |
|
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
736 |
// 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
|
737 |
s = xmlnode_get_data(x); |
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
738 |
if (s && *s) desc = s; |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
739 |
|
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
740 |
// 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
|
741 |
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
|
742 |
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
|
743 |
|
430
d03663d2e7d9
Display error messages as specified in RFC3920 (9.3)
Mikael Berthe <mikael@lilotux.net>
parents:
426
diff
changeset
|
744 |
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
|
745 |
} |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
746 |
|
31 | 747 |
void statehandler(jconn conn, int state) |
748 |
{ |
|
749 |
static int previous_state = -1; |
|
750 |
||
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
751 |
scr_LogPrint(LPRINT_DEBUG, "StateHandler called (state=%d).", state); |
31 | 752 |
|
753 |
switch(state) { |
|
754 |
case JCONN_STATE_OFF: |
|
192 | 755 |
if (previous_state != JCONN_STATE_OFF) |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
756 |
scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Not connected to the server"); |
37 | 757 |
|
112 | 758 |
online = FALSE; |
159 | 759 |
mystatus = offline; |
164 | 760 |
roster_free(); |
761 |
update_roster = TRUE; |
|
31 | 762 |
break; |
763 |
||
764 |
case JCONN_STATE_CONNECTED: |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
765 |
scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Connected to the server"); |
31 | 766 |
break; |
767 |
||
768 |
case JCONN_STATE_AUTH: |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
769 |
scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Authenticating to the server"); |
31 | 770 |
break; |
771 |
||
772 |
case JCONN_STATE_ON: |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
773 |
scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Communication with the server " |
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
774 |
"established"); |
112 | 775 |
online = TRUE; |
31 | 776 |
break; |
777 |
||
35 | 778 |
case JCONN_STATE_CONNECTING: |
357
e8adc3c96e68
Better messages for server connection states
Mikael Berthe <mikael@lilotux.net>
parents:
353
diff
changeset
|
779 |
if (previous_state != state) |
408
73433860665c
Tune previous usleep() change
Mikael Berthe <mikael@lilotux.net>
parents:
407
diff
changeset
|
780 |
scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Connecting to the server"); |
35 | 781 |
break; |
782 |
||
31 | 783 |
default: |
784 |
break; |
|
785 |
} |
|
786 |
previous_state = state; |
|
787 |
} |
|
788 |
||
789 |
void packethandler(jconn conn, jpacket packet) |
|
790 |
{ |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
791 |
char *p, *r, *s; |
438
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
792 |
const char *m, *rname; |
37 | 793 |
xmlnode x, y; |
31 | 794 |
char *from=NULL, *type=NULL, *body=NULL, *enc=NULL; |
795 |
char *ns=NULL; |
|
796 |
char *id=NULL; |
|
35 | 797 |
enum imstatus ust; |
438
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
798 |
char bpprio; |
31 | 799 |
|
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
800 |
jb_reset_keepalive(); // reset keepalive timeout |
31 | 801 |
jpacket_reset(packet); |
802 |
||
803 |
p = xmlnode_get_attrib(packet->x, "type"); if (p) type = p; |
|
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
804 |
p = xmlnode_get_attrib(packet->x, "from"); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
805 |
if (p) { // Convert from UTF8 |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
806 |
// We need to be careful because from_utf8() can fail on some chars |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
807 |
// Thus we only convert the resource part |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
808 |
from = g_new0(char, strlen(p)+1); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
809 |
strcpy(from, p); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
810 |
r = strchr(from, '/'); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
811 |
m = strchr(p, '/'); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
812 |
if (m++) { |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
813 |
s = from_utf8(m); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
814 |
if (s) { |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
815 |
// The length should be enough because from_utf should only |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
816 |
// reduce the string length |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
817 |
strcpy(r+1, s); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
818 |
g_free(s); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
819 |
} else { |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
820 |
*(r+1) = 0; |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
821 |
scr_LogPrint(LPRINT_LOGNORM, "Decoding of message sender has failed"); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
822 |
} |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
823 |
} |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
824 |
} |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
825 |
|
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
826 |
if (!from && packet->type != JPACKET_IQ) { |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
827 |
scr_LogPrint(LPRINT_LOGNORM, "Error in packet (could be UTF8-related)"); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
828 |
return; |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
829 |
} |
31 | 830 |
|
831 |
switch (packet->type) { |
|
832 |
case JPACKET_MESSAGE: |
|
52 | 833 |
{ |
834 |
char *tmp = NULL; |
|
223 | 835 |
time_t timestamp = 0; |
836 |
||
52 | 837 |
x = xmlnode_get_tag(packet->x, "body"); |
838 |
p = xmlnode_get_data(x); if (p) body = p; |
|
31 | 839 |
|
52 | 840 |
if ((x = xmlnode_get_tag(packet->x, "subject")) != NULL) |
841 |
if ((p = xmlnode_get_data(x)) != NULL) { |
|
165 | 842 |
tmp = g_new(char, strlen(body)+strlen(p)+4); |
52 | 843 |
*tmp = '['; |
844 |
strcpy(tmp+1, p); |
|
845 |
strcat(tmp, "]\n"); |
|
846 |
strcat(tmp, body); |
|
847 |
body = tmp; |
|
848 |
} |
|
849 |
||
850 |
/* there can be multiple <x> tags. we're looking for one with |
|
851 |
xmlns = jabber:x:encrypted */ |
|
852 |
||
420
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
853 |
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
|
854 |
for ( ; x; x = xmlnode_get_nextsibling(x)) { |
52 | 855 |
if ((p = xmlnode_get_name(x)) && !strcmp(p, "x")) |
856 |
if ((p = xmlnode_get_attrib(x, "xmlns")) && |
|
857 |
!strcasecmp(p, "jabber:x:encrypted")) |
|
858 |
if ((p = xmlnode_get_data(x)) != NULL) { |
|
859 |
enc = p; |
|
860 |
break; |
|
861 |
} |
|
31 | 862 |
} |
863 |
||
223 | 864 |
// Timestamp? |
865 |
if ((x = xmlnode_get_tag(packet->x, "x")) != NULL) { |
|
241 | 866 |
if ((p = xmlnode_get_attrib(x, "stamp")) != NULL) |
867 |
timestamp = from_iso8601(p, 1); |
|
223 | 868 |
} |
869 |
||
420
04a0b450380b
Display error code/message when receiving a message packet with "error" type
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
870 |
if (type && !strcmp(type, "error")) { |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
871 |
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
|
872 |
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
|
873 |
} |
165 | 874 |
if (from && body) |
223 | 875 |
gotmessage(type, from, body, enc, timestamp); |
52 | 876 |
if (tmp) |
159 | 877 |
g_free(tmp); |
31 | 878 |
} |
879 |
break; |
|
880 |
||
881 |
case JPACKET_IQ: |
|
882 |
if (!strcmp(type, "result")) { |
|
883 |
||
51 | 884 |
if ((p = xmlnode_get_attrib(packet->x, "id")) != NULL) { |
31 | 885 |
int iid = atoi(p); |
886 |
||
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
887 |
scr_LogPrint(LPRINT_DEBUG, "iid = %d", iid); |
31 | 888 |
if (iid == s_id) { |
889 |
if (!regmode) { |
|
890 |
if (jstate == STATE_GETAUTH) { |
|
51 | 891 |
if ((x = xmlnode_get_tag(packet->x, "query")) != NULL) |
31 | 892 |
if (!xmlnode_get_tag(x, "digest")) { |
893 |
jc->sid = 0; |
|
894 |
} |
|
895 |
||
896 |
s_id = atoi(jab_auth(jc)); |
|
897 |
jstate = STATE_SENDAUTH; |
|
898 |
} else { |
|
899 |
gotloggedin(); |
|
900 |
jstate = STATE_LOGGED; |
|
901 |
} |
|
902 |
} else { |
|
903 |
regdone = TRUE; |
|
904 |
} |
|
905 |
return; |
|
906 |
} |
|
907 |
||
908 |
if (!strcmp(p, "VCARDreq")) { |
|
909 |
x = xmlnode_get_firstchild(packet->x); |
|
910 |
if (!x) x = packet->x; |
|
911 |
||
912 |
//jhook.gotvcard(ic, x); TODO |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
913 |
scr_LogPrint(LPRINT_LOGNORM, "Got VCARD"); |
31 | 914 |
return; |
915 |
} else if (!strcmp(p, "versionreq")) { |
|
916 |
// jhook.gotversion(ic, packet->x); TODO |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
917 |
scr_LogPrint(LPRINT_LOGNORM, "Got version"); |
31 | 918 |
return; |
919 |
} |
|
920 |
} |
|
921 |
||
51 | 922 |
if ((x = xmlnode_get_tag(packet->x, "query")) != NULL) { |
31 | 923 |
p = xmlnode_get_attrib(x, "xmlns"); if (p) ns = p; |
924 |
||
925 |
if (!strcmp(ns, NS_ROSTER)) { |
|
926 |
gotroster(x); |
|
927 |
} else if (!strcmp(ns, NS_AGENTS)) { |
|
928 |
for (y = xmlnode_get_tag(x, "agent"); y; y = xmlnode_get_nextsibling(y)) { |
|
929 |
const char *alias = xmlnode_get_attrib(y, "jid"); |
|
930 |
||
931 |
if (alias) { |
|
932 |
const char *name = xmlnode_get_tag_data(y, "name"); |
|
933 |
const char *desc = xmlnode_get_tag_data(y, "description"); |
|
51 | 934 |
// const char *service = xmlnode_get_tag_data(y, "service"); TODO |
37 | 935 |
enum agtype atype = unknown; |
31 | 936 |
|
37 | 937 |
if (xmlnode_get_tag(y, "groupchat")) atype = groupchat; else |
938 |
if (xmlnode_get_tag(y, "transport")) atype = transport; else |
|
939 |
if (xmlnode_get_tag(y, "search")) atype = search; |
|
31 | 940 |
|
192 | 941 |
if (atype == transport) { |
942 |
char *cleanjid = jidtodisp(alias); |
|
194 | 943 |
roster_add_user(cleanjid, NULL, JABBER_AGENT_GROUP, |
944 |
ROSTER_TYPE_AGENT); |
|
192 | 945 |
g_free(cleanjid); |
946 |
} |
|
31 | 947 |
if (alias && name && desc) { |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
948 |
scr_LogPrint(LPRINT_LOGNORM, "Agent: %s / %s / %s / type=%d", |
37 | 949 |
alias, name, desc, atype); |
31 | 950 |
|
37 | 951 |
if (atype == search) { |
31 | 952 |
x = jutil_iqnew (JPACKET__GET, NS_SEARCH); |
953 |
xmlnode_put_attrib(x, "to", alias); |
|
954 |
xmlnode_put_attrib(x, "id", "Agent info"); |
|
955 |
jab_send(conn, x); |
|
956 |
xmlnode_free(x); |
|
957 |
} |
|
958 |
||
959 |
if (xmlnode_get_tag(y, "register")) { |
|
960 |
x = jutil_iqnew (JPACKET__GET, NS_REGISTER); |
|
961 |
xmlnode_put_attrib(x, "to", alias); |
|
962 |
xmlnode_put_attrib(x, "id", "Agent info"); |
|
963 |
jab_send(conn, x); |
|
964 |
xmlnode_free(x); |
|
965 |
} |
|
966 |
} |
|
967 |
} |
|
968 |
} |
|
969 |
||
37 | 970 |
/* |
31 | 971 |
if (find(jhook.agents.begin(), jhook.agents.end(), DEFAULT_CONFSERV) == jhook.agents.end()) |
972 |
jhook.agents.insert(jhook.agents.begin(), agent(DEFAULT_CONFSERV, DEFAULT_CONFSERV, |
|
973 |
_("Default Jabber conference server"), agent::atGroupchat)); |
|
974 |
||
975 |
*/ |
|
976 |
} else if (!strcmp(ns, NS_SEARCH) || !strcmp(ns, NS_REGISTER)) { |
|
977 |
p = xmlnode_get_attrib(packet->x, "id"); id = p ? p : (char*)""; |
|
978 |
||
979 |
if (!strcmp(id, "Agent info")) { |
|
980 |
// jhook.gotagentinfo(packet->x); TODO |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
981 |
scr_LogPrint(LPRINT_LOGNORM, "Got agent info"); |
31 | 982 |
} else if (!strcmp(id, "Lookup")) { |
983 |
// jhook.gotsearchresults(packet->x); TODO |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
984 |
scr_LogPrint(LPRINT_LOGNORM, "Got search results"); |
31 | 985 |
} else if (!strcmp(id, "Register")) { |
986 |
x = jutil_iqnew(JPACKET__GET, NS_REGISTER); |
|
987 |
xmlnode_put_attrib(x, "to", from); |
|
988 |
xmlnode_put_attrib(x, "id", "Agent info"); |
|
989 |
jab_send(conn, x); |
|
990 |
xmlnode_free(x); |
|
991 |
} |
|
992 |
||
993 |
} |
|
994 |
} |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
995 |
} else if (!strcmp(type, "get")) { |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
996 |
p = xmlnode_get_attrib(packet->x, "id"); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
997 |
if (p) { |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
998 |
xmlnode z; |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
999 |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1000 |
id = p; |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1001 |
x = xmlnode_new_tag("iq"); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1002 |
xmlnode_put_attrib(x, "type", "result"); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1003 |
xmlnode_put_attrib(x, "to", from); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1004 |
xmlnode_put_attrib(x, "id", id); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1005 |
xmlnode_put_attrib(x, "type", "error"); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1006 |
y = xmlnode_insert_tag(x, "error"); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1007 |
xmlnode_put_attrib(y, "code", "503"); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1008 |
xmlnode_put_attrib(y, "type", "cancel"); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1009 |
z = xmlnode_insert_tag(y, "feature-not-implemented"); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1010 |
xmlnode_put_attrib(z, "xmlns", |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1011 |
"urn:ietf:params:xml:ns:xmpp-stanzas"); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1012 |
jab_send(conn, x); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1013 |
xmlnode_free(x); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1014 |
} |
31 | 1015 |
} else if (!strcmp(type, "set")) { |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1016 |
/* FIXME: send error */ |
31 | 1017 |
} else if (!strcmp(type, "error")) { |
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
1018 |
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
|
1019 |
display_server_error(x); |
31 | 1020 |
} |
1021 |
break; |
|
1022 |
||
1023 |
case JPACKET_PRESENCE: |
|
426
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
1024 |
r = jidtodisp(from); |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
1025 |
if (type && !strcmp(type, "error")) { |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
1026 |
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
|
1027 |
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
|
1028 |
display_server_error(x); |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
1029 |
g_free(r); |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
1030 |
break; |
2706ef3e25a7
Better handling of server error codes/messages
Mikael Berthe <mikael@lilotux.net>
parents:
421
diff
changeset
|
1031 |
} |
31 | 1032 |
|
438
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1033 |
p = xmlnode_get_tag_data(packet->x, "priority"); |
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1034 |
if (p && *p) bpprio = (gchar)atoi(p); |
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1035 |
else bpprio = 0; |
31 | 1036 |
|
438
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1037 |
ust = available; |
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1038 |
p = xmlnode_get_tag_data(packet->x, "show"); |
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1039 |
if (p) { |
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1040 |
if (!strcmp(p, "away")) ust = away; |
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1041 |
else if (!strcmp(p, "dnd")) ust = dontdisturb; |
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1042 |
else if (!strcmp(p, "xa")) ust = notavail; |
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1043 |
else if (!strcmp(p, "chat")) ust = freeforchat; |
31 | 1044 |
} |
1045 |
||
321
59193965f2cb
Convert status messages to/from UTF-8
Mikael Berthe <mikael@lilotux.net>
parents:
319
diff
changeset
|
1046 |
if (type && !strcmp(type, "unavailable")) |
35 | 1047 |
ust = offline; |
31 | 1048 |
|
221 | 1049 |
if ((x = xmlnode_get_tag(packet->x, "status")) != NULL) |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1050 |
s = from_utf8(xmlnode_get_data(x)); |
221 | 1051 |
else |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1052 |
s = NULL; |
221 | 1053 |
|
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
311
diff
changeset
|
1054 |
// 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
|
1055 |
// status message is different |
438
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1056 |
rname = strchr(from, '/'); |
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1057 |
if (rname) rname++; |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1058 |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1059 |
// Check for MUC presence packet |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1060 |
// There can be multiple <x> tags!! |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1061 |
x = xmlnode_get_firstchild(packet->x); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1062 |
for ( ; x; x = xmlnode_get_nextsibling(x)) { |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1063 |
if ((p = xmlnode_get_name(x)) && !strcmp(p, "x")) |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1064 |
if ((p = xmlnode_get_attrib(x, "xmlns")) && |
468
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1065 |
!strcasecmp(p, "http://jabber.org/protocol/muc#user")) |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1066 |
break; |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1067 |
} |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1068 |
if (x) { // This is a MUC presence message |
468
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1069 |
enum imrole mbrole = role_none; |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1070 |
const char *mbrjid = NULL; |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1071 |
const char *mbnewnick = NULL; |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1072 |
GSList *room_elt; |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1073 |
|
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1074 |
// Add room if it doesn't already exist |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1075 |
room_elt = roster_add_user(r, NULL, NULL, ROSTER_TYPE_ROOM); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1076 |
|
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1077 |
// Get room member's information |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1078 |
y = xmlnode_get_tag(x, "item"); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1079 |
if (y) { |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1080 |
p = xmlnode_get_attrib(y, "role"); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1081 |
if (p) { |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1082 |
if (!strcmp(p, "moderator")) mbrole = role_moderator; |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1083 |
else if (!strcmp(p, "participant")) mbrole = role_participant; |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1084 |
else if (!strcmp(p, "visitor")) mbrole = role_visitor; |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1085 |
else if (!strcmp(p, "none")) mbrole = role_none; |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1086 |
else scr_LogPrint(LPRINT_LOGNORM, "<%s>: Unknown role \"%s\"", |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1087 |
from, p); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1088 |
} |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1089 |
p = xmlnode_get_attrib(y, "jid"); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1090 |
if (p) mbrjid = p; |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1091 |
p = xmlnode_get_attrib(y, "nick"); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1092 |
if (p) mbnewnick = p; |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1093 |
} |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1094 |
|
468
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1095 |
// Check for nickname change |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1096 |
y = xmlnode_get_tag(x, "status"); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1097 |
if (y && mbnewnick) { |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1098 |
p = xmlnode_get_attrib(y, "code"); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1099 |
if (p && !strcmp(p, "303")) { |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1100 |
gchar *mbuf; |
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
1101 |
gchar *newname_noutf8 = from_utf8(mbnewnick); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
1102 |
mbuf = g_strdup_printf("%s is now known as %s", rname, |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
1103 |
(newname_noutf8 ? newname_noutf8 : "(?)")); |
468
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1104 |
scr_WriteIncomingMessage(r, mbuf, 0, HBB_PREFIX_INFO); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1105 |
g_free(mbuf); |
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
1106 |
if (newname_noutf8) { |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
1107 |
buddy_resource_setname(room_elt->data, rname, newname_noutf8); |
470 | 1108 |
m = buddy_getnickname(room_elt->data); |
1109 |
if (m && !strcmp(rname, m)) |
|
1110 |
buddy_setnickname(room_elt->data, newname_noutf8); |
|
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
1111 |
g_free(newname_noutf8); |
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
1112 |
} |
468
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1113 |
} |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1114 |
} |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1115 |
|
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1116 |
// Check for departure/arrival |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1117 |
if (!mbnewnick && mbrole == role_none) { |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1118 |
gchar *mbuf = g_strdup_printf("%s has left", rname); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1119 |
scr_WriteIncomingMessage(r, mbuf, 0, HBB_PREFIX_INFO); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1120 |
g_free(mbuf); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1121 |
} else if (buddy_getstatus(room_elt->data, rname) == offline && |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1122 |
ust != offline) { |
470 | 1123 |
gchar *mbuf; |
1124 |
if (buddy_getnickname(room_elt->data) == NULL) { |
|
1125 |
buddy_setnickname(room_elt->data, rname); |
|
1126 |
mbuf = g_strdup_printf("You have joined as \"%s\"", rname); |
|
1127 |
} else { |
|
1128 |
mbuf = g_strdup_printf("%s has joined", rname); |
|
1129 |
} |
|
468
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1130 |
scr_WriteIncomingMessage(r, mbuf, 0, HBB_PREFIX_INFO); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1131 |
g_free(mbuf); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1132 |
} |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1133 |
|
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1134 |
// Update room member status |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1135 |
if (rname) |
468
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1136 |
roster_setstatus(r, rname, bpprio, ust, NULL, mbrole, mbrjid); |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1137 |
else |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1138 |
scr_LogPrint(LPRINT_LOGNORM, "MUC DBG: no rname!"); /* DBG */ |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1139 |
|
468
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1140 |
g_free(r); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1141 |
if (s) g_free(s); |
644b8bf9ca4d
Improve MUC presence messages handling
Mikael Berthe <mikael@lilotux.net>
parents:
461
diff
changeset
|
1142 |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1143 |
buddylist_build(); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1144 |
scr_DrawRoster(); |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1145 |
break; |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1146 |
} |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1147 |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1148 |
// Not a MUC message, so this is a regular buddy... |
438
b44be19d6229
Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents:
436
diff
changeset
|
1149 |
m = roster_getstatusmsg(r, rname); |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1150 |
if ((ust != roster_getstatus(r, rname)) || (s && (!m || strcmp(s, m)))) |
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1151 |
hk_statuschange(r, rname, bpprio, 0, ust, s); |
159 | 1152 |
g_free(r); |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
1153 |
if (s) g_free(s); |
31 | 1154 |
break; |
1155 |
||
1156 |
case JPACKET_S10N: |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
1157 |
scr_LogPrint(LPRINT_LOGNORM, "Received (un)subscription packet " |
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
1158 |
"(type=%s)", ((type) ? type : "")); |
31 | 1159 |
|
43 | 1160 |
if (!strcmp(type, "subscribe")) { |
91 | 1161 |
int isagent; |
1162 |
r = jidtodisp(from); |
|
1163 |
isagent = (roster_gettype(r) & ROSTER_TYPE_AGENT) != 0; |
|
159 | 1164 |
g_free(r); |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
1165 |
scr_LogPrint(LPRINT_LOGNORM, "isagent=%d", isagent); // XXX DBG |
91 | 1166 |
if (!isagent) { |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
1167 |
scr_LogPrint(LPRINT_LOGNORM, "<%s> wants to subscribe " |
43 | 1168 |
"to your network presence updates", from); |
125 | 1169 |
// FIXME we accept everybody... |
1170 |
x = jutil_presnew(JPACKET__SUBSCRIBED, from, 0); |
|
1171 |
jab_send(jc, x); |
|
1172 |
xmlnode_free(x); |
|
91 | 1173 |
} else { |
1174 |
x = jutil_presnew(JPACKET__SUBSCRIBED, from, 0); |
|
31 | 1175 |
jab_send(jc, x); |
1176 |
xmlnode_free(x); |
|
91 | 1177 |
} |
43 | 1178 |
} else if (!strcmp(type, "unsubscribe")) { |
1179 |
x = jutil_presnew(JPACKET__UNSUBSCRIBED, from, 0); |
|
31 | 1180 |
jab_send(jc, x); |
1181 |
xmlnode_free(x); |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
1182 |
scr_LogPrint(LPRINT_LOGNORM, "<%s> has unsubscribed to " |
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
1183 |
"your presence updates", from); |
31 | 1184 |
} |
1185 |
break; |
|
1186 |
||
1187 |
default: |
|
1188 |
break; |
|
1189 |
} |
|
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
468
diff
changeset
|
1190 |
g_free(from); |
31 | 1191 |
} |
1192 |