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