mcabber: mcabber/src/jabglue.c annotate

annotate mcabber/src/jabglue.c @ 990:35e7913affb7

Send events/chatstates notifications (JEP-22/JEP-85)

author	Mikael Berthe <mikael@lilotux.net>
date	Wed, 01 Nov 2006 00:57:56 +0100
parents	859ab76e5093
children	ef10906691bb

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
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	24 #include "../libjabber/jabber.h"
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	25 #include "jabglue.h"
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	26 #include "jab_priv.h"
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 52 diff changeset	27 #include "roster.h"
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	28 #include "screen.h"
113 8ac67e951eab [/trunk] Changeset 127 by mikael mikael parents: 112 diff changeset	29 #include "hooks.h"
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	30 #include "utils.h"
294 871e53769084 Allow one status message per Jabber status Mikael Berthe <mikael@lilotux.net> parents: 277 diff changeset	31 #include "settings.h"
441 51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	32 #include "hbuf.h"
478 47cfa3779549 MUC: log join/nick/leave/topic if log_muc_conf is set Mikael Berthe <mikael@lilotux.net> parents: 475 diff changeset	33 #include "histolog.h"
837 7c74eef1d0e0 New option "muc_auto_whois" Mikael Berthe <mikael@lilotux.net> parents: 834 diff changeset	34 #include "commands.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);
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	54 void handle_state_events(char* from, xmlnode xmldata);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	55
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	56 static void logger(jconn j, int io, const char *buf)
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	57 {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	58 scr_LogPrint(LPRINT_DEBUG, "%03s: %s", ((io == 0) ? "OUT" : "IN"), buf);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	59 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	60
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	61 // jidtodisp(jid)
62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	62 // Strips the resource part from the jid
62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	63 // 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	64 char jidtodisp(const char jid)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	65 {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	66 char *ptr;
165 b4921dbf8709 [/trunk] Changeset 177 by mikael mikael parents: 164 diff changeset	67 char *alias;
b4921dbf8709 [/trunk] Changeset 177 by mikael mikael parents: 164 diff changeset	68
438 b44be19d6229 Handle multiple resources for the same buddy Mikael Berthe <mikael@lilotux.net> parents: 436 diff changeset	69 alias = g_strdup(jid);
165 b4921dbf8709 [/trunk] Changeset 177 by mikael mikael parents: 164 diff changeset	70
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 960 diff changeset	71 if ((ptr = strchr(alias, JID_RESOURCE_SEPARATOR)) != NULL) {
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	72 *ptr = 0;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	73 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	74 return alias;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	75 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	76
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	77 char compose_jid(const char username, const char *servername,
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	78 const char *resource)
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	79 {
393 f8f3c7493457 Whitespace cleanup Mikael Berthe <mikael@lilotux.net> parents: 387 diff changeset	80 char *jid = g_new(char, 3 +
f8f3c7493457 Whitespace cleanup Mikael Berthe <mikael@lilotux.net> parents: 387 diff changeset	81 strlen(username) + strlen(servername) + strlen(resource));
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	82 strcpy(jid, username);
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 960 diff changeset	83 if (!strchr(jid, JID_DOMAIN_SEPARATOR)) {
5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 960 diff changeset	84 strcat(jid, JID_DOMAIN_SEPARATORSTR);
403 17aa60c6dc63 Allow a different server name than the jid domain name Mikael Berthe <mikael@lilotux.net> parents: 393 diff changeset	85 strcat(jid, servername);
17aa60c6dc63 Allow a different server name than the jid domain name Mikael Berthe <mikael@lilotux.net> parents: 393 diff changeset	86 }
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 960 diff changeset	87 strcat(jid, JID_RESOURCE_SEPARATORSTR);
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	88 strcat(jid, resource);
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	89 return jid;
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	90 }
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	91
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	92 inline unsigned char jb_getonline(void)
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	93 {
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	94 return online;
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	95 }
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	96
403 17aa60c6dc63 Allow a different server name than the jid domain name Mikael Berthe <mikael@lilotux.net> parents: 393 diff changeset	97 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	98 int ssl, const char *pass)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	99 {
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
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	109 if (!jid) return jc;
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	110
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	111 jc = jab_new((char)jid, (char)pass, (char*)server, port, ssl);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	112
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	113 /* 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	114 jab_logger(jc, logger);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	115 jab_packet_handler(jc, &packethandler);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	116 jab_state_handler(jc, &statehandler);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	117
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	118 if (jc && jc->user) {
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	119 online = TRUE;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	120 jstate = STATE_CONNECTING;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	121 statehandler(0, -1);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	122 jab_start(jc);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	123 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	124
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	125 return jc;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	126 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	127
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	128 void jb_disconnect(void)
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	129 {
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	130 if (!jc) return;
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	131
668 d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	132 if (online) {
d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	133 // Announce it to everyone else
d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	134 jb_setstatus(offline, NULL, "");
d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	135 // End the XML flow
d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	136 jb_send_raw("</stream:stream>");
d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	137 }
634 f3c05d5fe459 Send "</stream:stream>" when disconnecting from the server Mikael Berthe <mikael@lilotux.net> parents: 633 diff changeset	138
f3c05d5fe459 Send "</stream:stream>" when disconnecting from the server Mikael Berthe <mikael@lilotux.net> parents: 633 diff changeset	139 // Announce it to the user
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	140 statehandler(jc, JCONN_STATE_OFF);
416 48e7808c4191 Allow offline status message Mikael Berthe <mikael@lilotux.net> parents: 411 diff changeset	141
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	142 jab_delete(jc);
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	143 jc = NULL;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	144 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	145
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	146 inline void jb_reset_keepalive()
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	147 {
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	148 time(&LastPingTime);
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	149 }
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	150
436 802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	151 void jb_send_raw(const char *str)
802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	152 {
461 1d8f5b3a5f2b Convert /rawxml argument to UTF8 Mikael Berthe <mikael@lilotux.net> parents: 449 diff changeset	153 if (jc && online && str)
436 802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	154 jab_send_raw(jc, str);
802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	155 }
802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	156
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	157 void jb_keepalive()
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	158 {
113 8ac67e951eab [/trunk] Changeset 127 by mikael mikael parents: 112 diff changeset	159 if (jc && online)
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	160 jab_send_raw(jc, " \t ");
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	161 jb_reset_keepalive();
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	162 }
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	163
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	164 void jb_set_keepalive_delay(unsigned int delay)
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	165 {
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	166 KeepaliveDelay = delay;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	167 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	168
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	169 void jb_main()
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	170 {
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	171 time_t now;
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	172 fd_set fds;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	173 long autoaway_timeout;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	174 struct timeval tv;
756 12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	175 static time_t last_eviqs_check = 0;
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	176
406 a9dd91e08eb3 Add usleep() calls Mikael Berthe <mikael@lilotux.net> parents: 403 diff changeset	177 if (!online) {
419 2f9852610cf4 Small code review Mikael Berthe <mikael@lilotux.net> parents: 416 diff changeset	178 safe_usleep(10000);
406 a9dd91e08eb3 Add usleep() calls Mikael Berthe <mikael@lilotux.net> parents: 403 diff changeset	179 return;
a9dd91e08eb3 Add usleep() calls Mikael Berthe <mikael@lilotux.net> parents: 403 diff changeset	180 }
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	181
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	182 if (jc && jc->state == JCONN_STATE_CONNECTING) {
419 2f9852610cf4 Small code review Mikael Berthe <mikael@lilotux.net> parents: 416 diff changeset	183 safe_usleep(75000);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	184 jab_start(jc);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	185 return;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	186 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	187
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	188 FD_ZERO(&fds);
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	189 FD_SET(0, &fds);
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	190 FD_SET(jc->fd, &fds);
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	191
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	192 tv.tv_sec = 60;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	193 tv.tv_usec = 0;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	194
940 fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	195 time(&now);
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	196
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	197 if (KeepaliveDelay) {
940 fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	198 if (now >= LastPingTime + (time_t)KeepaliveDelay) {
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	199 tv.tv_sec = 0;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	200 } else {
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	201 tv.tv_sec = LastPingTime + (time_t)KeepaliveDelay - now;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	202 }
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	203 }
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	204
940 fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	205 autoaway_timeout = scr_GetAutoAwayTimeout(now);
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	206 if (tv.tv_sec > autoaway_timeout) {
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	207 tv.tv_sec = autoaway_timeout;
940 fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	208 }
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	209
940 fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	210 if (!tv.tv_sec)
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	211 tv.tv_usec = 350000;
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	212
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	213 scr_DoUpdate();
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	214 if (select(jc->fd + 1, &fds, NULL, NULL, &tv) > 0) {
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	215 if (FD_ISSET(jc->fd, &fds))
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	216 jab_poll(jc, 0);
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	217 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	218
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	219 if (jstate == STATE_CONNECTING) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	220 if (jc) {
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	221 eviqs *iqn;
686 98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	222 xmlnode z;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	223
686 98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	224 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	225 iqn->callback = &iqscallback_auth;
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	226
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	227 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	228 "username");
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	229 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	230 jab_send(jc, iqn->xmldata);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	231
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	232 jstate = STATE_GETAUTH;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	233 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	234
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	235 if (!jc \|\| jc->state == JCONN_STATE_OFF) {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	236 scr_LogPrint(LPRINT_LOGNORM, "Unable to connect to the server");
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	237 online = FALSE;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	238 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	239 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	240
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	241 if (!jc) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	242 statehandler(jc, JCONN_STATE_OFF);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	243 } else if (jc->state == JCONN_STATE_OFF \|\| jc->fd == -1) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	244 statehandler(jc, JCONN_STATE_OFF);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	245 }
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	246
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	247 time(&now);
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	248
756 12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	249 // Check for EV & IQ requests timeouts
12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	250 if (now > last_eviqs_check + 20) {
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	251 iqs_check_timeout(now);
756 12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	252 evs_check_timeout(now);
12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	253 last_eviqs_check = now;
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	254 }
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	255
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	256 // Keepalive
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	257 if (KeepaliveDelay) {
735 2f027806cd48 Some code cleanup Mikael Berthe <mikael@lilotux.net> parents: 732 diff changeset	258 if (now > LastPingTime + (time_t)KeepaliveDelay)
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	259 jb_keepalive();
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	260 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	261 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	262
116 1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	263 inline enum imstatus jb_getstatus()
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	264 {
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	265 return mystatus;
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	266 }
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	267
519 5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	268 inline const char *jb_getstatusmsg()
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	269 {
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	270 return mystatusmsg;
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	271 }
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	272
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	273 static void roompresence(gpointer room, void *presencedata)
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	274 {
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	275 const char *jid;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	276 const char *nickname;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	277 char *to;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	278 struct T_presence *pres = presencedata;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	279
652 b243d3b3ff1b We do not need buddy_isresource() anymore Mikael Berthe <mikael@lilotux.net> parents: 651 diff changeset	280 if (!buddy_getinsideroom(room))
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	281 return;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	282
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	283 jid = buddy_getjid(room);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	284 if (!jid) return;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	285 nickname = buddy_getnickname(room);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	286 if (!nickname) return;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	287
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	288 to = g_strdup_printf("%s/%s", jid, nickname);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	289 jb_setstatus(pres->st, to, pres->msg);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	290 g_free(to);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	291 }
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	292
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	293 // presnew(status, recipient, message)
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	294 // Create an xmlnode with default presence attributes
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	295 // Note: the caller must free the node after use
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	296 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	297 const char *msg)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	298 {
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	299 unsigned int prio;
116 1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	300 xmlnode x;
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	301
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	302 x = jutil_presnew(JPACKET__UNKNOWN, 0, 0);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	303
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	304 if (recipient) {
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	305 xmlnode_put_attrib(x, "to", recipient);
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	306 }
444 5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	307
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	308 switch(st) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	309 case away:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	310 xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "away",
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	311 (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	312 break;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	313
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	314 case dontdisturb:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	315 xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "dnd",
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	316 (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	317 break;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	318
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	319 case freeforchat:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	320 xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "chat",
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	321 (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	322 break;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	323
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	324 case notavail:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	325 xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "xa",
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	326 (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	327 break;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	328
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	329 case invisible:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	330 xmlnode_put_attrib(x, "type", "invisible");
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	331 break;
51 85bbc6ed3796 [/trunk] Changeset 67 by mikael mikael parents: 46 diff changeset	332
118 1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	333 case offline:
1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	334 xmlnode_put_attrib(x, "type", "unavailable");
1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	335 break;
1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	336
51 85bbc6ed3796 [/trunk] Changeset 67 by mikael mikael parents: 46 diff changeset	337 default:
85bbc6ed3796 [/trunk] Changeset 67 by mikael mikael parents: 46 diff changeset	338 break;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	339 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	340
531 aee9a279a0f3 Allow changing priority on the fly Mikael Berthe <mikael@lilotux.net> parents: 527 diff changeset	341 prio = settings_opt_get_int("priority");
272 7f2e61392b2e Add resource priority option mikael@matrix parents: 244 diff changeset	342 if (prio) {
7f2e61392b2e Add resource priority option mikael@matrix parents: 244 diff changeset	343 char strprio[8];
842 f74c5c6d2c24 Fix negative priority Mikael Berthe <mikael@lilotux.net> parents: 837 diff changeset	344 snprintf(strprio, 8, "%d", (int)prio);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	345 xmlnode_insert_cdata(xmlnode_insert_tag(x, "priority"),
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	346 strprio, (unsigned) -1);
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	347 }
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	348
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	349 if (msg)
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	350 xmlnode_insert_cdata(xmlnode_insert_tag(x, "status"), msg, (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	351
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	352 return x;
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	353 }
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	354
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	355 void jb_setstatus(enum imstatus st, const char recipient, const char msg)
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	356 {
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	357 xmlnode x;
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	358
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	359 if (!online) return;
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	360
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	361 if (msg) {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	362 // 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	363 // "-" which is a special case (option meaning "no status message").
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	364 if (!strcmp(msg, "-"))
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	365 msg = "";
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	366 } else {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	367 // No status message specified; we'll use:
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	368 // a) the default status message (if provided by the user);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	369 // b) the current status message;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	370 // c) no status message (i.e. an empty one).
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	371 msg = settings_get_status_msg(st);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	372 if (!msg) {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	373 if (mystatusmsg)
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	374 msg = mystatusmsg;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	375 else
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	376 msg = "";
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	377 }
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	378 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	379
677 633a0522bd37 Using "/status invisible -" did not clear the status message Mikael Berthe <mikael@lilotux.net> parents: 671 diff changeset	380 x = presnew(st, recipient, (st != invisible ? msg : NULL));
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	381 jab_send(jc, x);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	382 xmlnode_free(x);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	383
444 5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	384 // 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	385 if (recipient) return;
5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	386
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	387 // Send presence to chatrooms
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	388 if (st != invisible) {
861 e1adea19ba14 Cosmetic changes Mikael Berthe <mikael@lilotux.net> parents: 859 diff changeset	389 struct T_presence room_presence;
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	390 room_presence.st = st;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	391 room_presence.msg = msg;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	392 foreach_buddy(ROSTER_TYPE_ROOM, &roompresence, &room_presence);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	393 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	394
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	395 // 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	396 // we don't know the presences of buddies when offline...
faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	397 if (mystatus == offline \|\| st == offline)
faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	398 update_roster = TRUE;
faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	399
677 633a0522bd37 Using "/status invisible -" did not clear the status message Mikael Berthe <mikael@lilotux.net> parents: 671 diff changeset	400 hk_mystatuschange(0, mystatus, st, (st != invisible ? msg : ""));
116 1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	401 mystatus = st;
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	402 if (msg != mystatusmsg) {
774 46304b773a44 Remove useless checks before g_free() calls Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	403 g_free(mystatusmsg);
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	404 if (*msg)
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	405 mystatusmsg = g_strdup(msg);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	406 else
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	407 mystatusmsg = NULL;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	408 }
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 706 diff changeset	409
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 706 diff changeset	410 // Update status line
724 264375fe7159 Fix a roster refresh issue Mikael Berthe <mikael@lilotux.net> parents: 721 diff changeset	411 scr_UpdateMainStatus(TRUE);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	412 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	413
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	414 // new_msgid()
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	415 // Generate a new id string. The caller should free it.
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	416 static char *new_msgid(void)
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	417 {
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	418 static guint msg_idn;
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	419 time_t now;
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	420 time(&now);
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	421 if (!msg_idn)
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	422 srand(now);
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	423 msg_idn += 1U + (unsigned int) (9.0 * (rand() / (RAND_MAX + 1.0)));
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	424 return g_strdup_printf("%u%d", msg_idn, (int)(now%10L));
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	425 }
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	426
475 fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	427 void jb_send_msg(const char jid, const char text, int type,
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	428 const char subject, const char msgid)
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	429 {
475 fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	430 xmlnode x;
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	431 gchar *strtype;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	432 #if defined JEP0022 \|\| defined JEP0085
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	433 xmlnode event;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	434 char rname, barejid;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	435 GSList *sl_buddy;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	436 guint which_jep = 0; /* 0: none, 1: 85, 2: 22 */
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	437 struct jep0085 *jep85 = NULL;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	438 #endif
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	439
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	440 if (!online) return;
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	441
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	442 if (type == ROSTER_TYPE_ROOM)
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	443 strtype = TMSG_GROUPCHAT;
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	444 else
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	445 strtype = TMSG_CHAT;
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	446
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	447 x = jutil_msgnew(strtype, (char)jid, NULL, (char)text);
475 fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	448 if (subject) {
fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	449 xmlnode y;
fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	450 y = xmlnode_insert_tag(x, "subject");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	451 xmlnode_insert_cdata(y, subject, (unsigned) -1);
475 fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	452 }
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	453
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	454 #if defined JEP0022 \|\| defined JEP0085
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	455 rname = strchr(jid, JID_RESOURCE_SEPARATOR);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	456 barejid = jidtodisp(jid);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	457 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	458 g_free(barejid);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	459
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	460 // If we can get a resource name, we use it. Else we use NULL,
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	461 // which hopefully will give us the most likely resource.
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	462 if (rname)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	463 rname++;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	464 if (sl_buddy)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	465 jep85 = buddy_resource_jep85(sl_buddy->data, rname);
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	466 #endif
ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	467
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	468 #ifdef JEP0085
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	469 /* JEP-0085 5.1
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	470 * "Until receiving a reply to the initial content message (or a standalone
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	471 * notification) from the Contact, the User MUST NOT send subsequent chat
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	472 * state notifications to the Contact."
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	473 * In our implementation support is initially "unknown", they it's "probed"
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	474 * and can become "ok".
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	475 */
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	476 if (jep85 && (jep85->support == CHATSTATES_SUPPORT_OK \|\|
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	477 jep85->support == CHATSTATES_SUPPORT_UNKNOWN)) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	478 event = xmlnode_insert_tag(x, "active");
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	479 xmlnode_put_attrib(event, "xmlns", NS_CHATSTATES);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	480 if (jep85->support == CHATSTATES_SUPPORT_UNKNOWN)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	481 jep85->support = CHATSTATES_SUPPORT_PROBED;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	482 else
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	483 which_jep = 1;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	484 jep85->last_state_sent = ROSTER_EVENT_ACTIVE;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	485 }
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	486 #endif
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	487 #ifdef JEP0022
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	488 /* JEP-22
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	489 * If the Contact supports JEP-0085, we do not use JEP-0022.
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	490 * If not, we try to fall back to JEP-0022.
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	491 */
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	492 if (!which_jep) {
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	493 struct jep0022 *jep22 = NULL;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	494 event = xmlnode_insert_tag(x, "x");
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	495 xmlnode_put_attrib(event, "xmlns", NS_EVENT);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	496 xmlnode_insert_tag(event, "composing");
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	497
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	498 if (sl_buddy)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	499 jep22 = buddy_resource_jep22(sl_buddy->data, rname);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	500 if (jep22)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	501 jep22->last_state_sent = ROSTER_EVENT_ACTIVE;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	502
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	503 // An id is mandatory when using JEP-0022.
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	504 if (!msgid && (text \|\| subject)) {
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	505 msgid = new_msgid();
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	506 // Let's update last_msgid_sent
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	507 // (We do not update it when the msgid is provided by the caller,
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	508 // because this is probably a special message...)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	509 if (jep22) {
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	510 g_free(jep22->last_msgid_sent);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	511 jep22->last_msgid_sent = g_strdup(msgid);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	512 }
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	513 }
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	514 }
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	515 #endif
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	516
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	517 xmlnode_put_attrib(x, "id", msgid);
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	518
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	519 jab_send(jc, x);
a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	520 xmlnode_free(x);
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	521
114 065d8368c36b [/trunk] Changeset 128 by mikael mikael parents: 113 diff changeset	522 jb_reset_keepalive();
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	523 }
a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	524
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	525
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	526 #ifdef JEP0085
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	527 // jb_send_jep85_chatstate()
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	528 // Send a JEP-85 chatstate.
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	529 static void jb_send_jep85_chatstate(const char *jid, guint state)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	530 {
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	531 xmlnode x;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	532 xmlnode event;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	533 char rname, barejid;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	534 GSList *sl_buddy;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	535 const char *chattag;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	536 struct jep0085 *jep85 = NULL;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	537
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	538 if (!online) return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	539
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	540 rname = strchr(jid, JID_RESOURCE_SEPARATOR);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	541 barejid = jidtodisp(jid);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	542 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	543 g_free(barejid);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	544
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	545 // If we can get a resource name, we use it. Else we use NULL,
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	546 // which hopefully will give us the most likely resource.
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	547 if (rname)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	548 rname++;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	549 if (sl_buddy)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	550 jep85 = buddy_resource_jep85(sl_buddy->data, rname);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	551
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	552 if (!jep85 \|\| (jep85->support != CHATSTATES_SUPPORT_OK))
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	553 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	554
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	555 if (state == jep85->last_state_sent)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	556 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	557
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	558 if (state == ROSTER_EVENT_ACTIVE)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	559 chattag = "active";
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	560 else if (state == ROSTER_EVENT_COMPOSING)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	561 chattag = "composing";
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	562 else if (state == ROSTER_EVENT_PAUSED)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	563 chattag = "paused";
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	564 else {
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	565 scr_LogPrint(LPRINT_LOGNORM, "Error: unsupported JEP-85 state (%d)", state);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	566 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	567 }
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	568
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	569 jep85->last_state_sent = state;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	570
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	571 x = jutil_msgnew(TMSG_CHAT, (char*)jid, NULL, NULL);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	572
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	573 event = xmlnode_insert_tag(x, chattag);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	574 xmlnode_put_attrib(event, "xmlns", NS_CHATSTATES);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	575
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	576 jab_send(jc, x);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	577 xmlnode_free(x);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	578
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	579 jb_reset_keepalive();
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	580 }
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	581 #endif
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	582
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	583 #ifdef JEP0022
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	584 // jb_send_jep22_event()
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	585 // Send a JEP-22 message event (delivered, composing...).
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	586 static void jb_send_jep22_event(const char *jid, guint type)
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	587 {
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	588 xmlnode x;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	589 xmlnode event;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	590 const char *msgid;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	591 char rname, barejid;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	592 GSList *sl_buddy;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	593 struct jep0022 *jep22 = NULL;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	594 guint jep22_state;
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	595
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	596 if (!online) return;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	597
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	598 rname = strchr(jid, JID_RESOURCE_SEPARATOR);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	599 barejid = jidtodisp(jid);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	600 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	601 g_free(barejid);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	602
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	603 // If we can get a resource name, we use it. Else we use NULL,
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	604 // which hopefully will give us the most likely resource.
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	605 if (rname)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	606 rname++;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	607 if (sl_buddy)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	608 jep22 = buddy_resource_jep22(sl_buddy->data, rname);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	609
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	610 if (!jep22)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	611 return; // XXX Maybe we could try harder (other resources?)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	612
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	613 msgid = jep22->last_msgid_rcvd;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	614
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	615 // For composing events (composing, active, inactive, paused...),
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	616 // JEP22 only has 2 states; we'll use composing and active.
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	617 if (type == ROSTER_EVENT_COMPOSING)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	618 jep22_state = ROSTER_EVENT_COMPOSING;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	619 else if (type == ROSTER_EVENT_ACTIVE \|\|
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	620 type == ROSTER_EVENT_PAUSED)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	621 jep22_state = ROSTER_EVENT_ACTIVE;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	622 else
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	623 jep22_state = 0; // ROSTER_EVENT_NONE
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	624
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	625 if (jep22_state) {
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	626 // Do not re-send a same event
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	627 if (jep22_state == jep22->last_state_sent)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	628 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	629 jep22->last_state_sent = jep22_state;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	630 }
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	631
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	632 x = jutil_msgnew(TMSG_CHAT, (char*)jid, NULL, NULL);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	633
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	634 event = xmlnode_insert_tag(x, "x");
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	635 xmlnode_put_attrib(event, "xmlns", NS_EVENT);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	636 if (type == ROSTER_EVENT_DELIVERED)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	637 xmlnode_insert_tag(event, "delivered");
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	638 else if (type == ROSTER_EVENT_COMPOSING)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	639 xmlnode_insert_tag(event, "composing");
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	640 xmlnode_put_attrib(event, "id", msgid);
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	641
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	642 jab_send(jc, x);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	643 xmlnode_free(x);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	644
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	645 jb_reset_keepalive();
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	646 }
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	647 #endif
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	648
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	649 #if defined JEP0022 \|\| defined JEP0085
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	650 void jb_send_chatstate(gpointer buddy, guint chatstate)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	651 {
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	652 const char *jid;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	653 struct jep0085 *jep85 = NULL;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	654 struct jep0022 *jep22 = NULL;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	655
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	656 jid = buddy_getjid(buddy);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	657 if (!jid) return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	658
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	659 #ifdef JEP0085
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	660 jep85 = buddy_resource_jep85(buddy, NULL);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	661 if (jep85 && jep85->support == CHATSTATES_SUPPORT_OK) {
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	662 // FIXME: compare w/ last state sent...
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	663 jb_send_jep85_chatstate(jid, chatstate);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	664 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	665 }
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	666 #endif
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	667 #ifdef JEP0022
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	668 jep22 = buddy_resource_jep22(buddy, NULL);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	669 if (jep22 && jep22->support == CHATSTATES_SUPPORT_OK) {
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	670 // FIXME: compare w/ last state sent...
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	671 jb_send_jep22_event(jid, chatstate);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	672 }
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	673 #endif
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	674 }
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	675 #endif
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	676
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	677 // jb_subscr_send_auth(jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	678 // Allow jid to receive our presence updates
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	679 void jb_subscr_send_auth(const char *jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	680 {
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	681 xmlnode x;
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	682
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	683 x = jutil_presnew(JPACKET__SUBSCRIBED, (char *)jid, NULL);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	684 jab_send(jc, x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	685 xmlnode_free(x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	686 }
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	687
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	688 // jb_subscr_cancel_auth(jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	689 // Cancel jid's subscription to our presence updates
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	690 void jb_subscr_cancel_auth(const char *jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	691 {
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	692 xmlnode x;
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	693
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	694 x = jutil_presnew(JPACKET__UNSUBSCRIBED, (char *)jid, NULL);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	695 jab_send(jc, x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	696 xmlnode_free(x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	697 }
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	698
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	699 // jb_subscr_request_auth(jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	700 // Request a subscription to jid's presence updates
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	701 void jb_subscr_request_auth(const char *jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	702 {
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	703 xmlnode x;
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	704
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	705 x = jutil_presnew(JPACKET__SUBSCRIBE, (char *)jid, NULL);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	706 jab_send(jc, x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	707 xmlnode_free(x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	708 }
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	709
834 6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	710 // jb_subscr_request_cancel(jid)
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	711 // Request to cancel jour subscription to jid's presence updates
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	712 void jb_subscr_request_cancel(const char *jid)
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	713 {
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	714 xmlnode x;
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	715
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	716 x = jutil_presnew(JPACKET__UNSUBSCRIBE, (char *)jid, NULL);
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	717 jab_send(jc, x);
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	718 xmlnode_free(x);
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	719 }
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	720
213 4fcdbfdf7c20 [/trunk] Changeset 225 by mikael mikael parents: 208 diff changeset	721 // Note: the caller should check the jid is correct
244 5f8b529412bd [/trunk] Changeset 257 by mikael mikael parents: 241 diff changeset	722 void jb_addbuddy(const char jid, const char name, const char *group)
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	723 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	724 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	725 eviqs *iqn;
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	726 char *cleanjid;
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	727
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	728 if (!online) return;
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	729
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	730 cleanjid = jidtodisp(jid);
a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	731
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	732 // We don't check if the jabber user already exists in the roster,
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	733 // because it allows to re-ask for notification.
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	734
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	735 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	736 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	737
454399f026fa Fix a bug in jb_addbuddy() Mikael Berthe <mikael@lilotux.net> parents: 625 diff changeset	738 xmlnode_put_attrib(y, "jid", cleanjid);
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	739
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	740 if (name)
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	741 xmlnode_put_attrib(y, "name", name);
244 5f8b529412bd [/trunk] Changeset 257 by mikael mikael parents: 241 diff changeset	742
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	743 if (group) {
628 454399f026fa Fix a bug in jb_addbuddy() Mikael Berthe <mikael@lilotux.net> parents: 625 diff changeset	744 z = xmlnode_insert_tag(y, "group");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	745 xmlnode_insert_cdata(z, group, (unsigned) -1);
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	746 }
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	747
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	748 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	749 iqs_del(iqn->id); // XXX
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	750
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	751 jb_subscr_request_auth(cleanjid);
612 789ec6aed764 Respect RFC 3921 order advice Mikael Berthe <mikael@lilotux.net> parents: 611 diff changeset	752
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	753 roster_add_user(cleanjid, name, group, ROSTER_TYPE_USER, sub_pending);
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	754 g_free(cleanjid);
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	755 buddylist_build();
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	756
244 5f8b529412bd [/trunk] Changeset 257 by mikael mikael parents: 241 diff changeset	757 update_roster = TRUE;
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	758 }
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	759
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	760 void jb_delbuddy(const char *jid)
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	761 {
834 6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	762 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	763 eviqs *iqn;
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	764 char *cleanjid;
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	765
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	766 if (!online) return;
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	767
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	768 cleanjid = jidtodisp(jid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	769
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	770 // If the current buddy is an agent, unsubscribe from it
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	771 if (roster_gettype(cleanjid) == ROSTER_TYPE_AGENT) {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	772 scr_LogPrint(LPRINT_LOGNORM, "Unregistering from the %s agent", cleanjid);
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	773
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	774 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	775 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	776 y = xmlnode_get_tag(iqn->xmldata, "query");
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	777 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	778 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	779 iqs_del(iqn->id); // XXX
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	780 }
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	781
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	782 // Cancel the subscriptions
834 6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	783 jb_subscr_cancel_auth(cleanjid); // Cancel "from"
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	784 jb_subscr_request_cancel(cleanjid); // Cancel "to"
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	785
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	786 // 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	787 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	788 y = xmlnode_get_tag(iqn->xmldata, "query");
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	789 z = xmlnode_insert_tag(y, "item");
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	790 xmlnode_put_attrib(z, "jid", cleanjid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	791 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	792 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	793 iqs_del(iqn->id); // XXX
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	794
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	795 roster_del_user(cleanjid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	796 g_free(cleanjid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	797 buddylist_build();
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	798
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	799 update_roster = TRUE;
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	800 }
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	801
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	802 void jb_updatebuddy(const char jid, const char name, const char *group)
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	803 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	804 xmlnode y;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	805 eviqs *iqn;
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	806 char *cleanjid;
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	807
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	808 if (!online) return;
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	809
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	810 // XXX We should check name's and group's correctness
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	811
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	812 cleanjid = jidtodisp(jid);
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	813
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	814 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	815 y = xmlnode_insert_tag(xmlnode_get_tag(iqn->xmldata, "query"), "item");
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	816 xmlnode_put_attrib(y, "jid", cleanjid);
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	817 xmlnode_put_attrib(y, "name", name);
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	818
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	819 if (group) {
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	820 y = xmlnode_insert_tag(y, "group");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	821 xmlnode_insert_cdata(y, group, (unsigned) -1);
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	822 }
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	823
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	824 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	825 iqs_del(iqn->id); // XXX
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	826 g_free(cleanjid);
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	827 }
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	828
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	829 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	830 {
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	831 GSList *resources;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	832 GSList *roster_elt;
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	833 void (request_fn)(const char );
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	834 const char *strreqtype;
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	835
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	836 if (reqtype == iqreq_version) {
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	837 request_fn = &request_version;
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	838 strreqtype = "version";
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	839 } else if (reqtype == iqreq_time) {
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	840 request_fn = &request_time;
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	841 strreqtype = "time";
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	842 } else
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	843 return;
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	844
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 960 diff changeset	845 if (strchr(jid, JID_RESOURCE_SEPARATOR)) {
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	846 // This is a full JID
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	847 (*request_fn)(jid);
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	848 scr_LogPrint(LPRINT_NORMAL, "Sent %s request to <%s>", strreqtype, jid);
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	849 return;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	850 }
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	851
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	852 // The resource has not been specified
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	853 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	854 if (!roster_elt) {
695 c299035ccb9f Fix up jb_request(), when the resource is unknown Mikael Berthe <mikael@lilotux.net> parents: 693 diff changeset	855 scr_LogPrint(LPRINT_NORMAL, "No known resource for <%s>...", jid);
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	856 (*request_fn)(jid); // Let's send a request anyway...
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	857 scr_LogPrint(LPRINT_NORMAL, "Sent %s request to <%s>", strreqtype, jid);
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	858 return;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	859 }
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	860
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	861 // Send a request to each resource
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	862 resources = buddy_getresources(roster_elt->data);
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	863 if (!resources) {
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	864 scr_LogPrint(LPRINT_NORMAL, "No known resource for <%s>...", jid);
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	865 (*request_fn)(jid); // Let's send a request anyway...
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	866 scr_LogPrint(LPRINT_NORMAL, "Sent %s request to <%s>", strreqtype, jid);
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	867 }
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	868 for ( ; resources ; resources = g_slist_next(resources) ) {
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	869 gchar *fulljid;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	870 fulljid = g_strdup_printf("%s/%s", jid, (char*)resources->data);
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	871 (*request_fn)(fulljid);
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	872 scr_LogPrint(LPRINT_NORMAL, "Sent %s request to <%s>", strreqtype, fulljid);
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	873 g_free(fulljid);
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	874 }
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 686 diff changeset	875 }
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 686 diff changeset	876
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	877 // Join a MUC room
900 b41684465283 MUC: join password-protected room Mikael Berthe <mikael@lilotux.net> parents: 896 diff changeset	878 void jb_room_join(const char room, const char nickname, const char *passwd)
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	879 {
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	880 xmlnode x, y;
643 dd73c3dad815 Fix double UTF-8 encoding when joining a room Mikael Berthe <mikael@lilotux.net> parents: 642 diff changeset	881 gchar *roomid;
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	882 GSList *room_elt;
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	883
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	884 if (!online \|\| !room) return;
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	885 if (!nickname) return;
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	886
643 dd73c3dad815 Fix double UTF-8 encoding when joining a room Mikael Berthe <mikael@lilotux.net> parents: 642 diff changeset	887 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	888 if (check_jid_syntax(roomid)) {
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	889 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	890 nickname);
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	891 g_free(roomid);
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	892 return;
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	893 }
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	894
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	895 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	896 // 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	897 if (!room_elt) {
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	898 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	899 } else {
3ad6675caaf1 MUC: fix join bug when the conference is in the roster Mikael Berthe <mikael@lilotux.net> parents: 645 diff changeset	900 // 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	901 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	902 }
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	903 // 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	904 if (!buddy_getinsideroom(room_elt->data)) {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	905 // 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	906 buddy_setnickname(room_elt->data, nickname);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	907 }
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	908
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	909 // Send the XML request
535 b407d19c39ab Set status correctly when joining a room Mikael Berthe <mikael@lilotux.net> parents: 534 diff changeset	910 x = presnew(mystatus, roomid, mystatusmsg);
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	911 y = xmlnode_insert_tag(x, "x");
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	912 xmlnode_put_attrib(y, "xmlns", "http://jabber.org/protocol/muc");
900 b41684465283 MUC: join password-protected room Mikael Berthe <mikael@lilotux.net> parents: 896 diff changeset	913 if (passwd) {
b41684465283 MUC: join password-protected room Mikael Berthe <mikael@lilotux.net> parents: 896 diff changeset	914 xmlnode_insert_cdata(xmlnode_insert_tag(y, "password"), passwd,
b41684465283 MUC: join password-protected room Mikael Berthe <mikael@lilotux.net> parents: 896 diff changeset	915 (unsigned) -1);
b41684465283 MUC: join password-protected room Mikael Berthe <mikael@lilotux.net> parents: 896 diff changeset	916 }
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	917
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	918 jab_send(jc, x);
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	919 xmlnode_free(x);
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	920 jb_reset_keepalive();
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	921 g_free(roomid);
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	922 }
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	923
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	924 // Unlock a MUC room
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	925 // room syntax: "room@server"
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	926 void jb_room_unlock(const char *room)
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	927 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	928 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	929 eviqs *iqn;
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	930
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	931 if (!online \|\| !room) return;
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	932
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	933 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	934 "unlock", IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	935 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	936 y = xmlnode_get_tag(iqn->xmldata, "query");
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	937 z = xmlnode_insert_tag(y, "x");
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	938 xmlnode_put_attrib(z, "xmlns", "jabber:x:data");
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	939 xmlnode_put_attrib(z, "type", "submit");
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	940
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	941 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	942 iqs_del(iqn->id); // XXX
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	943 jb_reset_keepalive();
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	944 }
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	945
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	946 // Destroy a MUC room
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	947 // room syntax: "room@server"
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	948 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	949 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	950 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	951 eviqs *iqn;
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	952
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	953 if (!online \|\| !room) return;
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	954
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	955 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	956 "destroy", IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	957 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	958 y = xmlnode_get_tag(iqn->xmldata, "query");
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	959 z = xmlnode_insert_tag(y, "destroy");
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	960
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	961 if (venue && *venue)
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	962 xmlnode_put_attrib(z, "jid", venue);
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	963
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	964 if (reason) {
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	965 y = xmlnode_insert_tag(z, "reason");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	966 xmlnode_insert_cdata(y, reason, (unsigned) -1);
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	967 }
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	968
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	969 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	970 iqs_del(iqn->id); // XXX
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	971 jb_reset_keepalive();
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	972 }
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	973
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	974 // Change role or affiliation of a MUC user
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	975 // room syntax: "room@server"
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	976 // 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	977 // allowed)
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	978 // ra: new role or affiliation
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	979 // (ex. role none for kick, affil outcast for ban...)
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	980 // The reason can be null
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	981 // Return 0 if everything is ok
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	982 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	983 struct role_affil ra, const char *reason)
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	984 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	985 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	986 eviqs *iqn;
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	987
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	988 if (!online \|\| !roomid) return 1;
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	989 if (!jid && !nick) return 1;
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	990
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	991 if (check_jid_syntax((char*)roomid)) {
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	992 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	993 return 1;
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	994 }
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	995 if (jid && check_jid_syntax((char*)jid)) {
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	996 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	997 return 1;
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	998 }
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	999
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1000 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	1001 return 1; // Shouldn't happen (jid mandatory when banning)
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1002
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1003 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	1004 "roleaffil", IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1005 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	1006 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	1007 y = xmlnode_get_tag(iqn->xmldata, "query");
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1008 z = xmlnode_insert_tag(y, "item");
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1009
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1010 if (jid) {
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1011 xmlnode_put_attrib(z, "jid", jid);
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1012 } else { // nickname
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1013 xmlnode_put_attrib(z, "nick", nick);
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1014 }
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1015
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1016 if (ra.type == type_affil)
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1017 xmlnode_put_attrib(z, "affiliation", straffil[ra.val.affil]);
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1018 else if (ra.type == type_role)
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1019 xmlnode_put_attrib(z, "role", strrole[ra.val.role]);
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1020
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1021 if (reason) {
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1022 y = xmlnode_insert_tag(z, "reason");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1023 xmlnode_insert_cdata(y, reason, (unsigned) -1);
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1024 }
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1025
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1026 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1027 iqs_del(iqn->id); // XXX
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1028 jb_reset_keepalive();
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1029
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1030 return 0;
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1031 }
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1032
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1033 // Invite a user to a MUC room
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1034 // room syntax: "room@server"
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1035 // reason can be null.
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1036 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	1037 {
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1038 xmlnode x, y, z;
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1039
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1040 if (!online \|\| !room \|\| !jid) return;
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1041
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1042 x = jutil_msgnew(NULL, (char*)room, NULL, NULL);
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1043
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1044 y = xmlnode_insert_tag(x, "x");
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1045 xmlnode_put_attrib(y, "xmlns", "http://jabber.org/protocol/muc#user");
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1046
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1047 z = xmlnode_insert_tag(y, "invite");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1048 xmlnode_put_attrib(z, "to", jid);
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1049
569 69afee8e1232 "/room invite": Do not send epty reason Mikael Berthe <mikael@lilotux.net> parents: 568 diff changeset	1050 if (reason) {
69afee8e1232 "/room invite": Do not send epty reason Mikael Berthe <mikael@lilotux.net> parents: 568 diff changeset	1051 y = xmlnode_insert_tag(z, "reason");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1052 xmlnode_insert_cdata(y, reason, (unsigned) -1);
569 69afee8e1232 "/room invite": Do not send epty reason Mikael Berthe <mikael@lilotux.net> parents: 568 diff changeset	1053 }
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1054
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1055 jab_send(jc, x);
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1056 xmlnode_free(x);
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1057 jb_reset_keepalive();
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1058 }
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1059
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	1060 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	1061 const char *enc, time_t timestamp)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	1062 {
113 8ac67e951eab [/trunk] Changeset 127 by mikael mikael parents: 112 diff changeset	1063 char *jid;
956 819396bebdf5 Do not block system messages when block_unsubscribed is set Mikael Berthe <mikael@lilotux.net> parents: 940 diff changeset	1064 const char rname, s;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	1065
441 51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	1066 jid = jidtodisp(from);
51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	1067
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 960 diff changeset	1068 rname = strchr(from, JID_RESOURCE_SEPARATOR);
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1069 if (rname) rname++;
819 c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1070
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1071 // Check for unexpected groupchat messages
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1072 // If we receive a groupchat message from a room we're not a member of,
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1073 // this is probably a server issue and the best we can do is to send
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1074 // a type unavailable.
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1075 if (type && !strcmp(type, "groupchat") && !roster_getnickname(jid)) {
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1076 // It shouldn't happen, probably a server issue
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1077 GSList *room_elt;
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1078 char *mbuf;
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1079
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1080 mbuf = g_strdup_printf("Unexpected groupchat packet!");
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1081 scr_LogPrint(LPRINT_LOGNORM, "%s", mbuf);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1082 scr_WriteIncomingMessage(jid, mbuf, 0, HBB_PREFIX_INFO);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1083 g_free(mbuf);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1084
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1085 // Send back an unavailable packet
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1086 jb_setstatus(offline, jid, "");
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1087
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1088 // MUC
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1089 // Make sure this is a room (it can be a conversion user->room)
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1090 room_elt = roster_find(jid, jidsearch, 0);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1091 if (!room_elt) {
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1092 room_elt = roster_add_user(jid, NULL, NULL, ROSTER_TYPE_ROOM, sub_none);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1093 } else {
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1094 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1095 }
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1096
896 39aff86d64e7 Fix a small memory leak Mikael Berthe <mikael@lilotux.net> parents: 891 diff changeset	1097 g_free(jid);
39aff86d64e7 Fix a small memory leak Mikael Berthe <mikael@lilotux.net> parents: 891 diff changeset	1098
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1099 buddylist_build();
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1100 scr_DrawRoster();
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1101 return;
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1102 }
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1103
819 c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1104 // We don't call the message_in hook if 'block_unsubscribed' is true and
c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1105 // this is a regular message from an unsubscribed user.
956 819396bebdf5 Do not block system messages when block_unsubscribed is set Mikael Berthe <mikael@lilotux.net> parents: 940 diff changeset	1106 // System messages (from our server) are allowed.
819 c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1107 if (!settings_opt_get_int("block_unsubscribed") \|\|
c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1108 (roster_getsubscription(jid) & sub_from) \|\|
956 819396bebdf5 Do not block system messages when block_unsubscribed is set Mikael Berthe <mikael@lilotux.net> parents: 940 diff changeset	1109 (type && strcmp(type, "chat")) \|\|
819396bebdf5 Do not block system messages when block_unsubscribed is set Mikael Berthe <mikael@lilotux.net> parents: 940 diff changeset	1110 ((s = settings_opt_get("server")) != NULL && !strcasecmp(jid, s))) {
819 c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1111 hk_message_in(jid, rname, timestamp, body, type);
c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1112 } else {
c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1113 scr_LogPrint(LPRINT_LOGNORM, "Blocked a message from <%s>", jid);
c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1114 }
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	1115 g_free(jid);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	1116 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	1117
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	1118 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	1119 {
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1120 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	1121
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1122 switch(code) {
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1123 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	1124 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1125 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	1126 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1127 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	1128 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1129 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	1130 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1131 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	1132 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1133 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	1134 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1135 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	1136 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1137 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	1138 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1139 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	1140 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1141 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	1142 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1143 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	1144 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1145 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	1146 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1147 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	1148 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1149 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	1150 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1151 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	1152 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1153 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	1154 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1155 default:
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1156 desc = NULL;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1157 }
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1158
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1159 return desc;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1160 }
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1161
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1162 // display_server_error(x)
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1163 // 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	1164 // x: error tag xmlnode pointer
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	1165 void display_server_error(xmlnode x)
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1166 {
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1167 const char *desc = NULL;
862 5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1168 char *sdesc;
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1169 int code = 0;
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1170 char *s;
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1171 const char *p;
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1172
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1173 /* RFC3920:
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1174 * The <error/> element:
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1175 * 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	1176 * 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	1177 * 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	1178 */
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1179 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	1180 if (p)
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1181 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	1182
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1183 // For backward compatibility
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1184 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	1185 code = atoi(s);
2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1186 // Default message
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1187 desc = defaulterrormsg(code);
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1188 }
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1189
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1190 // 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	1191 s = xmlnode_get_data(x);
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1192 if (s && *s) desc = s;
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1193
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1194 // 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	1195 s = xmlnode_get_tag_data(x, "text");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1196 if (s && *s) desc = s;
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1197
862 5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1198 // Strip trailing newlines
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1199 sdesc = g_strdup(desc);
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1200 for (s = sdesc; *s; s++) ;
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1201 if (s > sdesc)
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1202 s--;
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1203 while (s >= sdesc && (s == '\n' \|\| s == '\r'))
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1204 *s-- = '\0';
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1205
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1206 scr_LogPrint(LPRINT_LOGNORM, "Error code from server: %d %s", code, sdesc);
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1207 g_free(sdesc);
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1208 }
2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1209
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	1210 static void statehandler(jconn conn, int state)
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1211 {
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1212 static int previous_state = -1;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1213
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1214 scr_LogPrint(LPRINT_DEBUG, "StateHandler called (state=%d).", state);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1215
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1216 switch(state) {
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1217 case JCONN_STATE_OFF:
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	1218 if (previous_state != JCONN_STATE_OFF)
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1219 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Not connected to the server");
37 1441ba37a5c1 [/trunk] Changeset 53 by mikael mikael parents: 36 diff changeset	1220
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	1221 online = FALSE;
159 ba51d1737086 [/trunk] Changeset 171 by mikael mikael parents: 154 diff changeset	1222 mystatus = offline;
519 5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	1223 if (mystatusmsg) {
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	1224 g_free(mystatusmsg);
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	1225 mystatusmsg = NULL;
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	1226 }
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	1227 roster_free();
faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	1228 update_roster = TRUE;
865 cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 864 diff changeset	1229 scr_UpdateBuddyWindow();
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1230 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1231
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1232 case JCONN_STATE_CONNECTED:
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1233 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Connected to the server");
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1234 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1235
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1236 case JCONN_STATE_AUTH:
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1237 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Authenticating to the server");
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1238 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1239
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1240 case JCONN_STATE_ON:
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1241 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Communication with the server "
bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1242 "established");
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	1243 online = TRUE;
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1244 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1245
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	1246 case JCONN_STATE_CONNECTING:
357 e8adc3c96e68 Better messages for server connection states Mikael Berthe <mikael@lilotux.net> parents: 353 diff changeset	1247 if (previous_state != state)
408 73433860665c Tune previous usleep() change Mikael Berthe <mikael@lilotux.net> parents: 407 diff changeset	1248 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Connecting to the server");
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	1249 break;
a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	1250
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1251 default:
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1252 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1253 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1254 previous_state = state;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1255 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1256
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1257 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	1258 {
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1259 xmlnode x;
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1260 char *p;
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1261
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1262 x = xmlnode_get_firstchild(xmldata);
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1263 for ( ; x; x = xmlnode_get_nextsibling(x)) {
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1264 if ((p = xmlnode_get_attrib(x, "xmlns")) && !strcmp(p, xmlns))
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1265 break;
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1266 }
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1267 return x;
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1268 }
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 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	1271 {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1272 xmlnode x;
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1273 char *p;
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 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	1276 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	1277 return from_iso8601(p, 1);
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1278 return 0;
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1279 }
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1280
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1281 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	1282 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	1283 enum imstatus ust, char *ustmsg,
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1284 time_t usttime, char bpprio)
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1285 {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1286 xmlnode y;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1287 char *p;
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1288 char *mbuf;
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1289 const char *ournick;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1290 enum imrole mbrole = role_none;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1291 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	1292 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	1293 const char actorjid = NULL, reason = NULL;
837 7c74eef1d0e0 New option "muc_auto_whois" Mikael Berthe <mikael@lilotux.net> parents: 834 diff changeset	1294 bool new_member = FALSE; // True if somebody else joins the room (not us)
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1295 unsigned int statuscode = 0;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1296 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	1297 int log_muc_conf;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1298
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1299 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	1300
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1301 room_elt = roster_find(roomjid, jidsearch, 0);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1302 if (!room_elt) {
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1303 // Add room if it doesn't already exist
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1304 // It shouldn't happen, there is probably something wrong (server or
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1305 // network issue?)
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	1306 room_elt = roster_add_user(roomjid, NULL, NULL, ROSTER_TYPE_ROOM, sub_none);
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1307 scr_LogPrint(LPRINT_LOGNORM, "Strange MUC presence message");
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1308 } else {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1309 // 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	1310 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1311 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1312
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1313 // Get room member's information
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1314 y = xmlnode_get_tag(xmldata, "item");
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1315 if (y) {
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1316 xmlnode z;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1317 p = xmlnode_get_attrib(y, "affiliation");
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1318 if (p) {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1319 if (!strcmp(p, "owner")) mbaffil = affil_owner;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1320 else if (!strcmp(p, "admin")) mbaffil = affil_admin;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1321 else if (!strcmp(p, "member")) mbaffil = affil_member;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1322 else if (!strcmp(p, "outcast")) mbaffil = affil_outcast;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1323 else if (!strcmp(p, "none")) mbaffil = affil_none;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1324 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	1325 from, p);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1326 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1327 p = xmlnode_get_attrib(y, "role");
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1328 if (p) {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1329 if (!strcmp(p, "moderator")) mbrole = role_moderator;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1330 else if (!strcmp(p, "participant")) mbrole = role_participant;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1331 else if (!strcmp(p, "visitor")) mbrole = role_visitor;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1332 else if (!strcmp(p, "none")) mbrole = role_none;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1333 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	1334 from, p);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1335 }
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1336 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	1337 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	1338 // 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	1339 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	1340 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	1341 if (z)
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1342 actorjid = xmlnode_get_attrib(z, "jid");
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1343 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1344
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1345 // Get our room nickname
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1346 ournick = buddy_getnickname(room_elt->data);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1347
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1348 if (!ournick) {
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1349 // It shouldn't happen, probably a server issue
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1350 mbuf = g_strdup_printf("Unexpected groupchat packet!");
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1351
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1352 scr_LogPrint(LPRINT_LOGNORM, "%s", mbuf);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1353 scr_WriteIncomingMessage(roomjid, mbuf, 0, HBB_PREFIX_INFO);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1354 g_free(mbuf);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1355 // Send back an unavailable packet
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1356 jb_setstatus(offline, roomjid, "");
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1357 buddylist_build();
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1358 scr_DrawRoster();
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1359 return;
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1360 }
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1361
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1362 // 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	1363 // 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	1364 // 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	1365 // 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	1366 // 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	1367 // 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	1368 y = xmlnode_get_tag(xmldata, "status");
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1369 if (y) {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1370 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	1371 if (p)
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1372 statuscode = atoi(p);
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1373 }
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1374
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1375 // 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	1376 if (statuscode == 303 && mbnick) {
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1377 mbuf = g_strdup_printf("%s is now known as %s", rname, mbnick);
632 cfab93886a88 MUC: use timestamp when available Mikael Berthe <mikael@lilotux.net> parents: 628 diff changeset	1378 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	1379 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	1380 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	1381 g_free(mbuf);
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1382 buddy_resource_setname(room_elt->data, rname, mbnick);
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1383 // Maybe it's _our_ nickname...
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1384 if (ournick && !strcmp(rname, ournick))
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1385 buddy_setnickname(room_elt->data, mbnick);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1386 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1387
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1388 // 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	1389 if (!mbnick && mbrole == role_none) {
586 d8f64e74206c Missing initialization Mikael Berthe <mikael@lilotux.net> parents: 584 diff changeset	1390 enum { leave=0, kick, ban } how = leave;
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1391 bool we_left = FALSE;
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1392
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1393 if (statuscode == 307)
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1394 how = kick;
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1395 else if (statuscode == 301)
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1396 how = ban;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1397
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1398 // If this is a leave, check if it is ourself
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1399 if (ournick && !strcmp(rname, ournick)) {
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1400 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	1401 buddy_setinsideroom(room_elt->data, FALSE);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1402 buddy_setnickname(room_elt->data, NULL);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1403 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	1404 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	1405 scr_UpdateChatStatus(FALSE);
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1406 update_roster = TRUE;
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1407 }
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1408
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1409 // The message depends on _who_ left, and _how_
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1410 if (how) {
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1411 gchar *mbuf_end;
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1412 // Forced leave
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1413 if (actorjid) {
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1414 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	1415 (how == ban ? "banned" : "kicked"),
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1416 roomjid, actorjid, reason);
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1417 } else {
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1418 mbuf_end = g_strdup_printf("%s from %s.",
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1419 (how == ban ? "banned" : "kicked"),
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1420 roomjid);
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1421 }
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1422 if (we_left)
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1423 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	1424 else
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1425 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	1426
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1427 g_free(mbuf_end);
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1428 } else {
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1429 // Natural leave
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1430 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	1431 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	1432 if (destroynode) {
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1433 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	1434 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	1435 "the room has been destroyed: %s",
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1436 roomjid, reason);
616 a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1437 } else {
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1438 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	1439 "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	1440 }
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	1441 } else {
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1442 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	1443 }
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1444 } else {
845 51829325fe21 MUC: Fix a strange bug when a user isn't in a room anymore (network issue) Mikael Berthe <mikael@lilotux.net> parents: 842 diff changeset	1445 if (ust != offline) {
51829325fe21 MUC: Fix a strange bug when a user isn't in a room anymore (network issue) Mikael Berthe <mikael@lilotux.net> parents: 842 diff changeset	1446 // This can happen when a network failure occurs,
51829325fe21 MUC: Fix a strange bug when a user isn't in a room anymore (network issue) Mikael Berthe <mikael@lilotux.net> parents: 842 diff changeset	1447 // this isn't an official leave but the user isn't there anymore.
51829325fe21 MUC: Fix a strange bug when a user isn't in a room anymore (network issue) Mikael Berthe <mikael@lilotux.net> parents: 842 diff changeset	1448 mbuf = g_strdup_printf("%s has disappeared!", rname);
51829325fe21 MUC: Fix a strange bug when a user isn't in a room anymore (network issue) Mikael Berthe <mikael@lilotux.net> parents: 842 diff changeset	1449 ust = offline;
51829325fe21 MUC: Fix a strange bug when a user isn't in a room anymore (network issue) Mikael Berthe <mikael@lilotux.net> parents: 842 diff changeset	1450 } else {
51829325fe21 MUC: Fix a strange bug when a user isn't in a room anymore (network issue) Mikael Berthe <mikael@lilotux.net> parents: 842 diff changeset	1451 if (ustmsg)
51829325fe21 MUC: Fix a strange bug when a user isn't in a room anymore (network issue) Mikael Berthe <mikael@lilotux.net> parents: 842 diff changeset	1452 mbuf = g_strdup_printf("%s has left: %s", rname, ustmsg);
51829325fe21 MUC: Fix a strange bug when a user isn't in a room anymore (network issue) Mikael Berthe <mikael@lilotux.net> parents: 842 diff changeset	1453 else
51829325fe21 MUC: Fix a strange bug when a user isn't in a room anymore (network issue) Mikael Berthe <mikael@lilotux.net> parents: 842 diff changeset	1454 mbuf = g_strdup_printf("%s has left", rname);
51829325fe21 MUC: Fix a strange bug when a user isn't in a room anymore (network issue) Mikael Berthe <mikael@lilotux.net> parents: 842 diff changeset	1455 }
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	1456 }
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1457 }
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1458
632 cfab93886a88 MUC: use timestamp when available Mikael Berthe <mikael@lilotux.net> parents: 628 diff changeset	1459 scr_WriteIncomingMessage(roomjid, mbuf, usttime,
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1460 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG);
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1461
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1462 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	1463
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	1464 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	1465 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	1466 g_free(mbuf);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1467 return;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1468 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1469 g_free(mbuf);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1470 } 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	1471 ust != offline) {
645 d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1472
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1473 if (!buddy_getinsideroom(room_elt->data)) {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1474 // 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	1475 // 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	1476
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1477 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	1478 // Set the message flag unless we're already in the room buffer window
891 78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed() Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	1479 scr_setmsgflag_if_needed(roomjid, FALSE);
633 514aa246081d Log to the tracelog file when joining a room Mikael Berthe <mikael@lilotux.net> parents: 632 diff changeset	1480 // 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	1481 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	1482 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	1483 g_free(mbuf);
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1484 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	1485
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1486 // 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	1487 if (strcmp(ournick, rname)) {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1488 // 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	1489 // 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	1490 // so we use 0 here.
936df057dda0 MUC: Fix a timestamp issue when joining a room Mikael Berthe <mikael@lilotux.net> parents: 649 diff changeset	1491 scr_WriteIncomingMessage(roomjid, mbuf, 0,
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1492 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1493 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	1494 g_free(mbuf);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1495 mbuf = g_strdup_printf("%s has joined", rname);
837 7c74eef1d0e0 New option "muc_auto_whois" Mikael Berthe <mikael@lilotux.net> parents: 834 diff changeset	1496 new_member = TRUE;
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1497 }
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1498 } else {
837 7c74eef1d0e0 New option "muc_auto_whois" Mikael Berthe <mikael@lilotux.net> parents: 834 diff changeset	1499 if (strcmp(ournick, rname)) {
645 d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1500 mbuf = g_strdup_printf("%s has joined", rname);
837 7c74eef1d0e0 New option "muc_auto_whois" Mikael Berthe <mikael@lilotux.net> parents: 834 diff changeset	1501 new_member = TRUE;
7c74eef1d0e0 New option "muc_auto_whois" Mikael Berthe <mikael@lilotux.net> parents: 834 diff changeset	1502 } else
645 d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1503 mbuf = NULL;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1504 }
645 d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1505
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1506 if (mbuf) {
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1507 scr_WriteIncomingMessage(roomjid, mbuf, usttime,
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1508 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG);
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1509 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	1510 g_free(mbuf);
d26a1c9611db Small handle_presence_muc() update Mikael Berthe <mikael@lilotux.net> parents: 644 diff changeset	1511 }
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1512 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1513
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1514 // Update room member status
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	1515 if (rname) {
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1516 roster_setstatus(roomjid, rname, bpprio, ust, ustmsg, usttime,
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1517 mbrole, mbaffil, mbjid);
837 7c74eef1d0e0 New option "muc_auto_whois" Mikael Berthe <mikael@lilotux.net> parents: 834 diff changeset	1518 if (new_member && settings_opt_get_int("muc_auto_whois")) {
7c74eef1d0e0 New option "muc_auto_whois" Mikael Berthe <mikael@lilotux.net> parents: 834 diff changeset	1519 // FIXME: This will fail for some UTF-8 nicknames.
7c74eef1d0e0 New option "muc_auto_whois" Mikael Berthe <mikael@lilotux.net> parents: 834 diff changeset	1520 gchar *joiner_nick = from_utf8(rname);
960 90ff94f0fbbb Auto-whois shouldn't enable chat mode Mikael Berthe <mikael@lilotux.net> parents: 956 diff changeset	1521 room_whois(room_elt->data, joiner_nick, FALSE);
837 7c74eef1d0e0 New option "muc_auto_whois" Mikael Berthe <mikael@lilotux.net> parents: 834 diff changeset	1522 g_free(joiner_nick);
7c74eef1d0e0 New option "muc_auto_whois" Mikael Berthe <mikael@lilotux.net> parents: 834 diff changeset	1523 }
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	1524 } else
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1525 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	1526
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1527 buddylist_build();
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1528 scr_DrawRoster();
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1529 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1530
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1531 static void handle_packet_presence(jconn conn, char type, char from,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1532 xmlnode xmldata)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1533 {
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1534 char p, r;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1535 char *ustmsg;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1536 const char *rname;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1537 enum imstatus ust;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1538 char bpprio;
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1539 time_t timestamp = 0;
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1540 xmlnode muc_packet;
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1541
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 960 diff changeset	1542 rname = strchr(from, JID_RESOURCE_SEPARATOR);
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1543 if (rname) rname++;
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 r = jidtodisp(from);
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1546
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1547 // Check for MUC presence packet
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1548 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	1549
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1550 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	1551 xmlnode x;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1552 scr_LogPrint(LPRINT_LOGNORM, "Error presence packet from <%s>", r);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1553 if ((x = xmlnode_get_tag(xmldata, TMSG_ERROR)) != NULL)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1554 display_server_error(x);
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1555
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1556 // 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	1557 // 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	1558 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	1559 if (atoi(p) == 409) {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1560 // 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	1561 // 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	1562 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	1563 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	1564 buddy_setnickname(room_elt->data, NULL);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1565 }
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1566 }
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1567
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1568 g_free(r);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1569 return;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1570 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1571
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1572 p = xmlnode_get_tag_data(xmldata, "priority");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1573 if (p && *p) bpprio = (gchar)atoi(p);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1574 else bpprio = 0;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1575
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1576 ust = available;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1577 p = xmlnode_get_tag_data(xmldata, "show");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1578 if (p) {
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1579 if (!strcmp(p, "away")) ust = away;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1580 else if (!strcmp(p, "dnd")) ust = dontdisturb;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1581 else if (!strcmp(p, "xa")) ust = notavail;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1582 else if (!strcmp(p, "chat")) ust = freeforchat;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1583 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1584
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1585 if (type && !strcmp(type, "unavailable"))
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1586 ust = offline;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1587
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1588 ustmsg = xmlnode_get_tag_data(xmldata, "status");
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1589
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1590 // Timestamp?
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1591 timestamp = xml_get_timestamp(xmldata);
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1592
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1593 if (muc_packet) {
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1594 // 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	1595 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	1596 ust, ustmsg, timestamp, bpprio);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1597 } else {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1598 // 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	1599 // 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	1600 // status message is different
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1601 const char *m = roster_getstatusmsg(r, rname);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1602 if ((ust != roster_getstatus(r, rname)) \|\|
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	1603 (!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	1604 hk_statuschange(r, rname, bpprio, timestamp, ust, ustmsg);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1605 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1606
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1607 g_free(r);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1608 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1609
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1610 static void handle_packet_message(jconn conn, char type, char from,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1611 xmlnode xmldata)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1612 {
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1613 char p, r, *s;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1614 xmlnode x;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1615 char *body = NULL;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1616 char *enc = NULL;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1617 char *tmp = NULL;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1618 time_t timestamp = 0;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1619
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1620 body = xmlnode_get_tag_data(xmldata, "body");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1621
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1622 p = xmlnode_get_tag_data(xmldata, "subject");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1623 if (p != NULL) {
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1624 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	1625 GSList *roombuddy;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1626 gchar *mbuf;
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1627 gchar *subj = p;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1628 // Get the room (s) and the nickname (r)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1629 s = g_strdup(from);
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 960 diff changeset	1630 r = strchr(s, JID_RESOURCE_SEPARATOR);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1631 if (r) *r++ = 0;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1632 else r = s;
549 448e299e45da MUC: "/room topic" shows the current room topic Mikael Berthe <mikael@lilotux.net> parents: 547 diff changeset	1633 // Set the new topic
448e299e45da MUC: "/room topic" shows the current room topic Mikael Berthe <mikael@lilotux.net> parents: 547 diff changeset	1634 roombuddy = roster_find(s, jidsearch, 0);
448e299e45da MUC: "/room topic" shows the current room topic Mikael Berthe <mikael@lilotux.net> parents: 547 diff changeset	1635 if (roombuddy)
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1636 buddy_settopic(roombuddy->data, subj);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1637 // Display inside the room window
560 64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	1638 if (r == s) {
64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	1639 // No specific resource (this is certainly history)
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1640 mbuf = g_strdup_printf("The topic has been set to: %s", subj);
560 64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	1641 } else {
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1642 mbuf = g_strdup_printf("%s has set the topic to: %s", r, subj);
560 64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	1643 }
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1644 scr_WriteIncomingMessage(s, mbuf, 0,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1645 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1646 if (settings_opt_get_int("log_muc_conf"))
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1647 hlog_write_message(s, 0, FALSE, mbuf);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1648 g_free(s);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1649 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	1650 // 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	1651 scr_UpdateChatStatus(TRUE);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1652 } else { // Chat message
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1653 tmp = g_new(char, (body ? strlen(body) : 0) + strlen(p) + 4);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1654 *tmp = '[';
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1655 strcpy(tmp+1, p);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1656 strcat(tmp, "]\n");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1657 if (body) strcat(tmp, body);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1658 body = tmp;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1659 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1660 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1661
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1662 handle_state_events(from, xmldata);
ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1663
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1664 // Not used yet...
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1665 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	1666 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	1667 enc = p;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1668 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1669
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1670 // Timestamp?
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1671 timestamp = xml_get_timestamp(xmldata);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1672
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1673 if (type && !strcmp(type, TMSG_ERROR)) {
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1674 if ((x = xmlnode_get_tag(xmldata, TMSG_ERROR)) != NULL)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1675 display_server_error(x);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1676 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1677 if (from && body)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1678 gotmessage(type, from, body, enc, timestamp);
774 46304b773a44 Remove useless checks before g_free() calls Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	1679 g_free(tmp);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1680 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1681
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1682 void handle_state_events(char *from, xmlnode xmldata)
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1683 {
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1684 #if defined JEP0022 \|\| defined JEP0085
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	1685 xmlnode state_ns = NULL;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1686 const char *body;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1687 char rname, jid;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1688 GSList *sl_buddy;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1689 guint events;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1690 guint which_jep = 0; /* 0: none, 1: 85, 2: 22 */
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	1691 struct jep0022 *jep22 = NULL;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	1692 struct jep0085 *jep85 = NULL;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1693
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1694 rname = strchr(from, JID_RESOURCE_SEPARATOR);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1695 jid = jidtodisp(from);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1696 sl_buddy = roster_find(jid, jidsearch, ROSTER_TYPE_USER);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1697
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1698 /* XXX Actually that's wrong, since it filters out server "offline"
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1699 messages (for JEP-0022) */
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1700 if (!sl_buddy \|\| !rname++) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1701 g_free(jid);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1702 return;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1703 }
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1704
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1705 events = buddy_resource_getevents(sl_buddy->data, rname);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1706
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1707 jep85 = buddy_resource_jep85(sl_buddy->data, rname);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1708 if (jep85) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1709 state_ns = xml_get_xmlns(xmldata, NS_CHATSTATES);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1710 if (state_ns)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1711 which_jep = 1;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1712 }
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1713
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1714 if (which_jep != 1) { /* Fall back to JEP-0022 */
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1715 jep22 = buddy_resource_jep22(sl_buddy->data, rname);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1716 if (jep22) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1717 state_ns = xml_get_xmlns(xmldata, NS_EVENT);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1718 if (state_ns)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1719 which_jep = 2;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1720 }
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1721 }
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1722
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1723 if (!which_jep) { /* Sender does not use chat states */
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1724 g_free(jid);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1725 return;
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1726 }
ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1727
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1728 body = xmlnode_get_tag_data(xmldata, "body");
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1729
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1730 if (which_jep == 1) { /* JEP-0085 */
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1731 const char *p;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1732 jep85->support = CHATSTATES_SUPPORT_OK;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1733
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1734 p = xmlnode_get_name(state_ns);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1735 if (!strcmp(p, "composing")) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1736 jep85->last_state_rcvd = ROSTER_EVENT_COMPOSING;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1737 } else if (!strcmp(p, "active")) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1738 jep85->last_state_rcvd = ROSTER_EVENT_ACTIVE;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1739 } else if (!strcmp(p, "paused")) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1740 jep85->last_state_rcvd = ROSTER_EVENT_PAUSED;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1741 } else if (!strcmp(p, "inactive")) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1742 jep85->last_state_rcvd = ROSTER_EVENT_INACTIVE;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1743 } else if (!strcmp(p, "gone")) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1744 jep85->last_state_rcvd = ROSTER_EVENT_GONE;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1745 }
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1746
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1747 if (jep85->last_state_rcvd == ROSTER_EVENT_COMPOSING)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1748 events = ROSTER_EVENT_COMPOSING;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1749 else
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1750 events = ROSTER_EVENT_NONE;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1751 } else { /* JEP-0022 */
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	1752 #ifdef JEP0022
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1753 const char *msgid;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1754 jep22->support = CHATSTATES_SUPPORT_OK;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1755 jep22->last_state_rcvd = ROSTER_EVENT_NONE;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1756
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1757 msgid = xmlnode_get_attrib(xmldata, "id");
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1758
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1759 if (xmlnode_get_tag(state_ns, "composing")) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1760 // Clear composing if the message contains a body
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1761 if (body)
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1762 events &= ~ROSTER_EVENT_COMPOSING;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1763 else
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1764 events \|= ROSTER_EVENT_COMPOSING;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1765 jep22->last_state_rcvd \|= ROSTER_EVENT_COMPOSING;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1766
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1767 } else {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1768 events &= ~ROSTER_EVENT_COMPOSING;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1769 }
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1770
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1771 // Cache the message id
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1772 g_free(jep22->last_msgid_rcvd);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1773 if (msgid)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1774 jep22->last_msgid_rcvd = g_strdup(msgid);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1775 else
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1776 jep22->last_msgid_rcvd = NULL;
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	1777
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	1778 if (xmlnode_get_tag(state_ns, "delivered")) {
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	1779 jep22->last_state_rcvd \|= ROSTER_EVENT_DELIVERED;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	1780
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	1781 // Do we have to send back an ACK?
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	1782 if (body)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	1783 jb_send_jep22_event(from, ROSTER_EVENT_DELIVERED);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	1784 }
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	1785 #endif
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1786 }
ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1787
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1788 buddy_resource_setevents(sl_buddy->data, rname, events);
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1789
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1790 update_roster = TRUE;
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1791
ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1792 g_free(jid);
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1793 #endif
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1794 }
ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	1795
752 d2d5ee71e68c Fix small typo Mikael Berthe <mikael@lilotux.net> parents: 751 diff changeset	1796 static void evscallback_subscription(eviqs *evp, guint evcontext)
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1797 {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1798 char *barejid;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1799 char *buf;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1800
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1801 if (evcontext == EVS_CONTEXT_TIMEOUT) {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1802 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	1803 evp->id);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1804 return;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1805 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1806 if (evcontext == EVS_CONTEXT_CANCEL) {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1807 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	1808 return;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1809 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1810 if (!(evcontext & EVS_CONTEXT_USER))
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1811 return;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1812
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1813 // Sanity check
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1814 if (!evp->data) {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1815 // 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	1816 scr_LogPrint(LPRINT_LOGNORM, "Error in evs callback.");
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1817 return;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1818 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1819
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1820 // Ok, let's work now.
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1821 // evcontext: 0, 1 == reject, accept
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1822
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1823 barejid = evp->data;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1824
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1825 if (evcontext & ~EVS_CONTEXT_USER) {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1826 // Accept subscription request
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1827 jb_subscr_send_auth(barejid);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1828 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	1829 barejid);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1830 } else {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1831 // Reject subscription request
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1832 jb_subscr_cancel_auth(barejid);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1833 buf = g_strdup_printf("<%s> won't receive your presence updates", barejid);
823 19c615fd071e New option "delete_on_reject" Mikael Berthe <mikael@lilotux.net> parents: 819 diff changeset	1834 if (settings_opt_get_int("delete_on_reject")) {
19c615fd071e New option "delete_on_reject" Mikael Berthe <mikael@lilotux.net> parents: 819 diff changeset	1835 // Remove the buddy from the roster if there is no current subscription
19c615fd071e New option "delete_on_reject" Mikael Berthe <mikael@lilotux.net> parents: 819 diff changeset	1836 if (roster_getsubscription(barejid) == sub_none)
19c615fd071e New option "delete_on_reject" Mikael Berthe <mikael@lilotux.net> parents: 819 diff changeset	1837 jb_delbuddy(barejid);
19c615fd071e New option "delete_on_reject" Mikael Berthe <mikael@lilotux.net> parents: 819 diff changeset	1838 }
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1839 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1840 scr_WriteIncomingMessage(barejid, buf, 0, HBB_PREFIX_INFO);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1841 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1842 g_free(buf);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1843 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1844
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1845 static void handle_packet_s10n(jconn conn, char type, char from,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1846 xmlnode xmldata)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1847 {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1848 char *r;
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1849 char *buf;
818 55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	1850 int newbuddy;
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1851
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1852 r = jidtodisp(from);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1853
818 55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	1854 newbuddy = !roster_find(r, jidsearch, 0);
55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	1855
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1856 if (!strcmp(type, "subscribe")) {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1857 /* The sender wishes to subscribe to our presence */
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1858 char *msg;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1859 int isagent;
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1860 eviqs *evn;
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1861
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1862 isagent = (roster_gettype(r) & ROSTER_TYPE_AGENT) != 0;
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1863 msg = xmlnode_get_tag_data(xmldata, "status");
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1864
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1865 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	1866 from);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1867 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1868 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1869 g_free(buf);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1870
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1871 if (msg) {
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1872 buf = g_strdup_printf("<%s> said: %s", from, msg);
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1873 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO);
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1874 replace_nl_with_dots(buf);
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1875 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1876 g_free(buf);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1877 }
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1878
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1879 // Create a new event item
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	1880 evn = evs_new(EVS_TYPE_SUBSCRIPTION, EVS_MAX_TIMEOUT);
751 4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	1881 if (evn) {
752 d2d5ee71e68c Fix small typo Mikael Berthe <mikael@lilotux.net> parents: 751 diff changeset	1882 evn->callback = &evscallback_subscription;
751 4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	1883 evn->data = g_strdup(r);
754 5b962b978573 Add event description when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 752 diff changeset	1884 evn->desc = g_strdup_printf("<%s> wants to subscribe to your "
5b962b978573 Add event description when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 752 diff changeset	1885 "presence updates", r);
751 4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	1886 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	1887 } else {
4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	1888 buf = g_strdup_printf("Unable to create a new event!");
4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	1889 }
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1890 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1891 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1892 g_free(buf);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1893 } else if (!strcmp(type, "unsubscribe")) {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1894 /* The sender is unsubscribing from our presence */
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1895 jb_subscr_cancel_auth(from);
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1896 buf = g_strdup_printf("<%s> is unsubscribing from your "
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1897 "presence updates", from);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1898 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1899 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1900 g_free(buf);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	1901 } else if (!strcmp(type, "subscribed")) {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1902 /* The sender has allowed us to receive their presence */
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1903 buf = g_strdup_printf("<%s> has allowed you to receive their "
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1904 "presence updates", from);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1905 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1906 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1907 g_free(buf);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	1908 } else if (!strcmp(type, "unsubscribed")) {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1909 /* The subscription request has been denied or a previously-granted
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1910 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	1911 roster_unsubscribed(from);
859 cb2a3a1d985f Make sure we update the roster when a subscription is cancelled Mikael Berthe <mikael@lilotux.net> parents: 845 diff changeset	1912 update_roster = TRUE;
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1913 buf = g_strdup_printf("<%s> has cancelled your subscription to "
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1914 "their presence updates", from);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1915 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1916 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1917 g_free(buf);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	1918 } else {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1919 scr_LogPrint(LPRINT_LOGNORM, "Received unrecognized packet from <%s>, "
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1920 "type=%s", from, (type ? type : ""));
818 55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	1921 newbuddy = FALSE;
55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	1922 }
55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	1923
55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	1924 if (newbuddy) {
55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	1925 buddylist_build();
55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	1926 update_roster = TRUE;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1927 }
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1928 g_free(r);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1929 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1930
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	1931 static void packethandler(jconn conn, jpacket packet)
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1932 {
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1933 char *p;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1934 char from=NULL, type=NULL;
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1935
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1936 jb_reset_keepalive(); // reset keepalive timeout
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1937 jpacket_reset(packet);
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1938
671 c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	1939 if (!packet->type) {
c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	1940 scr_LogPrint(LPRINT_LOG, "Packet type = 0");
c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	1941 return;
c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	1942 }
c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	1943
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1944 p = xmlnode_get_attrib(packet->x, "type");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1945 if (p) type = p;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1946
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1947 p = xmlnode_get_attrib(packet->x, "from");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1948 if (p) from = p;
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1949
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1950 if (!from && packet->type != JPACKET_IQ) {
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	1951 scr_LogPrint(LPRINT_LOGNORM, "Error in stream packet");
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1952 return;
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1953 }
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1954
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1955 switch (packet->type) {
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1956 case JPACKET_MESSAGE:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1957 handle_packet_message(conn, type, from, packet->x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1958 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1959
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1960 case JPACKET_IQ:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1961 handle_packet_iq(conn, type, from, packet->x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1962 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1963
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1964 case JPACKET_PRESENCE:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1965 handle_packet_presence(conn, type, from, packet->x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1966 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1967
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1968 case JPACKET_S10N:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1969 handle_packet_s10n(conn, type, from, packet->x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1970 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1971
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1972 default:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	1973 scr_LogPrint(LPRINT_LOG, "Unhandled packet type (%d)", packet->type);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1974 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1975 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1976
580 fed6d1e4d7a9 Fix modelines Mikael Berthe <mikael@lilotux.net> parents: 579 diff changeset	1977 /* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */

Mercurial > ~mikael > mcabber > hg

annotate mcabber/src/jabglue.c @ 990:35e7913affb7