mcabber: mcabber/src/jabglue.c annotate

annotate mcabber/src/jabglue.c @ 751:4a7271e69694

Avoid reusing events ids

author	Mikael Berthe <mikael@lilotux.net>
date	Mon, 13 Mar 2006 23:41:29 +0100
parents	6c633adaae10
children	d2d5ee71e68c

rev	line source
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	1 /*
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	2 * jabglue.c -- Jabber protocol handling
393 f8f3c7493457 Whitespace cleanup Mikael Berthe <mikael@lilotux.net> parents: 387 diff changeset	3 *
699 ee03b56b93ee Update Copyright (2006) Mikael Berthe <mikael@lilotux.net> parents: 695 diff changeset	4 * Copyright (C) 2005, 2006 Mikael Berthe <bmikael@lists.lilotux.net>
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	5 * Parts come from the centericq project:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	6 * Copyright (C) 2002-2005 by Konstantin Klyagin <konst@konst.org.ua>
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	7 *
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	8 * This program is free software; you can redistribute it and/or modify
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	9 * it under the terms of the GNU General Public License as published by
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	10 * the Free Software Foundation; either version 2 of the License, or (at
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	11 * your option) any later version.
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	12 *
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	13 * This program is distributed in the hope that it will be useful, but
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	16 * General Public License for more details.
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	17 *
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	18 * You should have received a copy of the GNU General Public License
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	19 * along with this program; if not, write to the Free Software
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	21 * USA
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	22 */
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	23
237 c8df64f43625 [/trunk] Changeset 250 by mikael mikael parents: 231 diff changeset	24 #define _GNU_SOURCE /* We need glibc for strptime */
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	25 #include "../libjabber/jabber.h"
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	26 #include "jabglue.h"
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	27 #include "jab_priv.h"
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 52 diff changeset	28 #include "roster.h"
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	29 #include "screen.h"
113 8ac67e951eab [/trunk] Changeset 127 by mikael mikael parents: 112 diff changeset	30 #include "hooks.h"
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	31 #include "utils.h"
294 871e53769084 Allow one status message per Jabber status Mikael Berthe <mikael@lilotux.net> parents: 277 diff changeset	32 #include "settings.h"
441 51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	33 #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	34 #include "histolog.h"
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	35
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	36 #define JABBERPORT 5222
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	37 #define JABBERSSLPORT 5223
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	38
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	39 jconn jc;
578 b3ab662757a0 Fix connection issue Mikael Berthe <mikael@lilotux.net> parents: 577 diff changeset	40 enum enum_jstate jstate;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	41
353 3fe43f6daa5a Make imstatus2char a null-terminated string Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	42 char imstatus2char[imstatus_size+1] = {
3fe43f6daa5a Make imstatus2char a null-terminated string Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	43 '_', 'o', 'i', 'f', 'd', 'n', 'a', '\0'
46 f22e1d120606 [/trunk] Changeset 62 by mikael mikael parents: 43 diff changeset	44 };
f22e1d120606 [/trunk] Changeset 62 by mikael mikael parents: 43 diff changeset	45
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	46 static time_t LastPingTime;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	47 static unsigned int KeepaliveDelay;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	48 static enum imstatus mystatus = offline;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	49 static gchar *mystatusmsg;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	50 static unsigned char online;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	51
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	52 static void statehandler(jconn, int);
c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	53 static void packethandler(jconn, jpacket);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	54
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	55 static void logger(jconn j, int io, const char *buf)
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	56 {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	57 scr_LogPrint(LPRINT_DEBUG, "%03s: %s", ((io == 0) ? "OUT" : "IN"), buf);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	58 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	59
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	60 // jidtodisp(jid)
62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	61 // Strips the resource part from the jid
62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	62 // The caller should g_free the result after use.
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	63 char jidtodisp(const char jid)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	64 {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	65 char *ptr;
165 b4921dbf8709 [/trunk] Changeset 177 by mikael mikael parents: 164 diff changeset	66 char *alias;
b4921dbf8709 [/trunk] Changeset 177 by mikael mikael parents: 164 diff changeset	67
438 b44be19d6229 Handle multiple resources for the same buddy Mikael Berthe <mikael@lilotux.net> parents: 436 diff changeset	68 alias = g_strdup(jid);
165 b4921dbf8709 [/trunk] Changeset 177 by mikael mikael parents: 164 diff changeset	69
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	70 if ((ptr = strchr(alias, '/')) != NULL) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	71 *ptr = 0;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	72 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	73 return alias;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	74 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	75
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	76 char compose_jid(const char username, const char *servername,
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	77 const char *resource)
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	78 {
393 f8f3c7493457 Whitespace cleanup Mikael Berthe <mikael@lilotux.net> parents: 387 diff changeset	79 char *jid = g_new(char, 3 +
f8f3c7493457 Whitespace cleanup Mikael Berthe <mikael@lilotux.net> parents: 387 diff changeset	80 strlen(username) + strlen(servername) + strlen(resource));
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	81 strcpy(jid, username);
403 17aa60c6dc63 Allow a different server name than the jid domain name Mikael Berthe <mikael@lilotux.net> parents: 393 diff changeset	82 if (!strchr(jid, '@')) {
17aa60c6dc63 Allow a different server name than the jid domain name Mikael Berthe <mikael@lilotux.net> parents: 393 diff changeset	83 strcat(jid, "@");
17aa60c6dc63 Allow a different server name than the jid domain name Mikael Berthe <mikael@lilotux.net> parents: 393 diff changeset	84 strcat(jid, servername);
17aa60c6dc63 Allow a different server name than the jid domain name Mikael Berthe <mikael@lilotux.net> parents: 393 diff changeset	85 }
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	86 strcat(jid, "/");
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	87 strcat(jid, resource);
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	88 return jid;
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	89 }
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	90
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	91 inline unsigned char jb_getonline(void)
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	92 {
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	93 return online;
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	94 }
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	95
403 17aa60c6dc63 Allow a different server name than the jid domain name Mikael Berthe <mikael@lilotux.net> parents: 393 diff changeset	96 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	97 int ssl, const char *pass)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	98 {
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	99 char *utf8_jid;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	100 if (!port) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	101 if (ssl)
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	102 port = JABBERSSLPORT;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	103 else
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	104 port = JABBERPORT;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	105 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	106
357 e8adc3c96e68 Better messages for server connection states Mikael Berthe <mikael@lilotux.net> parents: 353 diff changeset	107 jb_disconnect();
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	108
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	109 utf8_jid = to_utf8(jid);
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	110 if (!utf8_jid) return jc;
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	111
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	112 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	113 g_free(utf8_jid);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	114
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	115 /* 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	116 jab_logger(jc, logger);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	117 jab_packet_handler(jc, &packethandler);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	118 jab_state_handler(jc, &statehandler);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	119
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	120 if (jc && jc->user) {
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	121 online = TRUE;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	122 jstate = STATE_CONNECTING;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	123 statehandler(0, -1);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	124 jab_start(jc);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	125 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	126
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	127 return jc;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	128 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	129
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	130 void jb_disconnect(void)
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	131 {
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	132 if (!jc) return;
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	133
668 d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	134 if (online) {
d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	135 // Announce it to everyone else
d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	136 jb_setstatus(offline, NULL, "");
d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	137 // End the XML flow
d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	138 jb_send_raw("</stream:stream>");
d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	139 }
634 f3c05d5fe459 Send "</stream:stream>" when disconnecting from the server Mikael Berthe <mikael@lilotux.net> parents: 633 diff changeset	140
f3c05d5fe459 Send "</stream:stream>" when disconnecting from the server Mikael Berthe <mikael@lilotux.net> parents: 633 diff changeset	141 // Announce it to the user
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	142 statehandler(jc, JCONN_STATE_OFF);
416 48e7808c4191 Allow offline status message Mikael Berthe <mikael@lilotux.net> parents: 411 diff changeset	143
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	144 jab_delete(jc);
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	145 jc = NULL;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	146 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	147
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	148 inline void jb_reset_keepalive()
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	149 {
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	150 time(&LastPingTime);
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	151 }
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	152
436 802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	153 void jb_send_raw(const char *str)
802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	154 {
461 1d8f5b3a5f2b Convert /rawxml argument to UTF8 Mikael Berthe <mikael@lilotux.net> parents: 449 diff changeset	155 if (jc && online && str)
436 802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	156 jab_send_raw(jc, str);
802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	157 }
802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	158
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	159 void jb_keepalive()
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	160 {
113 8ac67e951eab [/trunk] Changeset 127 by mikael mikael parents: 112 diff changeset	161 if (jc && online)
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	162 jab_send_raw(jc, " \t ");
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	163 jb_reset_keepalive();
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	164 }
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	165
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	166 void jb_set_keepalive_delay(unsigned int delay)
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	167 {
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	168 KeepaliveDelay = delay;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	169 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	170
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	171 void jb_main()
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	172 {
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	173 time_t now;
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	174 static time_t last_iqs_check = 0;
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	175
406 a9dd91e08eb3 Add usleep() calls Mikael Berthe <mikael@lilotux.net> parents: 403 diff changeset	176 if (!online) {
419 2f9852610cf4 Small code review Mikael Berthe <mikael@lilotux.net> parents: 416 diff changeset	177 safe_usleep(10000);
406 a9dd91e08eb3 Add usleep() calls Mikael Berthe <mikael@lilotux.net> parents: 403 diff changeset	178 return;
a9dd91e08eb3 Add usleep() calls Mikael Berthe <mikael@lilotux.net> parents: 403 diff changeset	179 }
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	180
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	181 if (jc && jc->state == JCONN_STATE_CONNECTING) {
419 2f9852610cf4 Small code review Mikael Berthe <mikael@lilotux.net> parents: 416 diff changeset	182 safe_usleep(75000);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	183 jab_start(jc);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	184 return;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	185 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	186
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	187 jab_poll(jc, 50);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	188
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	189 if (jstate == STATE_CONNECTING) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	190 if (jc) {
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	191 eviqs *iqn;
686 98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	192 xmlnode z;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	193
686 98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	194 iqn = iqs_new(JPACKET__GET, NS_AUTH, "auth", IQS_DEFAULT_TIMEOUT);
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	195 iqn->callback = &iqscallback_auth;
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	196
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	197 z = xmlnode_insert_tag(xmlnode_get_tag(iqn->xmldata, "query"),
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	198 "username");
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	199 xmlnode_insert_cdata(z, jc->user->user, (unsigned) -1);
686 98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	200 jab_send(jc, iqn->xmldata);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	201
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	202 jstate = STATE_GETAUTH;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	203 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	204
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	205 if (!jc \|\| jc->state == JCONN_STATE_OFF) {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	206 scr_LogPrint(LPRINT_LOGNORM, "Unable to connect to the server");
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	207 online = FALSE;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	208 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	209 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	210
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	211 if (!jc) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	212 statehandler(jc, JCONN_STATE_OFF);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	213 } else if (jc->state == JCONN_STATE_OFF \|\| jc->fd == -1) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	214 statehandler(jc, JCONN_STATE_OFF);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	215 }
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	216
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	217 time(&now);
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	218
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	219 // Check for IQ requests timeouts
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	220 if (now > last_iqs_check + 20) {
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	221 iqs_check_timeout(now);
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	222 last_iqs_check = now;
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	223 }
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	224
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	225 // Keepalive
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	226 if (KeepaliveDelay) {
735 2f027806cd48 Some code cleanup Mikael Berthe <mikael@lilotux.net> parents: 732 diff changeset	227 if (now > LastPingTime + (time_t)KeepaliveDelay)
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	228 jb_keepalive();
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	229 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	230 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	231
116 1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	232 inline enum imstatus jb_getstatus()
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	233 {
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	234 return mystatus;
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	235 }
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	236
519 5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	237 inline const char *jb_getstatusmsg()
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	238 {
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	239 return mystatusmsg;
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	240 }
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	241
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	242 static void roompresence(gpointer room, void *presencedata)
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	243 {
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	244 const char *jid;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	245 const char *nickname;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	246 char *to;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	247 struct T_presence *pres = presencedata;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	248
652 b243d3b3ff1b We do not need buddy_isresource() anymore Mikael Berthe <mikael@lilotux.net> parents: 651 diff changeset	249 if (!buddy_getinsideroom(room))
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	250 return;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	251
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	252 jid = buddy_getjid(room);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	253 if (!jid) return;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	254 nickname = buddy_getnickname(room);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	255 if (!nickname) return;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	256
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	257 to = g_strdup_printf("%s/%s", jid, nickname);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	258 jb_setstatus(pres->st, to, pres->msg);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	259 g_free(to);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	260 }
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	261
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	262 // presnew(status, recipient, message)
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	263 // Create an xmlnode with default presence attributes
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	264 // Note: the caller must free the node after use
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	265 static xmlnode presnew(enum imstatus st, const char *recipient,
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	266 const char *msg)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	267 {
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	268 unsigned int prio;
116 1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	269 xmlnode x;
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	270 gchar *utf8_recipient = to_utf8(recipient);
116 1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	271
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	272 x = jutil_presnew(JPACKET__UNKNOWN, 0, 0);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	273
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	274 if (utf8_recipient) {
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	275 xmlnode_put_attrib(x, "to", utf8_recipient);
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	276 g_free(utf8_recipient);
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	277 }
444 5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	278
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	279 switch(st) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	280 case away:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	281 xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "away",
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	282 (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	283 break;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	284
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	285 case dontdisturb:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	286 xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "dnd",
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	287 (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	288 break;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	289
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	290 case freeforchat:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	291 xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "chat",
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	292 (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	293 break;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	294
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	295 case notavail:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	296 xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "xa",
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	297 (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	298 break;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	299
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	300 case invisible:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	301 xmlnode_put_attrib(x, "type", "invisible");
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	302 break;
51 85bbc6ed3796 [/trunk] Changeset 67 by mikael mikael parents: 46 diff changeset	303
118 1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	304 case offline:
1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	305 xmlnode_put_attrib(x, "type", "unavailable");
1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	306 break;
1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	307
51 85bbc6ed3796 [/trunk] Changeset 67 by mikael mikael parents: 46 diff changeset	308 default:
85bbc6ed3796 [/trunk] Changeset 67 by mikael mikael parents: 46 diff changeset	309 break;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	310 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	311
531 aee9a279a0f3 Allow changing priority on the fly Mikael Berthe <mikael@lilotux.net> parents: 527 diff changeset	312 prio = settings_opt_get_int("priority");
272 7f2e61392b2e Add resource priority option mikael@matrix parents: 244 diff changeset	313 if (prio) {
7f2e61392b2e Add resource priority option mikael@matrix parents: 244 diff changeset	314 char strprio[8];
7f2e61392b2e Add resource priority option mikael@matrix parents: 244 diff changeset	315 snprintf(strprio, 8, "%u", prio);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	316 xmlnode_insert_cdata(xmlnode_insert_tag(x, "priority"),
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	317 strprio, (unsigned) -1);
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	318 }
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	319
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	320 if (msg) {
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	321 gchar *utf8_msg = to_utf8(msg);
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	322 xmlnode_insert_cdata(xmlnode_insert_tag(x, "status"), utf8_msg,
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	323 (unsigned) -1);
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	324 g_free(utf8_msg);
272 7f2e61392b2e Add resource priority option mikael@matrix parents: 244 diff changeset	325 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	326
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	327 return x;
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	328 }
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	329
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	330 void jb_setstatus(enum imstatus st, const char recipient, const char msg)
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	331 {
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	332 xmlnode x;
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	333 struct T_presence room_presence;
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	334
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	335 if (!online) return;
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	336
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	337 if (msg) {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	338 // The status message has been specified. We'll use it, unless it is
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	339 // "-" which is a special case (option meaning "no status message").
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	340 if (!strcmp(msg, "-"))
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	341 msg = "";
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	342 } else {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	343 // No status message specified; we'll use:
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	344 // a) the default status message (if provided by the user);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	345 // b) the current status message;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	346 // c) no status message (i.e. an empty one).
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	347 msg = settings_get_status_msg(st);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	348 if (!msg) {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	349 if (mystatusmsg)
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	350 msg = mystatusmsg;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	351 else
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	352 msg = "";
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	353 }
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	354 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	355
677 633a0522bd37 Using "/status invisible -" did not clear the status message Mikael Berthe <mikael@lilotux.net> parents: 671 diff changeset	356 x = presnew(st, recipient, (st != invisible ? msg : NULL));
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	357 jab_send(jc, x);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	358 xmlnode_free(x);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	359
444 5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	360 // If we didn't change our _global_ status, we are done
5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	361 if (recipient) return;
5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	362
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	363 // Send presence to chatrooms
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	364 if (st != invisible) {
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	365 room_presence.st = st;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	366 room_presence.msg = msg;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	367 foreach_buddy(ROSTER_TYPE_ROOM, &roompresence, &room_presence);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	368 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	369
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	370 // We'll need to update the roster if we switch to/from offline because
faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	371 // we don't know the presences of buddies when offline...
faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	372 if (mystatus == offline \|\| st == offline)
faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	373 update_roster = TRUE;
faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	374
677 633a0522bd37 Using "/status invisible -" did not clear the status message Mikael Berthe <mikael@lilotux.net> parents: 671 diff changeset	375 hk_mystatuschange(0, mystatus, st, (st != invisible ? msg : ""));
116 1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	376 mystatus = st;
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	377 if (msg != mystatusmsg) {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	378 if (mystatusmsg)
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	379 g_free(mystatusmsg);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	380 if (*msg)
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	381 mystatusmsg = g_strdup(msg);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	382 else
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	383 mystatusmsg = NULL;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	384 }
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 706 diff changeset	385
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 706 diff changeset	386 // Update status line
724 264375fe7159 Fix a roster refresh issue Mikael Berthe <mikael@lilotux.net> parents: 721 diff changeset	387 scr_UpdateMainStatus(TRUE);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	388 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	389
475 fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	390 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	391 const char *subject)
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	392 {
475 fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	393 xmlnode x;
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	394 gchar *strtype;
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	395 gchar *utf8_jid;
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	396 gchar *buffer;
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	397
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	398 if (!online) return;
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	399
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	400 if (type == ROSTER_TYPE_ROOM)
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	401 strtype = TMSG_GROUPCHAT;
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	402 else
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	403 strtype = TMSG_CHAT;
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	404
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	405 buffer = to_utf8(text);
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	406 utf8_jid = to_utf8(jid); // Resource can require UTF-8
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	407
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	408 x = jutil_msgnew(strtype, utf8_jid, NULL, (char*)buffer);
475 fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	409 if (subject) {
fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	410 xmlnode y;
fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	411 char *bs = to_utf8(subject);
fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	412 y = xmlnode_insert_tag(x, "subject");
fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	413 xmlnode_insert_cdata(y, bs, (unsigned) -1);
fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	414 if (bs) g_free(bs);
fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	415 }
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	416 jab_send(jc, x);
a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	417 xmlnode_free(x);
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	418
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	419 if (buffer) g_free(buffer);
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	420 if (utf8_jid) g_free(utf8_jid);
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	421
114 065d8368c36b [/trunk] Changeset 128 by mikael mikael parents: 113 diff changeset	422 jb_reset_keepalive();
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	423 }
a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	424
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	425 // jb_subscr_send_auth(jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	426 // Allow jid to receive our presence updates
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	427 void jb_subscr_send_auth(const char *jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	428 {
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	429 xmlnode x;
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	430 char *utf8_jid = to_utf8(jid);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	431
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	432 x = jutil_presnew(JPACKET__SUBSCRIBED, utf8_jid, NULL);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	433 jab_send(jc, x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	434 xmlnode_free(x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	435 g_free(utf8_jid);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	436 }
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	437
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	438 // jb_subscr_cancel_auth(jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	439 // Cancel jid's subscription to our presence updates
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	440 void jb_subscr_cancel_auth(const char *jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	441 {
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	442 xmlnode x;
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	443 char *utf8_jid = to_utf8(jid);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	444
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	445 x = jutil_presnew(JPACKET__UNSUBSCRIBED, utf8_jid, NULL);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	446 jab_send(jc, x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	447 xmlnode_free(x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	448 g_free(utf8_jid);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	449 }
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	450
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	451 // jb_subscr_request_auth(jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	452 // Request a subscription to jid's presence updates
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	453 void jb_subscr_request_auth(const char *jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	454 {
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	455 xmlnode x;
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	456 char *utf8_jid = to_utf8(jid);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	457
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	458 x = jutil_presnew(JPACKET__SUBSCRIBE, utf8_jid, NULL);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	459 jab_send(jc, x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	460 xmlnode_free(x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	461 g_free(utf8_jid);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	462 }
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	463
213 4fcdbfdf7c20 [/trunk] Changeset 225 by mikael mikael parents: 208 diff changeset	464 // Note: the caller should check the jid is correct
244 5f8b529412bd [/trunk] Changeset 257 by mikael mikael parents: 241 diff changeset	465 void jb_addbuddy(const char jid, const char name, const char *group)
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	466 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	467 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	468 eviqs *iqn;
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	469 char *cleanjid;
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	470
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	471 if (!online) return;
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	472
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	473 cleanjid = jidtodisp(jid);
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	474
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	475 // We don't check if the jabber user already exists in the roster,
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	476 // because it allows to re-ask for notification.
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	477
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	478 iqn = iqs_new(JPACKET__SET, NS_ROSTER, NULL, IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	479 y = xmlnode_insert_tag(xmlnode_get_tag(iqn->xmldata, "query"), "item");
628 454399f026fa Fix a bug in jb_addbuddy() Mikael Berthe <mikael@lilotux.net> parents: 625 diff changeset	480
454399f026fa Fix a bug in jb_addbuddy() Mikael Berthe <mikael@lilotux.net> parents: 625 diff changeset	481 xmlnode_put_attrib(y, "jid", cleanjid);
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	482
244 5f8b529412bd [/trunk] Changeset 257 by mikael mikael parents: 241 diff changeset	483 if (name) {
387 2bbeef7b4fdd Do non UTF8-encode/decode null pointers Mikael Berthe <mikael@lilotux.net> parents: 384 diff changeset	484 gchar *name_utf8 = to_utf8(name);
628 454399f026fa Fix a bug in jb_addbuddy() Mikael Berthe <mikael@lilotux.net> parents: 625 diff changeset	485 xmlnode_put_attrib(y, "name", name_utf8);
383 39c5da51b387 Remove utf8 files, use Glib Mikael Berthe <mikael@lilotux.net> parents: 374 diff changeset	486 g_free(name_utf8);
244 5f8b529412bd [/trunk] Changeset 257 by mikael mikael parents: 241 diff changeset	487 }
5f8b529412bd [/trunk] Changeset 257 by mikael mikael parents: 241 diff changeset	488
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	489 if (group) {
387 2bbeef7b4fdd Do non UTF8-encode/decode null pointers Mikael Berthe <mikael@lilotux.net> parents: 384 diff changeset	490 char *group_utf8 = to_utf8(group);
628 454399f026fa Fix a bug in jb_addbuddy() Mikael Berthe <mikael@lilotux.net> parents: 625 diff changeset	491 z = xmlnode_insert_tag(y, "group");
213 4fcdbfdf7c20 [/trunk] Changeset 225 by mikael mikael parents: 208 diff changeset	492 xmlnode_insert_cdata(z, group_utf8, (unsigned) -1);
383 39c5da51b387 Remove utf8 files, use Glib Mikael Berthe <mikael@lilotux.net> parents: 374 diff changeset	493 g_free(group_utf8);
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	494 }
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	495
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	496 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	497 iqs_del(iqn->id); // XXX
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	498
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	499 jb_subscr_request_auth(cleanjid);
612 789ec6aed764 Respect RFC 3921 order advice Mikael Berthe <mikael@lilotux.net> parents: 611 diff changeset	500
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	501 roster_add_user(cleanjid, name, group, ROSTER_TYPE_USER, sub_pending);
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	502 g_free(cleanjid);
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	503 buddylist_build();
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	504
244 5f8b529412bd [/trunk] Changeset 257 by mikael mikael parents: 241 diff changeset	505 update_roster = TRUE;
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	506 }
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	507
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	508 void jb_delbuddy(const char *jid)
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	509 {
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	510 xmlnode x, y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	511 eviqs *iqn;
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	512 char *cleanjid;
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	513
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	514 if (!online) return;
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	515
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	516 cleanjid = jidtodisp(jid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	517
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	518 // If the current buddy is an agent, unsubscribe from it
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	519 if (roster_gettype(cleanjid) == ROSTER_TYPE_AGENT) {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	520 scr_LogPrint(LPRINT_LOGNORM, "Unregistering from the %s agent", cleanjid);
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	521
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	522 iqn = iqs_new(JPACKET__SET, NS_REGISTER, NULL, IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	523 xmlnode_put_attrib(iqn->xmldata, "to", cleanjid);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	524 y = xmlnode_get_tag(iqn->xmldata, "query");
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	525 xmlnode_insert_tag(y, "remove");
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	526 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	527 iqs_del(iqn->id); // XXX
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	528 }
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	529
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	530 // Cancel the subscriptions
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	531 x = jutil_presnew(JPACKET__UNSUBSCRIBED, cleanjid, 0); // Cancel "from"
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	532 jab_send(jc, x);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	533 xmlnode_free(x);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	534 x = jutil_presnew(JPACKET__UNSUBSCRIBE, cleanjid, 0); // Cancel "to"
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	535 jab_send(jc, x);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	536 xmlnode_free(x);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	537
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	538 // Ask for removal from roster
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	539 iqn = iqs_new(JPACKET__SET, NS_ROSTER, NULL, IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	540 y = xmlnode_get_tag(iqn->xmldata, "query");
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	541 z = xmlnode_insert_tag(y, "item");
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	542 xmlnode_put_attrib(z, "jid", cleanjid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	543 xmlnode_put_attrib(z, "subscription", "remove");
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	544 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	545 iqs_del(iqn->id); // XXX
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	546
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	547 roster_del_user(cleanjid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	548 g_free(cleanjid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	549 buddylist_build();
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	550
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	551 update_roster = TRUE;
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	552 }
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	553
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	554 void jb_updatebuddy(const char jid, const char name, const char *group)
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	555 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	556 xmlnode y;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	557 eviqs *iqn;
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	558 char *cleanjid;
383 39c5da51b387 Remove utf8 files, use Glib Mikael Berthe <mikael@lilotux.net> parents: 374 diff changeset	559 gchar *name_utf8;
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	560
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	561 if (!online) return;
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	562
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	563 // XXX We should check name's and group's correctness
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	564
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	565 cleanjid = jidtodisp(jid);
387 2bbeef7b4fdd Do non UTF8-encode/decode null pointers Mikael Berthe <mikael@lilotux.net> parents: 384 diff changeset	566 name_utf8 = to_utf8(name);
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	567
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	568 iqn = iqs_new(JPACKET__SET, NS_ROSTER, NULL, IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	569 y = xmlnode_insert_tag(xmlnode_get_tag(iqn->xmldata, "query"), "item");
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	570 xmlnode_put_attrib(y, "jid", cleanjid);
213 4fcdbfdf7c20 [/trunk] Changeset 225 by mikael mikael parents: 208 diff changeset	571 xmlnode_put_attrib(y, "name", name_utf8);
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	572
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	573 if (group) {
387 2bbeef7b4fdd Do non UTF8-encode/decode null pointers Mikael Berthe <mikael@lilotux.net> parents: 384 diff changeset	574 gchar *group_utf8 = to_utf8(group);
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	575 y = xmlnode_insert_tag(y, "group");
213 4fcdbfdf7c20 [/trunk] Changeset 225 by mikael mikael parents: 208 diff changeset	576 xmlnode_insert_cdata(y, group_utf8, (unsigned) -1);
383 39c5da51b387 Remove utf8 files, use Glib Mikael Berthe <mikael@lilotux.net> parents: 374 diff changeset	577 g_free(group_utf8);
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	578 }
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	579
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	580 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	581 iqs_del(iqn->id); // XXX
383 39c5da51b387 Remove utf8 files, use Glib Mikael Berthe <mikael@lilotux.net> parents: 374 diff changeset	582 g_free(name_utf8);
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	583 g_free(cleanjid);
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	584 }
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	585
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	586 void jb_request(const char *jid, enum iqreq_type reqtype)
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 686 diff changeset	587 {
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	588 GSList *resources;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	589 GSList *roster_elt;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	590
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	591 if (reqtype == iqreq_none) return;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	592
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	593 if (strchr(jid, '/')) {
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	594 // This is a full JID
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	595 if (reqtype == iqreq_version) {
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	596 request_version(jid);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	597 scr_LogPrint(LPRINT_NORMAL, "Sent version request to <%s>", jid);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	598 } else if (reqtype == iqreq_time) {
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	599 request_time(jid);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	600 scr_LogPrint(LPRINT_NORMAL, "Sent time request to <%s>", jid);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	601 }
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	602 return;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	603 }
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	604
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	605 // The resource has not been specified
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	606 roster_elt = roster_find(jid, jidsearch, ROSTER_TYPE_USER\|ROSTER_TYPE_ROOM);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	607 if (!roster_elt) {
695 c299035ccb9f Fix up jb_request(), when the resource is unknown Mikael Berthe <mikael@lilotux.net> parents: 693 diff changeset	608 scr_LogPrint(LPRINT_NORMAL, "No known resource for <%s>...", jid);
c299035ccb9f Fix up jb_request(), when the resource is unknown Mikael Berthe <mikael@lilotux.net> parents: 693 diff changeset	609 request_version(jid); // Let's send a request anyway...
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	610 return;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	611 }
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	612
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	613 // Send a request to each resource
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	614 resources = buddy_getresources(roster_elt->data);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	615 for ( ; resources ; resources = g_slist_next(resources) ) {
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	616 gchar *fulljid;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	617 fulljid = g_strdup_printf("%s/%s", jid, (char*)resources->data);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	618 if (reqtype == iqreq_version) {
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	619 request_version(fulljid);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	620 scr_LogPrint(LPRINT_NORMAL, "Sent version request to <%s>", fulljid);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	621 } else if (reqtype == iqreq_time) {
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	622 request_time(fulljid);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	623 scr_LogPrint(LPRINT_NORMAL, "Sent time request to <%s>", fulljid);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	624 }
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	625 g_free(fulljid);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	626 }
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 686 diff changeset	627 }
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 686 diff changeset	628
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	629 // Join a MUC room
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	630 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	631 {
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	632 xmlnode x, y;
643 dd73c3dad815 Fix double UTF-8 encoding when joining a room Mikael Berthe <mikael@lilotux.net> parents: 642 diff changeset	633 gchar *roomid;
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	634 GSList *room_elt;
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	635
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	636 if (!online \|\| !room) return;
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	637 if (!nickname) return;
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	638
643 dd73c3dad815 Fix double UTF-8 encoding when joining a room Mikael Berthe <mikael@lilotux.net> parents: 642 diff changeset	639 roomid = g_strdup_printf("%s/%s", room, nickname);
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	640 if (check_jid_syntax(roomid)) {
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	641 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	642 nickname);
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	643 g_free(roomid);
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	644 return;
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	645 }
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	646
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	647 room_elt = roster_find(room, jidsearch, ROSTER_TYPE_USER\|ROSTER_TYPE_ROOM);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	648 // Add room if it doesn't already exist
649 3ad6675caaf1 MUC: fix join bug when the conference is in the roster Mikael Berthe <mikael@lilotux.net> parents: 645 diff changeset	649 if (!room_elt) {
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	650 room_elt = roster_add_user(room, NULL, NULL, ROSTER_TYPE_ROOM, sub_none);
649 3ad6675caaf1 MUC: fix join bug when the conference is in the roster Mikael Berthe <mikael@lilotux.net> parents: 645 diff changeset	651 } else {
3ad6675caaf1 MUC: fix join bug when the conference is in the roster Mikael Berthe <mikael@lilotux.net> parents: 645 diff changeset	652 // Make sure this is a room (it can be a conversion user->room)
3ad6675caaf1 MUC: fix join bug when the conference is in the roster Mikael Berthe <mikael@lilotux.net> parents: 645 diff changeset	653 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);
3ad6675caaf1 MUC: fix join bug when the conference is in the roster Mikael Berthe <mikael@lilotux.net> parents: 645 diff changeset	654 }
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	655 // If insideroom is TRUE, this is a nickname change and we don't care here
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	656 if (!buddy_getinsideroom(room_elt->data)) {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	657 // We're trying to enter a room
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	658 buddy_setnickname(room_elt->data, nickname);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	659 }
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	660
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	661 // Send the XML request
535 b407d19c39ab Set status correctly when joining a room Mikael Berthe <mikael@lilotux.net> parents: 534 diff changeset	662 x = presnew(mystatus, roomid, mystatusmsg);
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	663 y = xmlnode_insert_tag(x, "x");
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	664 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	665
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	666 jab_send(jc, x);
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	667 xmlnode_free(x);
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	668 jb_reset_keepalive();
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	669 g_free(roomid);
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	670 }
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	671
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	672 // Unlock a MUC room
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	673 // room syntax: "room@server"
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	674 void jb_room_unlock(const char *room)
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	675 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	676 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	677 eviqs *iqn;
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	678
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	679 if (!online \|\| !room) return;
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	680
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	681 iqn = iqs_new(JPACKET__SET, "http://jabber.org/protocol/muc#owner",
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	682 "unlock", IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	683 xmlnode_put_attrib(iqn->xmldata, "to", room);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	684 y = xmlnode_get_tag(iqn->xmldata, "query");
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	685 z = xmlnode_insert_tag(y, "x");
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	686 xmlnode_put_attrib(z, "xmlns", "jabber:x:data");
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	687 xmlnode_put_attrib(z, "type", "submit");
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	688
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	689 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	690 iqs_del(iqn->id); // XXX
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	691 jb_reset_keepalive();
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	692 }
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	693
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	694 // Destroy a MUC room
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	695 // room syntax: "room@server"
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	696 void jb_room_destroy(const char room, const char venue, const char *reason)
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	697 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	698 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	699 eviqs *iqn;
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	700
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	701 if (!online \|\| !room) return;
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	702
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	703 iqn = iqs_new(JPACKET__SET, "http://jabber.org/protocol/muc#owner",
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	704 "destroy", IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	705 xmlnode_put_attrib(iqn->xmldata, "to", room);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	706 y = xmlnode_get_tag(iqn->xmldata, "query");
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	707 z = xmlnode_insert_tag(y, "destroy");
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	708
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	709 if (venue && *venue)
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	710 xmlnode_put_attrib(z, "jid", venue);
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	711
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	712 if (reason) {
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	713 gchar *utf8_reason = to_utf8(reason);
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	714 y = xmlnode_insert_tag(z, "reason");
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	715 xmlnode_insert_cdata(y, utf8_reason, (unsigned) -1);
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	716 g_free(utf8_reason);
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	717 }
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	718
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	719 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	720 iqs_del(iqn->id); // XXX
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	721 jb_reset_keepalive();
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	722 }
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	723
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	724 // Change role or affiliation of a MUC user
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	725 // room syntax: "room@server"
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	726 // Either the jid or the nickname must be set (when banning, only the jid is
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	727 // allowed)
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	728 // ra: new role or affiliation
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	729 // (ex. role none for kick, affil outcast for ban...)
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	730 // The reason can be null
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	731 // Return 0 if everything is ok
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	732 int jb_room_setattrib(const char roomid, const char jid, const char *nick,
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	733 struct role_affil ra, const char *reason)
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	734 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	735 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	736 eviqs *iqn;
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	737
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	738 if (!online \|\| !roomid) return 1;
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	739 if (!jid && !nick) return 1;
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	740
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	741 if (check_jid_syntax((char*)roomid)) {
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	742 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", roomid);
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	743 return 1;
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	744 }
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	745 if (jid && check_jid_syntax((char*)jid)) {
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	746 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", jid);
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	747 return 1;
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	748 }
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	749
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	750 if (ra.type == type_affil && ra.val.affil == affil_outcast && !jid)
572 afc2bd38b15c Implement affiliations handling, add "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 569 diff changeset	751 return 1; // Shouldn't happen (jid mandatory when banning)
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	752
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	753 iqn = iqs_new(JPACKET__SET, "http://jabber.org/protocol/muc#admin",
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	754 "roleaffil", IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	755 xmlnode_put_attrib(iqn->xmldata, "to", roomid);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	756 xmlnode_put_attrib(iqn->xmldata, "type", "set");
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	757 y = xmlnode_get_tag(iqn->xmldata, "query");
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	758 z = xmlnode_insert_tag(y, "item");
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	759
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	760 if (jid) {
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	761 gchar *utf8_jid = to_utf8(jid);
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	762 xmlnode_put_attrib(z, "jid", utf8_jid);
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	763 if (utf8_jid) g_free(utf8_jid);
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	764 } else { // nick
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	765 gchar *utf8_nickname = to_utf8(nick);
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	766 xmlnode_put_attrib(z, "nick", utf8_nickname);
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	767 g_free(utf8_nickname);
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	768 }
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	769
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	770 if (ra.type == type_affil)
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	771 xmlnode_put_attrib(z, "affiliation", straffil[ra.val.affil]);
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	772 else if (ra.type == type_role)
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	773 xmlnode_put_attrib(z, "role", strrole[ra.val.role]);
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	774
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	775 if (reason) {
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	776 gchar *utf8_reason = to_utf8(reason);
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	777 y = xmlnode_insert_tag(z, "reason");
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	778 xmlnode_insert_cdata(y, utf8_reason, (unsigned) -1);
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	779 g_free(utf8_reason);
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	780 }
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	781
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	782 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	783 iqs_del(iqn->id); // XXX
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	784 jb_reset_keepalive();
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	785
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	786 return 0;
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	787 }
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	788
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	789 // Invite a user to a MUC room
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	790 // room syntax: "room@server"
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	791 // reason can be null.
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	792 void jb_room_invite(const char room, const char jid, const char *reason)
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	793 {
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	794 xmlnode x, y, z;
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	795 gchar *utf8_jid;
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	796
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	797 if (!online \|\| !room \|\| !jid) return;
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	798
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	799 x = jutil_msgnew(NULL, (char*)room, NULL, NULL);
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	800
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	801 y = xmlnode_insert_tag(x, "x");
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	802 xmlnode_put_attrib(y, "xmlns", "http://jabber.org/protocol/muc#user");
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	803
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	804 utf8_jid = to_utf8(jid); // Resource can require UTF-8
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	805 z = xmlnode_insert_tag(y, "invite");
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	806 xmlnode_put_attrib(z, "to", utf8_jid);
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	807 if (utf8_jid) g_free(utf8_jid);
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	808
569 69afee8e1232 "/room invite": Do not send epty reason Mikael Berthe <mikael@lilotux.net> parents: 568 diff changeset	809 if (reason) {
69afee8e1232 "/room invite": Do not send epty reason Mikael Berthe <mikael@lilotux.net> parents: 568 diff changeset	810 gchar *utf8_reason = to_utf8(reason);
69afee8e1232 "/room invite": Do not send epty reason Mikael Berthe <mikael@lilotux.net> parents: 568 diff changeset	811 y = xmlnode_insert_tag(z, "reason");
69afee8e1232 "/room invite": Do not send epty reason Mikael Berthe <mikael@lilotux.net> parents: 568 diff changeset	812 xmlnode_insert_cdata(y, utf8_reason, (unsigned) -1);
69afee8e1232 "/room invite": Do not send epty reason Mikael Berthe <mikael@lilotux.net> parents: 568 diff changeset	813 g_free(utf8_reason);
69afee8e1232 "/room invite": Do not send epty reason Mikael Berthe <mikael@lilotux.net> parents: 568 diff changeset	814 }
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	815
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	816 jab_send(jc, x);
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	817 xmlnode_free(x);
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	818 jb_reset_keepalive();
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	819 }
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	820
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	821 static void gotmessage(char type, const char from, const char *body,
c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	822 const char *enc, time_t timestamp)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	823 {
113 8ac67e951eab [/trunk] Changeset 127 by mikael mikael parents: 112 diff changeset	824 char *jid;
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	825 const char *rname;
387 2bbeef7b4fdd Do non UTF8-encode/decode null pointers Mikael Berthe <mikael@lilotux.net> parents: 384 diff changeset	826 gchar *buffer = from_utf8(body);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	827
441 51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	828 jid = jidtodisp(from);
51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	829
51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	830 if (!buffer && body) {
523 fc6bc26f891e Write UTF-9 conversion failures to the tracelog file Mikael Berthe <mikael@lilotux.net> parents: 521 diff changeset	831 scr_LogPrint(LPRINT_NORMAL, "Decoding of message from <%s> has failed",
441 51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	832 from);
523 fc6bc26f891e Write UTF-9 conversion failures to the tracelog file Mikael Berthe <mikael@lilotux.net> parents: 521 diff changeset	833 scr_LogPrint(LPRINT_LOG, "Decoding of message from <%s> has failed: %s",
fc6bc26f891e Write UTF-9 conversion failures to the tracelog file Mikael Berthe <mikael@lilotux.net> parents: 521 diff changeset	834 from, body);
441 51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	835 scr_WriteIncomingMessage(jid, "Cannot display message: "
51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	836 "UTF-8 conversion failure",
51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	837 0, HBB_PREFIX_ERR \| HBB_PREFIX_IN);
51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	838 g_free(jid);
51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	839 return;
51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	840 }
51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	841
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	842 rname = strchr(from, '/');
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	843 if (rname) rname++;
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	844 hk_message_in(jid, rname, timestamp, buffer, type);
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	845 g_free(jid);
383 39c5da51b387 Remove utf8 files, use Glib Mikael Berthe <mikael@lilotux.net> parents: 374 diff changeset	846 g_free(buffer);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	847 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	848
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	849 static 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	850 {
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	851 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	852
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	853 switch(code) {
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	854 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	855 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	856 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	857 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	858 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	859 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	860 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	861 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	862 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	863 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	864 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	865 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	866 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	867 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	868 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	869 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	870 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	871 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	872 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	873 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	874 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	875 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	876 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	877 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	878 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	879 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	880 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	881 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	882 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	883 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	884 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	885 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	886 default:
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	887 desc = NULL;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	888 }
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	889
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	890 return desc;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	891 }
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	892
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	893 // display_server_error(x)
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	894 // 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	895 // x: error tag xmlnode pointer
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	896 void display_server_error(xmlnode x)
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	897 {
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	898 const char *desc = NULL;
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	899 int code = 0;
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	900 char *s;
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	901 const char *p;
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	902
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	903 /* RFC3920:
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	904 * The <error/> element:
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	905 * 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	906 * 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	907 * 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	908 */
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	909 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	910 if (p)
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	911 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	912
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	913 // For backward compatibility
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	914 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	915 code = atoi(s);
2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	916 // Default message
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	917 desc = defaulterrormsg(code);
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	918 }
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	919
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	920 // 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	921 s = xmlnode_get_data(x);
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	922 if (s && *s) desc = s;
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	923
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	924 // 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	925 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	926 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	927
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	928 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	929 }
2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	930
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	931 static void statehandler(jconn conn, int state)
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	932 {
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	933 static int previous_state = -1;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	934
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	935 scr_LogPrint(LPRINT_DEBUG, "StateHandler called (state=%d).", state);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	936
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	937 switch(state) {
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	938 case JCONN_STATE_OFF:
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	939 if (previous_state != JCONN_STATE_OFF)
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	940 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Not connected to the server");
37 1441ba37a5c1 [/trunk] Changeset 53 by mikael mikael parents: 36 diff changeset	941
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	942 online = FALSE;
159 ba51d1737086 [/trunk] Changeset 171 by mikael mikael parents: 154 diff changeset	943 mystatus = offline;
519 5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	944 if (mystatusmsg) {
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	945 g_free(mystatusmsg);
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	946 mystatusmsg = NULL;
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	947 }
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	948 roster_free();
faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	949 update_roster = TRUE;
598 a3db3ee8b99e Fix some display issues Mikael Berthe <mikael@lilotux.net> parents: 590 diff changeset	950 scr_ShowBuddyWindow();
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	951 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	952
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	953 case JCONN_STATE_CONNECTED:
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	954 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Connected to the server");
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	955 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	956
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	957 case JCONN_STATE_AUTH:
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	958 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Authenticating to the server");
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	959 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	960
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	961 case JCONN_STATE_ON:
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	962 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Communication with the server "
bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	963 "established");
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	964 online = TRUE;
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	965 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	966
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	967 case JCONN_STATE_CONNECTING:
357 e8adc3c96e68 Better messages for server connection states Mikael Berthe <mikael@lilotux.net> parents: 353 diff changeset	968 if (previous_state != state)
408 73433860665c Tune previous usleep() change Mikael Berthe <mikael@lilotux.net> parents: 407 diff changeset	969 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Connecting to the server");
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	970 break;
a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	971
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	972 default:
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	973 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	974 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	975 previous_state = state;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	976 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	977
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	978 inline static xmlnode xml_get_xmlns(xmlnode xmldata, const char *xmlns)
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	979 {
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	980 xmlnode x;
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	981 char *p;
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	982
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	983 x = xmlnode_get_firstchild(xmldata);
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	984 for ( ; x; x = xmlnode_get_nextsibling(x)) {
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	985 if ((p = xmlnode_get_name(x)) && !strcmp(p, "x"))
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	986 if ((p = xmlnode_get_attrib(x, "xmlns")) && !strcmp(p, xmlns)) {
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	987 break;
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	988 }
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	989 }
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	990 return x;
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	991 }
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	992
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	993 static time_t xml_get_timestamp(xmlnode xmldata)
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	994 {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	995 xmlnode x;
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	996 char *p;
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	997
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	998 x = xml_get_xmlns(xmldata, NS_DELAY);
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	999 if ((p = xmlnode_get_attrib(x, "stamp")) != NULL)
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1000 return from_iso8601(p, 1);
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1001 return 0;
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1002 }
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1003
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1004 static void handle_presence_muc(const char *from, xmlnode xmldata,
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1005 const char roomjid, const char rname,
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1006 enum imstatus ust, char *ustmsg,
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1007 time_t usttime, char bpprio)
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1008 {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1009 xmlnode y;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1010 char *p;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1011 const char *m;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1012 enum imrole mbrole = role_none;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1013 enum imaffiliation mbaffil = affil_none;
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1014 const char mbjid = NULL, mbnick = NULL;
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1015 const char actorjid = NULL, reason = NULL;
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1016 unsigned int statuscode = 0;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1017 GSList *room_elt;
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1018 int log_muc_conf;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1019
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1020 log_muc_conf = settings_opt_get_int("log_muc_conf");
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1021
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1022 room_elt = roster_find(roomjid, jidsearch, 0);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1023 if (!room_elt) {
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1024 // Add room if it doesn't already exist FIXME shouldn't happen!
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	1025 room_elt = roster_add_user(roomjid, NULL, NULL, ROSTER_TYPE_ROOM, sub_none);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1026 } else {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1027 // Make sure this is a room (it can be a conversion user->room)
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1028 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1029 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1030
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1031 // Get room member's information
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1032 y = xmlnode_get_tag(xmldata, "item");
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1033 if (y) {
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1034 xmlnode z;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1035 p = xmlnode_get_attrib(y, "affiliation");
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1036 if (p) {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1037 if (!strcmp(p, "owner")) mbaffil = affil_owner;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1038 else if (!strcmp(p, "admin")) mbaffil = affil_admin;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1039 else if (!strcmp(p, "member")) mbaffil = affil_member;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1040 else if (!strcmp(p, "outcast")) mbaffil = affil_outcast;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1041 else if (!strcmp(p, "none")) mbaffil = affil_none;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1042 else scr_LogPrint(LPRINT_LOGNORM, "<%s>: Unknown affiliation \"%s\"",
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1043 from, p);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1044 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1045 p = xmlnode_get_attrib(y, "role");
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1046 if (p) {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1047 if (!strcmp(p, "moderator")) mbrole = role_moderator;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1048 else if (!strcmp(p, "participant")) mbrole = role_participant;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1049 else if (!strcmp(p, "visitor")) mbrole = role_visitor;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1050 else if (!strcmp(p, "none")) mbrole = role_none;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1051 else scr_LogPrint(LPRINT_LOGNORM, "<%s>: Unknown role \"%s\"",
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1052 from, p);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1053 }
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1054 mbjid = xmlnode_get_attrib(y, "jid");
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1055 mbnick = xmlnode_get_attrib(y, "nick");
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1056 // For kick/ban, there can be actor and reason tags
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1057 reason = xmlnode_get_tag_data(y, "reason");
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1058 z = xmlnode_get_tag(y, "actor");
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1059 if (z)
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1060 actorjid = xmlnode_get_attrib(z, "jid");
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1061 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1062
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1063 // Get the status code
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1064 // 201: a room has been created
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1065 // 301: the user has been banned from the room
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1066 // 303: new room nickname
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1067 // 307: the user has been kicked from the room
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1068 // 321,322,332: the user has been removed from the room
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1069 y = xmlnode_get_tag(xmldata, "status");
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1070 if (y) {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1071 p = xmlnode_get_attrib(y, "code");
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1072 if (p)
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1073 statuscode = atoi(p);
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1074 }
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1075
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1076 // Check for nickname change
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1077 if (statuscode == 303 && mbnick) {
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1078 gchar *mbuf;
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1079 gchar *newname_noutf8 = from_utf8(mbnick);
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1080 if (!newname_noutf8)
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1081 scr_LogPrint(LPRINT_LOG, "Decoding of new nickname has failed: %s",
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1082 mbnick);
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1083 mbuf = g_strdup_printf("%s is now known as %s", rname,
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1084 (newname_noutf8 ? newname_noutf8 : "(?)"));
632 cfab93886a88 MUC: use timestamp when available Mikael Berthe <mikael@lilotux.net> parents: 628 diff changeset	1085 scr_WriteIncomingMessage(roomjid, mbuf, usttime,
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1086 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG);
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1087 if (log_muc_conf) hlog_write_message(roomjid, 0, FALSE, mbuf);
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1088 g_free(mbuf);
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1089 if (newname_noutf8) {
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1090 buddy_resource_setname(room_elt->data, rname, newname_noutf8);
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1091 m = buddy_getnickname(room_elt->data);
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1092 if (m && !strcmp(rname, m))
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1093 buddy_setnickname(room_elt->data, newname_noutf8);
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1094 g_free(newname_noutf8);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1095 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1096 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1097
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1098 // Check for departure/arrival
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1099 if (!mbnick && mbrole == role_none) {
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1100 gchar *mbuf;
586 d8f64e74206c Missing initialization Mikael Berthe <mikael@lilotux.net> parents: 584 diff changeset	1101 enum { leave=0, kick, ban } how = leave;
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1102 bool we_left = FALSE;
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1103
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1104 if (statuscode == 307)
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1105 how = kick;
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1106 else if (statuscode == 301)
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1107 how = ban;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1108
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1109 // If this is a leave, check if it is ourself
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1110 m = buddy_getnickname(room_elt->data);
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1111
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1112 if (m && !strcmp(rname, m)) {
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1113 we_left = TRUE; // _We_ have left! (kicked, banned, etc.)
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1114 buddy_setinsideroom(room_elt->data, FALSE);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1115 buddy_setnickname(room_elt->data, NULL);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1116 buddy_del_all_resources(room_elt->data);
600 483a87c99990 Free room personal data when receiving the unavailable stanza, not before Mikael Berthe <mikael@lilotux.net> parents: 599 diff changeset	1117 buddy_settopic(room_elt->data, NULL);
721 9cf31c9b1dc4 Use room topic as a description in the chat status line Mikael Berthe <mikael@lilotux.net> parents: 713 diff changeset	1118 scr_UpdateChatStatus(FALSE);
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1119 update_roster = TRUE;
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1120 }
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1121
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1122 // The message depends on _who_ left, and _how_
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1123 if (how) {
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1124 gchar *mbuf_end;
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1125 // Forced leave
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1126 if (actorjid) {
587 1b773c760a99 Kick/ban: convert reason to user's locale Mikael Berthe <mikael@lilotux.net> parents: 586 diff changeset	1127 gchar *rsn_noutf8 = from_utf8(reason);
589 9942746e8d58 Improve fix from changeset 1b773c760a99 Mikael Berthe <mikael@lilotux.net> parents: 587 diff changeset	1128 if (!rsn_noutf8 && reason) {
9942746e8d58 Improve fix from changeset 1b773c760a99 Mikael Berthe <mikael@lilotux.net> parents: 587 diff changeset	1129 scr_LogPrint(LPRINT_NORMAL, "UTF-8 decoding of reason has failed");
9942746e8d58 Improve fix from changeset 1b773c760a99 Mikael Berthe <mikael@lilotux.net> parents: 587 diff changeset	1130 scr_LogPrint(LPRINT_LOG, "UTF-8 decoding of reason has failed: %s",
9942746e8d58 Improve fix from changeset 1b773c760a99 Mikael Berthe <mikael@lilotux.net> parents: 587 diff changeset	1131 reason);
9942746e8d58 Improve fix from changeset 1b773c760a99 Mikael Berthe <mikael@lilotux.net> parents: 587 diff changeset	1132 }
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1133 mbuf_end = g_strdup_printf("%s from %s by <%s>.\nReason: %s",
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1134 (how == ban ? "banned" : "kicked"),
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1135 roomjid, actorjid,
587 1b773c760a99 Kick/ban: convert reason to user's locale Mikael Berthe <mikael@lilotux.net> parents: 586 diff changeset	1136 (rsn_noutf8 ? rsn_noutf8 : "None given"));
1b773c760a99 Kick/ban: convert reason to user's locale Mikael Berthe <mikael@lilotux.net> parents: 586 diff changeset	1137 if (rsn_noutf8)
1b773c760a99 Kick/ban: convert reason to user's locale Mikael Berthe <mikael@lilotux.net> parents: 586 diff changeset	1138 g_free(rsn_noutf8);
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1139 } else {
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1140 mbuf_end = g_strdup_printf("%s from %s.",
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1141 (how == ban ? "banned" : "kicked"),
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1142 roomjid);
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1143 }
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1144 if (we_left)
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1145 mbuf = g_strdup_printf("You have been %s", mbuf_end);
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1146 else
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1147 mbuf = g_strdup_printf("%s has been %s", rname, mbuf_end);
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1148
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1149 g_free(mbuf_end);
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1150 } else {
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1151 // Natural leave
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1152 if (we_left) {
616 a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1153 xmlnode destroynode = xmlnode_get_tag(xmldata, "destroy");
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1154 if (destroynode) {
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1155 gchar *rsn_noutf8 = NULL;
624 4e882a19077d Fix double UTF-8 decoding Mikael Berthe <mikael@lilotux.net> parents: 617 diff changeset	1156 if ((reason = xmlnode_get_tag_data(destroynode, "reason")))
616 a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1157 rsn_noutf8 = from_utf8(reason);
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1158 if (rsn_noutf8) {
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1159 mbuf = g_strdup_printf("You have left %s, "
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1160 "the room has been destroyed: %s",
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1161 roomjid, rsn_noutf8);
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1162 g_free(rsn_noutf8);
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1163 } else {
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1164 mbuf = g_strdup_printf("You have left %s, "
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1165 "the room has been destroyed", roomjid);
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1166 }
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1167 } else {
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1168 mbuf = g_strdup_printf("You have left %s", roomjid);
616 a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1169 }
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1170 } else {
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1171 if (ustmsg)
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1172 mbuf = g_strdup_printf("%s has left: %s", rname, ustmsg);
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1173 else
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1174 mbuf = g_strdup_printf("%s has left", rname);
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1175 }
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1176 }
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1177
632 cfab93886a88 MUC: use timestamp when available Mikael Berthe <mikael@lilotux.net> parents: 628 diff changeset	1178 scr_WriteIncomingMessage(roomjid, mbuf, usttime,
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1179 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG);
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1180
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1181 if (log_muc_conf) hlog_write_message(roomjid, 0, FALSE, mbuf);
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1182
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1183 if (we_left) {
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1184 scr_LogPrint(LPRINT_LOGNORM, "%s", mbuf);
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1185 g_free(mbuf);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1186 return;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1187 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1188 g_free(mbuf);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1189 } else if (buddy_getstatus(room_elt->data, rname) == offline &&
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1190 ust != offline) {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1191 gchar *mbuf;
645 d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1192 const char *ournick = buddy_getnickname(room_elt->data);
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1193
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1194 if (!ournick) {
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1195 // I think it shouldn't happen, but let's put a warning for a while...
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1196 mbuf = g_strdup_printf("MUC ERR: you have no nickname, "
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1197 "please send a bug report!");
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1198 scr_LogPrint(LPRINT_LOGNORM, mbuf);
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1199 scr_WriteIncomingMessage(roomjid, mbuf, 0, HBB_PREFIX_INFO);
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1200 g_free(mbuf);
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1201 buddylist_build();
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1202 scr_DrawRoster();
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1203 return;
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1204 }
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1205
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1206 if (!buddy_getinsideroom(room_elt->data)) {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1207 // We weren't inside the room yet. Now we are.
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1208 // However, this could be a presence packet from another room member
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1209
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1210 buddy_setinsideroom(room_elt->data, TRUE);
654 d7fe7b88e4fc MUC: Set the new_message flag when joining a room Mikael Berthe <mikael@lilotux.net> parents: 653 diff changeset	1211 // Set the message flag unless we're already in the room buffer window
d7fe7b88e4fc MUC: Set the new_message flag when joining a room Mikael Berthe <mikael@lilotux.net> parents: 653 diff changeset	1212 scr_setmsgflag_if_needed(roomjid);
633 514aa246081d Log to the tracelog file when joining a room Mikael Berthe <mikael@lilotux.net> parents: 632 diff changeset	1213 // Add a message to the tracelog file
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1214 mbuf = g_strdup_printf("You have joined %s as \"%s\"", roomjid, ournick);
653 d5db5be78eb0 MUC: Be more verbose when joining a room Mikael Berthe <mikael@lilotux.net> parents: 652 diff changeset	1215 scr_LogPrint(LPRINT_LOGNORM, "%s", mbuf);
633 514aa246081d Log to the tracelog file when joining a room Mikael Berthe <mikael@lilotux.net> parents: 632 diff changeset	1216 g_free(mbuf);
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1217 mbuf = g_strdup_printf("You have joined as \"%s\"", ournick);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1218
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1219 // The 1st presence message could be for another room member
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1220 if (strcmp(ournick, rname)) {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1221 // Display current mbuf and create a new message for the member
651 936df057dda0 MUC: Fix a timestamp issue when joining a room Mikael Berthe <mikael@lilotux.net> parents: 649 diff changeset	1222 // Note: the usttime timestamp is related to the other member,
936df057dda0 MUC: Fix a timestamp issue when joining a room Mikael Berthe <mikael@lilotux.net> parents: 649 diff changeset	1223 // so we use 0 here.
936df057dda0 MUC: Fix a timestamp issue when joining a room Mikael Berthe <mikael@lilotux.net> parents: 649 diff changeset	1224 scr_WriteIncomingMessage(roomjid, mbuf, 0,
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1225 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1226 if (log_muc_conf) hlog_write_message(roomjid, 0, FALSE, mbuf);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1227 g_free(mbuf);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1228 mbuf = g_strdup_printf("%s has joined", rname);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1229 }
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1230 } else {
645 d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1231 if (strcmp(ournick, rname))
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1232 mbuf = g_strdup_printf("%s has joined", rname);
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1233 else
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1234 mbuf = NULL;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1235 }
645 d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1236
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1237 if (mbuf) {
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1238 scr_WriteIncomingMessage(roomjid, mbuf, usttime,
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1239 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG);
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1240 if (log_muc_conf) hlog_write_message(roomjid, 0, FALSE, mbuf);
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1241 g_free(mbuf);
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1242 }
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1243 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1244
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1245 // Update room member status
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	1246 if (rname) {
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	1247 gchar *mbrjid_noutf8 = from_utf8(mbjid);
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1248 roster_setstatus(roomjid, rname, bpprio, ust, ustmsg, usttime,
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	1249 mbrole, mbaffil, mbrjid_noutf8);
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	1250 if (mbrjid_noutf8)
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	1251 g_free(mbrjid_noutf8);
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	1252 } else
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1253 scr_LogPrint(LPRINT_LOGNORM, "MUC DBG: no rname!"); /* DBG */
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1254
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1255 buddylist_build();
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1256 scr_DrawRoster();
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1257 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1258
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1259 static void handle_packet_presence(jconn conn, char type, char from,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1260 xmlnode xmldata)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1261 {
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1262 char p, r;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1263 char *ustmsg;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1264 const char *rname;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1265 enum imstatus ust;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1266 char bpprio;
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1267 time_t timestamp = 0;
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1268 xmlnode muc_packet;
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1269
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1270 rname = strchr(from, '/');
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1271 if (rname) rname++;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1272
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1273 r = jidtodisp(from);
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1274
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1275 // Check for MUC presence packet
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1276 muc_packet = xml_get_xmlns(xmldata, "http://jabber.org/protocol/muc#user");
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1277
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1278 if (type && !strcmp(type, TMSG_ERROR)) {
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1279 xmlnode x;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1280 scr_LogPrint(LPRINT_LOGNORM, "Error presence packet from <%s>", r);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1281 if ((x = xmlnode_get_tag(xmldata, TMSG_ERROR)) != NULL)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1282 display_server_error(x);
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1283
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1284 // Let's check it isn't a nickname conflict.
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1285 // XXX Note: We should handle the <conflict/> string condition.
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1286 if ((p = xmlnode_get_attrib(x, "code")) != NULL) {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1287 if (atoi(p) == 409) {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1288 // 409 = conlict (nickname is in use or registered by another user)
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1289 // If we are not inside this room, we should reset the nickname
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1290 GSList *room_elt = roster_find(r, jidsearch, 0);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1291 if (room_elt && !buddy_getinsideroom(room_elt->data))
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1292 buddy_setnickname(room_elt->data, NULL);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1293 }
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1294 }
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1295
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1296 g_free(r);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1297 return;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1298 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1299
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1300 p = xmlnode_get_tag_data(xmldata, "priority");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1301 if (p && *p) bpprio = (gchar)atoi(p);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1302 else bpprio = 0;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1303
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1304 ust = available;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1305 p = xmlnode_get_tag_data(xmldata, "show");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1306 if (p) {
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1307 if (!strcmp(p, "away")) ust = away;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1308 else if (!strcmp(p, "dnd")) ust = dontdisturb;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1309 else if (!strcmp(p, "xa")) ust = notavail;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1310 else if (!strcmp(p, "chat")) ust = freeforchat;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1311 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1312
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1313 if (type && !strcmp(type, "unavailable"))
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1314 ust = offline;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1315
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1316 ustmsg = NULL;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1317 p = xmlnode_get_tag_data(xmldata, "status");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1318 if (p) {
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1319 ustmsg = from_utf8(p);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1320 if (!ustmsg)
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1321 scr_LogPrint(LPRINT_LOG,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1322 "Decoding of status message of <%s> has failed: %s",
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1323 from, p);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1324 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1325
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1326 // Timestamp?
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1327 timestamp = xml_get_timestamp(xmldata);
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1328
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1329 if (muc_packet) {
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1330 // This is a MUC presence message
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1331 handle_presence_muc(from, muc_packet, r, rname,
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1332 ust, ustmsg, timestamp, bpprio);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1333 } else {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1334 // Not a MUC message, so this is a regular buddy...
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1335 // Call hk_statuschange() if status has changed or if the
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1336 // status message is different
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1337 const char *m = roster_getstatusmsg(r, rname);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1338 if ((ust != roster_getstatus(r, rname)) \|\|
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1339 (!ustmsg && m && m[0]) \|\| (ustmsg && (!m \|\| strcmp(ustmsg, m))))
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1340 hk_statuschange(r, rname, bpprio, timestamp, ust, ustmsg);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1341 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1342
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1343 g_free(r);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1344 if (ustmsg) g_free(ustmsg);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1345 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1346
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1347 static void handle_packet_message(jconn conn, char type, char from,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1348 xmlnode xmldata)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1349 {
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1350 char p, r, *s;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1351 xmlnode x;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1352 char *body=NULL;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1353 char *enc = NULL;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1354 char *tmp = NULL;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1355 time_t timestamp = 0;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1356
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1357 body = xmlnode_get_tag_data(xmldata, "body");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1358
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1359 p = xmlnode_get_tag_data(xmldata, "subject");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1360 if (p != NULL) {
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1361 if (type && !strcmp(type, TMSG_GROUPCHAT)) { // Room topic
549 448e299e45da MUC: "/room topic" shows the current room topic Mikael Berthe <mikael@lilotux.net> parents: 547 diff changeset	1362 GSList *roombuddy;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1363 gchar *mbuf;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1364 gchar *subj_noutf8 = from_utf8(p);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1365 if (!subj_noutf8)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1366 scr_LogPrint(LPRINT_LOG,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1367 "Decoding of room topic has failed: %s", p);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1368 // Get the room (s) and the nickname (r)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1369 s = g_strdup(from);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1370 r = strchr(s, '/');
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1371 if (r) *r++ = 0;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1372 else r = s;
549 448e299e45da MUC: "/room topic" shows the current room topic Mikael Berthe <mikael@lilotux.net> parents: 547 diff changeset	1373 // Set the new topic
448e299e45da MUC: "/room topic" shows the current room topic Mikael Berthe <mikael@lilotux.net> parents: 547 diff changeset	1374 roombuddy = roster_find(s, jidsearch, 0);
448e299e45da MUC: "/room topic" shows the current room topic Mikael Berthe <mikael@lilotux.net> parents: 547 diff changeset	1375 if (roombuddy)
448e299e45da MUC: "/room topic" shows the current room topic Mikael Berthe <mikael@lilotux.net> parents: 547 diff changeset	1376 buddy_settopic(roombuddy->data, subj_noutf8);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1377 // Display inside the room window
560 64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	1378 if (r == s) {
64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	1379 // No specific resource (this is certainly history)
64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	1380 mbuf = g_strdup_printf("The topic has been set to: %s",
64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	1381 (subj_noutf8 ? subj_noutf8 : "(?)"));
64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	1382 } else {
64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	1383 mbuf = g_strdup_printf("%s has set the topic to: %s", r,
64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	1384 (subj_noutf8 ? subj_noutf8 : "(?)"));
64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	1385 }
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1386 scr_WriteIncomingMessage(s, mbuf, 0,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1387 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1388 if (settings_opt_get_int("log_muc_conf"))
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1389 hlog_write_message(s, 0, FALSE, mbuf);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1390 if (subj_noutf8) g_free(subj_noutf8);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1391 g_free(s);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1392 g_free(mbuf);
732 ab623c2df964 MUC: Update the chat status line when the topic is updated Mikael Berthe <mikael@lilotux.net> parents: 724 diff changeset	1393 // The topic is displayed in the chat status line, so refresh now.
ab623c2df964 MUC: Update the chat status line when the topic is updated Mikael Berthe <mikael@lilotux.net> parents: 724 diff changeset	1394 scr_UpdateChatStatus(TRUE);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1395 } else { // Chat message
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1396 tmp = g_new(char, (body ? strlen(body) : 0) + strlen(p) + 4);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1397 *tmp = '[';
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1398 strcpy(tmp+1, p);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1399 strcat(tmp, "]\n");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1400 if (body) strcat(tmp, body);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1401 body = tmp;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1402 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1403 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1404
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1405 // Not used yet...
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1406 x = xml_get_xmlns(xmldata, NS_ENCRYPTED);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1407 if (x && (p = xmlnode_get_data(x)) != NULL) {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1408 enc = p;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1409 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1410
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1411 // Timestamp?
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1412 timestamp = xml_get_timestamp(xmldata);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1413
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1414 if (type && !strcmp(type, TMSG_ERROR)) {
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1415 if ((x = xmlnode_get_tag(xmldata, TMSG_ERROR)) != NULL)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1416 display_server_error(x);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1417 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1418 if (from && body)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1419 gotmessage(type, from, body, enc, timestamp);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1420 if (tmp)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1421 g_free(tmp);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1422 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1423
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1424 static void evscallback_subcription(eviqs *evp, guint evcontext)
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1425 {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1426 char *barejid;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1427 char *buf;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1428
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1429 if (evcontext == EVS_CONTEXT_TIMEOUT) {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1430 scr_LogPrint(LPRINT_LOGNORM, "Event %s timed out, cancelled.",
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1431 evp->id);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1432 return;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1433 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1434 if (evcontext == EVS_CONTEXT_CANCEL) {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1435 scr_LogPrint(LPRINT_LOGNORM, "Event %s cancelled.", evp->id);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1436 return;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1437 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1438 if (!(evcontext & EVS_CONTEXT_USER))
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1439 return;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1440
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1441 // Sanity check
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1442 if (!evp->data) {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1443 // Shouldn't happen, data should be set to the barejid.
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1444 scr_LogPrint(LPRINT_LOGNORM, "Error in evs callback.");
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1445 return;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1446 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1447
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1448 // Ok, let's work now.
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1449 // evcontext: 0, 1 == reject, accept
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1450
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1451 barejid = evp->data;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1452
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1453 if (evcontext & ~EVS_CONTEXT_USER) {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1454 // Accept subscription request
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1455 jb_subscr_send_auth(barejid);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1456 buf = g_strdup_printf("<%s> is allowed to receive your presence updates",
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1457 barejid);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1458 } else {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1459 // Reject subscription request
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1460 jb_subscr_cancel_auth(barejid);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1461 buf = g_strdup_printf("<%s> won't receive your presence updates", barejid);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1462 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1463 scr_WriteIncomingMessage(barejid, buf, 0, HBB_PREFIX_INFO);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1464 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1465 g_free(buf);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1466 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1467
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1468 static void handle_packet_s10n(jconn conn, char type, char from,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1469 xmlnode xmldata)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1470 {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1471 char *r;
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1472 char *buf;
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1473
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1474 r = jidtodisp(from);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1475
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1476 if (!strcmp(type, "subscribe")) {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1477 /* The sender wishes to subscribe to our presence */
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1478 char *msg;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1479 int isagent;
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1480 eviqs *evn;
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1481
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1482 isagent = (roster_gettype(r) & ROSTER_TYPE_AGENT) != 0;
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1483 msg = xmlnode_get_tag_data(xmldata, "status");
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1484
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1485 buf = g_strdup_printf("<%s> wants to subscribe to your presence updates",
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1486 from);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1487 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1488 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1489 g_free(buf);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1490
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1491 if (msg) {
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1492 char *msg_noutf8 = from_utf8(msg);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1493 if (msg_noutf8) {
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1494 buf = g_strdup_printf("<%s> said: %s", from, msg_noutf8);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1495 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO);
655 de6837908702 Use "(...)" when cutting a multi-line status message in the log window Mikael Berthe <mikael@lilotux.net> parents: 654 diff changeset	1496 replace_nl_with_dots(buf);
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1497 scr_LogPrint(LPRINT_LOGNORM, buf);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1498 g_free(buf);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1499 g_free(msg_noutf8);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1500 }
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1501 }
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1502
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1503 // Create a new event item
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1504 evn = evs_new(EVS_TYPE_SUBSCRIPTION, EVS_MAX_TIMEOUT);
751 4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	1505 if (evn) {
4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	1506 evn->callback = &evscallback_subcription;
4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	1507 evn->data = g_strdup(r);
4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	1508 buf = g_strdup_printf("Please use /event %s accept\|reject", evn->id);
4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	1509 } else {
4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	1510 buf = g_strdup_printf("Unable to create a new event!");
4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	1511 }
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1512 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1513 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1514 g_free(buf);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1515 } else if (!strcmp(type, "unsubscribe")) {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1516 /* The sender is unsubscribing from our presence */
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1517 jb_subscr_cancel_auth(from);
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1518 buf = g_strdup_printf("<%s> is unsubscribing from your "
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1519 "presence updates", from);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1520 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1521 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1522 g_free(buf);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	1523 } else if (!strcmp(type, "subscribed")) {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1524 /* The sender has allowed us to receive their presence */
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1525 buf = g_strdup_printf("<%s> has allowed you to receive their "
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1526 "presence updates", from);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1527 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1528 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1529 g_free(buf);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	1530 } else if (!strcmp(type, "unsubscribed")) {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1531 /* The subscription request has been denied or a previously-granted
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1532 subscription has been cancelled */
610 0e8247cf2bd1 Consider buddies as offline when they have cancelled our subscription Mikael Berthe <mikael@lilotux.net> parents: 609 diff changeset	1533 roster_unsubscribed(from);
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1534 buf = g_strdup_printf("<%s> has cancelled your subscription to "
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1535 "their presence updates", from);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1536 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1537 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1538 g_free(buf);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	1539 } else {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1540 scr_LogPrint(LPRINT_LOGNORM, "Received unrecognized packet from <%s>, "
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1541 "type=%s", from, (type ? type : ""));
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1542 }
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1543 g_free(r);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1544 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1545
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	1546 static void packethandler(jconn conn, jpacket packet)
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1547 {
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1548 char p, r, *s;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1549 const char *m;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1550 char from=NULL, type=NULL;
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1551
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1552 jb_reset_keepalive(); // reset keepalive timeout
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1553 jpacket_reset(packet);
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1554
671 c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	1555 if (!packet->type) {
c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	1556 scr_LogPrint(LPRINT_LOG, "Packet type = 0");
c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	1557 return;
c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	1558 }
c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	1559
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1560 p = xmlnode_get_attrib(packet->x, "type");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1561 if (p) type = p;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1562
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1563 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	1564 if (p) { // Convert from UTF8
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1565 // 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	1566 // 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	1567 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	1568 strcpy(from, p);
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1569 r = strchr(from, '/');
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1570 m = strchr(p, '/');
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1571 if (m++) {
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1572 s = from_utf8(m);
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1573 if (s) {
642 ebbe3845b46b Fix a crash when a resource contains non-representable chars Mikael Berthe <mikael@lilotux.net> parents: 634 diff changeset	1574 // In some cases the allocated memory size could be too small because
ebbe3845b46b Fix a crash when a resource contains non-representable chars Mikael Berthe <mikael@lilotux.net> parents: 634 diff changeset	1575 // when chars cannot be converted strings like "\uxxxx" or "\Uxxxxyyyy"
ebbe3845b46b Fix a crash when a resource contains non-representable chars Mikael Berthe <mikael@lilotux.net> parents: 634 diff changeset	1576 // are used.
ebbe3845b46b Fix a crash when a resource contains non-representable chars Mikael Berthe <mikael@lilotux.net> parents: 634 diff changeset	1577 if (strlen(r+1) < strlen(s)) {
ebbe3845b46b Fix a crash when a resource contains non-representable chars Mikael Berthe <mikael@lilotux.net> parents: 634 diff changeset	1578 from = g_realloc(from, 1+m-p+strlen(s));
ebbe3845b46b Fix a crash when a resource contains non-representable chars Mikael Berthe <mikael@lilotux.net> parents: 634 diff changeset	1579 r = strchr(from, '/');
ebbe3845b46b Fix a crash when a resource contains non-representable chars Mikael Berthe <mikael@lilotux.net> parents: 634 diff changeset	1580 }
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1581 strcpy(r+1, s);
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1582 g_free(s);
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1583 } else {
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1584 *(r+1) = 0;
523 fc6bc26f891e Write UTF-9 conversion failures to the tracelog file Mikael Berthe <mikael@lilotux.net> parents: 521 diff changeset	1585 scr_LogPrint(LPRINT_NORMAL, "Decoding of message sender has failed");
642 ebbe3845b46b Fix a crash when a resource contains non-representable chars Mikael Berthe <mikael@lilotux.net> parents: 634 diff changeset	1586 scr_LogPrint(LPRINT_LOG, "Decoding of message sender has failed: %s",
ebbe3845b46b Fix a crash when a resource contains non-representable chars Mikael Berthe <mikael@lilotux.net> parents: 634 diff changeset	1587 m);
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1588 }
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1589 }
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1590 }
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1591
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1592 if (!from && packet->type != JPACKET_IQ) {
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1593 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	1594 return;
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1595 }
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1596
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1597 switch (packet->type) {
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1598 case JPACKET_MESSAGE:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1599 handle_packet_message(conn, type, from, packet->x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1600 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1601
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1602 case JPACKET_IQ:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1603 handle_packet_iq(conn, type, from, packet->x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1604 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1605
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1606 case JPACKET_PRESENCE:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1607 handle_packet_presence(conn, type, from, packet->x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1608 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1609
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1610 case JPACKET_S10N:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1611 handle_packet_s10n(conn, type, from, packet->x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1612 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1613
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1614 default:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1615 scr_LogPrint(LPRINT_LOG, "Unhandled packet type (%d)", packet->type);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1616 }
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1617 if (from)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1618 g_free(from);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1619 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1620
580 fed6d1e4d7a9 Fix modelines Mikael Berthe <mikael@lilotux.net> parents: 579 diff changeset	1621 /* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */

Mercurial > ~mikael > mcabber > hg

annotate mcabber/src/jabglue.c @ 751:4a7271e69694