mcabber: mcabber/src/jabglue.c annotate

annotate mcabber/src/jabglue.c @ 1415:317f8d181626

Rename command public functions Add a prefix ("cmd_").

author	Mikael Berthe <mikael@lilotux.net>
date	Sat, 19 Jan 2008 16:42:34 +0100
parents	366ef500c522
children	fb438482b28e

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 *
1414 366ef500c522 Update copyrights Mikael Berthe <mikael@lilotux.net> parents: 1413 diff changeset	4 * Copyright (C) 2005-2008 Mikael Berthe <mikael@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"
1042 8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	35 #include "pgp.h"
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	36 #include "otr.h"
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	37
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	38 #define JABBERPORT 5222
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	39 #define JABBERSSLPORT 5223
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	40
1001 dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	41 #define RECONNECTION_TIMEOUT 60L
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	42
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	43 jconn jc;
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	44 guint AutoConnection;
578 b3ab662757a0 Fix connection issue Mikael Berthe <mikael@lilotux.net> parents: 577 diff changeset	45 enum enum_jstate jstate;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	46
353 3fe43f6daa5a Make imstatus2char a null-terminated string Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	47 char imstatus2char[imstatus_size+1] = {
1311 0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1310 diff changeset	48 '_', 'o', 'f', 'd', 'n', 'a', 'i', '\0'
46 f22e1d120606 [/trunk] Changeset 62 by mikael mikael parents: 43 diff changeset	49 };
f22e1d120606 [/trunk] Changeset 62 by mikael mikael parents: 43 diff changeset	50
1378 61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	51 static char *imstatus_showmap[] = {
61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	52 "",
61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	53 "",
61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	54 "chat",
61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	55 "dnd",
61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	56 "xa",
61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	57 "away",
61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	58 ""
61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	59 };
61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	60
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	61 static time_t LastPingTime;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	62 static unsigned int KeepaliveDelay;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	63 static enum imstatus mystatus = offline;
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	64 static enum imstatus mywantedstatus = available;
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	65 static gchar *mystatusmsg;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	66 static unsigned char online;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	67
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	68 static void statehandler(jconn, int);
c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	69 static void packethandler(jconn, jpacket);
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	70 static void handle_state_events(char* from, xmlnode xmldata);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	71
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	72 static int evscallback_invitation(eviqs *evp, guint evcontext);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	73
1254 401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	74
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	75 static void logger(jconn j, int io, const char *buf)
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	76 {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	77 scr_LogPrint(LPRINT_DEBUG, "%03s: %s", ((io == 0) ? "OUT" : "IN"), buf);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	78 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	79
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	80 // jidtodisp(jid)
62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	81 // Strips the resource part from the jid
62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	82 // The caller should g_free the result after use.
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	83 char jidtodisp(const char fjid)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	84 {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	85 char *ptr;
165 b4921dbf8709 [/trunk] Changeset 177 by mikael mikael parents: 164 diff changeset	86 char *alias;
b4921dbf8709 [/trunk] Changeset 177 by mikael mikael parents: 164 diff changeset	87
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	88 alias = g_strdup(fjid);
165 b4921dbf8709 [/trunk] Changeset 177 by mikael mikael parents: 164 diff changeset	89
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 960 diff changeset	90 if ((ptr = strchr(alias, JID_RESOURCE_SEPARATOR)) != NULL) {
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	91 *ptr = 0;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	92 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	93 return alias;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	94 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	95
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	96 char compose_jid(const char username, const char *servername,
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	97 const char *resource)
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	98 {
1383 d9606bd03144 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	99 char *fjid;
d9606bd03144 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	100
1385 7ca57f7e313c Fix typo in changeset d9606bd03144 Mikael Berthe <mikael@lilotux.net> parents: 1384 diff changeset	101 if (!strchr(username, JID_DOMAIN_SEPARATOR)) {
1383 d9606bd03144 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	102 fjid = g_strdup_printf("%s%c%s%c%s", username,
d9606bd03144 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	103 JID_DOMAIN_SEPARATOR, servername,
d9606bd03144 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	104 JID_RESOURCE_SEPARATOR, resource);
d9606bd03144 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	105 } else {
d9606bd03144 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	106 fjid = g_strdup_printf("%s%c%s", username,
d9606bd03144 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	107 JID_RESOURCE_SEPARATOR, resource);
403 17aa60c6dc63 Allow a different server name than the jid domain name Mikael Berthe <mikael@lilotux.net> parents: 393 diff changeset	108 }
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	109 return fjid;
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	110 }
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	111
1413 f89844a0448a Remove useless inlines Mikael Berthe <mikael@lilotux.net> parents: 1399 diff changeset	112 unsigned char jb_getonline(void)
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	113 {
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	114 return online;
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	115 }
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	116
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	117 jconn jb_connect(const char fjid, const char server, unsigned int port,
403 17aa60c6dc63 Allow a different server name than the jid domain name Mikael Berthe <mikael@lilotux.net> parents: 393 diff changeset	118 int ssl, const char *pass)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	119 {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	120 if (!port) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	121 if (ssl)
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	122 port = JABBERSSLPORT;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	123 else
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	124 port = JABBERPORT;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	125 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	126
357 e8adc3c96e68 Better messages for server connection states Mikael Berthe <mikael@lilotux.net> parents: 353 diff changeset	127 jb_disconnect();
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	128
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	129 if (!fjid) return jc;
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	130
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	131 jc = jab_new((char)fjid, (char)pass, (char*)server, port, ssl);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	132
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	133 /* 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	134 jab_logger(jc, logger);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	135 jab_packet_handler(jc, &packethandler);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	136 jab_state_handler(jc, &statehandler);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	137
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	138 if (jc && jc->user) {
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	139 online = TRUE;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	140 jstate = STATE_CONNECTING;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	141 statehandler(0, -1);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	142 jab_start(jc);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	143 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	144
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	145 return jc;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	146 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	147
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	148 void jb_disconnect(void)
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	149 {
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	150 if (!jc) return;
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	151
668 d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	152 if (online) {
1354 c373ff3fe7e1 Add pre-disconnect internal hook Mikael Berthe <mikael@lilotux.net> parents: 1347 diff changeset	153 // Launch pre-disconnect internal hook
c373ff3fe7e1 Add pre-disconnect internal hook Mikael Berthe <mikael@lilotux.net> parents: 1347 diff changeset	154 hook_execute_internal("hook-pre-disconnect");
668 d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	155 // Announce it to everyone else
1050 ea71d31a2607 PGP: Do not sign presence messages to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 1046 diff changeset	156 jb_setstatus(offline, NULL, "", FALSE);
668 d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	157 // End the XML flow
d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	158 jb_send_raw("</stream:stream>");
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	159 /*
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	160 // Free status message
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	161 g_free(mystatusmsg);
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	162 mystatusmsg = NULL;
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	163 */
668 d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	164 }
634 f3c05d5fe459 Send "</stream:stream>" when disconnecting from the server Mikael Berthe <mikael@lilotux.net> parents: 633 diff changeset	165
f3c05d5fe459 Send "</stream:stream>" when disconnecting from the server Mikael Berthe <mikael@lilotux.net> parents: 633 diff changeset	166 // Announce it to the user
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	167 statehandler(jc, JCONN_STATE_OFF);
416 48e7808c4191 Allow offline status message Mikael Berthe <mikael@lilotux.net> parents: 411 diff changeset	168
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	169 jab_delete(jc);
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	170 jc = NULL;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	171 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	172
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	173 inline void jb_reset_keepalive()
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	174 {
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	175 time(&LastPingTime);
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	176 }
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	177
436 802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	178 void jb_send_raw(const char *str)
802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	179 {
461 1d8f5b3a5f2b Convert /rawxml argument to UTF8 Mikael Berthe <mikael@lilotux.net> parents: 449 diff changeset	180 if (jc && online && str)
436 802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	181 jab_send_raw(jc, str);
802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	182 }
802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	183
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	184 void jb_keepalive()
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	185 {
113 8ac67e951eab [/trunk] Changeset 127 by mikael mikael parents: 112 diff changeset	186 if (jc && online)
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	187 jab_send_raw(jc, " \t ");
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	188 jb_reset_keepalive();
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	189 }
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	190
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	191 void jb_set_keepalive_delay(unsigned int delay)
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	192 {
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	193 KeepaliveDelay = delay;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	194 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	195
1001 dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	196 // check_connection()
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	197 // Check if we've been disconnected for a while (predefined timeout),
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	198 // and if so try to reconnect.
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	199 static void check_connection(void)
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	200 {
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	201 static time_t disconnection_timestamp = 0L;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	202 time_t now;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	203
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	204 // Maybe we're voluntarily offline...
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	205 if (!AutoConnection)
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	206 return;
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	207
1001 dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	208 // Are we totally disconnected?
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	209 if (jc && jc->state != JCONN_STATE_OFF) {
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	210 disconnection_timestamp = 0L;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	211 return;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	212 }
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	213
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	214 time(&now);
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	215 if (!disconnection_timestamp) {
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	216 disconnection_timestamp = now;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	217 return;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	218 }
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	219
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	220 // If the reconnection_timeout is reached, try to reconnect.
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	221 if (now > disconnection_timestamp + RECONNECTION_TIMEOUT) {
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	222 mcabber_connect();
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	223 disconnection_timestamp = 0L;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	224 }
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	225 }
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	226
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	227 void jb_main()
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	228 {
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	229 time_t now;
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	230 fd_set fds;
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	231 long tmout;
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	232 struct timeval tv;
1001 dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	233 static time_t last_eviqs_check = 0L;
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	234
406 a9dd91e08eb3 Add usleep() calls Mikael Berthe <mikael@lilotux.net> parents: 403 diff changeset	235 if (!online) {
419 2f9852610cf4 Small code review Mikael Berthe <mikael@lilotux.net> parents: 416 diff changeset	236 safe_usleep(10000);
1001 dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	237 check_connection();
406 a9dd91e08eb3 Add usleep() calls Mikael Berthe <mikael@lilotux.net> parents: 403 diff changeset	238 return;
a9dd91e08eb3 Add usleep() calls Mikael Berthe <mikael@lilotux.net> parents: 403 diff changeset	239 }
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	240
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	241 if (jc && jc->state == JCONN_STATE_CONNECTING) {
419 2f9852610cf4 Small code review Mikael Berthe <mikael@lilotux.net> parents: 416 diff changeset	242 safe_usleep(75000);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	243 jab_start(jc);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	244 return;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	245 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	246
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	247 FD_ZERO(&fds);
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	248 FD_SET(0, &fds);
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	249 FD_SET(jc->fd, &fds);
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	250
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	251 tv.tv_sec = 60;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	252 tv.tv_usec = 0;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	253
940 fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	254 time(&now);
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	255
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	256 if (KeepaliveDelay) {
1399 187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	257 if (now >= LastPingTime + (time_t)KeepaliveDelay)
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	258 tv.tv_sec = 0;
1399 187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	259 else
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	260 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	261 }
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	262
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	263 // Check auto-away timeout
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	264 tmout = scr_GetAutoAwayTimeout(now);
1399 187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	265 if (tv.tv_sec > tmout)
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	266 tv.tv_sec = tmout;
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	267
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	268 #if defined JEP0022 \|\| defined JEP0085
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	269 // Check composing timeout
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	270 tmout = scr_GetChatStatesTimeout(now);
1399 187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	271 if (tv.tv_sec > tmout)
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	272 tv.tv_sec = tmout;
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	273 #endif
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	274
940 fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	275 if (!tv.tv_sec)
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	276 tv.tv_usec = 350000;
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	277
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	278 scr_DoUpdate();
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	279 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	280 if (FD_ISSET(jc->fd, &fds))
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	281 jab_poll(jc, 0);
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	282 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	283
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	284 if (jstate == STATE_CONNECTING) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	285 if (jc) {
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	286 eviqs *iqn;
686 98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	287 xmlnode z;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	288
686 98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	289 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	290 iqn->callback = &iqscallback_auth;
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	291
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	292 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	293 "username");
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	294 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	295 jab_send(jc, iqn->xmldata);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	296
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	297 jstate = STATE_GETAUTH;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	298 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	299
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	300 if (!jc \|\| jc->state == JCONN_STATE_OFF) {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	301 scr_LogPrint(LPRINT_LOGNORM, "Unable to connect to the server");
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	302 online = FALSE;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	303 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	304 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	305
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	306 if (!jc) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	307 statehandler(jc, JCONN_STATE_OFF);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	308 } else if (jc->state == JCONN_STATE_OFF \|\| jc->fd == -1) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	309 statehandler(jc, JCONN_STATE_OFF);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	310 }
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	311
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	312 time(&now);
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	313
756 12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	314 // Check for EV & IQ requests timeouts
12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	315 if (now > last_eviqs_check + 20) {
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	316 iqs_check_timeout(now);
756 12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	317 evs_check_timeout(now);
12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	318 last_eviqs_check = now;
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	319 }
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	320
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	321 // Keepalive
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	322 if (KeepaliveDelay) {
735 2f027806cd48 Some code cleanup Mikael Berthe <mikael@lilotux.net> parents: 732 diff changeset	323 if (now > LastPingTime + (time_t)KeepaliveDelay)
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	324 jb_keepalive();
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	325 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	326 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	327
116 1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	328 inline enum imstatus jb_getstatus()
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	329 {
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	330 return mystatus;
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	331 }
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	332
519 5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	333 inline const char *jb_getstatusmsg()
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	334 {
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	335 return mystatusmsg;
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	336 }
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	337
1254 401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	338 inline void update_last_use(void)
401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	339 {
401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	340 iqlast = time(NULL);
401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	341 }
401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	342
1215 80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	343 // insert_entity_capabilities(presence_stanza)
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	344 // Entity Capabilities (XEP-0115)
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	345 static void insert_entity_capabilities(xmlnode x)
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	346 {
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	347 xmlnode y;
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	348 const char *ver = entity_version();
1255 ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	349 char exts, exts2;
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	350
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	351 exts = NULL;
1215 80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	352
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	353 y = xmlnode_insert_tag(x, "c");
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	354 xmlnode_put_attrib(y, "xmlns", NS_CAPS);
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	355 xmlnode_put_attrib(y, "node", MCABBER_CAPS_NODE);
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	356 xmlnode_put_attrib(y, "ver", ver);
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	357 #ifdef JEP0085
1255 ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	358 if (!chatstates_disabled) {
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	359 exts2 = g_strjoin(" ", "csn", exts, NULL);
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	360 g_free(exts);
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	361 exts = exts2;
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	362 }
1215 80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	363 #endif
1255 ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	364 if (!settings_opt_get_int("iq_last_disable")) {
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	365 exts2 = g_strjoin(" ", "iql", exts, NULL);
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	366 g_free(exts);
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	367 exts = exts2;
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	368 }
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	369 if (exts) {
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	370 xmlnode_put_attrib(y, "ext", exts);
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	371 g_free(exts);
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	372 }
1215 80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	373 }
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	374
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	375 static void roompresence(gpointer room, void *presencedata)
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	376 {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	377 const char *bjid;
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	378 const char *nickname;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	379 char *to;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	380 struct T_presence *pres = presencedata;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	381
652 b243d3b3ff1b We do not need buddy_isresource() anymore Mikael Berthe <mikael@lilotux.net> parents: 651 diff changeset	382 if (!buddy_getinsideroom(room))
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	383 return;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	384
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	385 bjid = buddy_getjid(room);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	386 if (!bjid) return;
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	387 nickname = buddy_getnickname(room);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	388 if (!nickname) return;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	389
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	390 to = g_strdup_printf("%s/%s", bjid, nickname);
1050 ea71d31a2607 PGP: Do not sign presence messages to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 1046 diff changeset	391 jb_setstatus(pres->st, to, pres->msg, TRUE);
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	392 g_free(to);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	393 }
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	394
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	395 // presnew(status, recipient, message)
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	396 // Create an xmlnode with default presence attributes
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	397 // Note: the caller must free the node after use
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	398 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	399 const char *msg)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	400 {
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	401 unsigned int prio;
116 1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	402 xmlnode x;
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	403
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	404 x = jutil_presnew(JPACKET__UNKNOWN, 0, 0);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	405
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	406 if (recipient) {
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	407 xmlnode_put_attrib(x, "to", recipient);
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	408 }
444 5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	409
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	410 switch(st) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	411 case away:
1378 61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	412 case notavail:
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	413 case dontdisturb:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	414 case freeforchat:
1378 61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	415 xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"),
61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	416 imstatus_showmap[st], (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	417 break;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	418
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	419 case invisible:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	420 xmlnode_put_attrib(x, "type", "invisible");
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	421 break;
51 85bbc6ed3796 [/trunk] Changeset 67 by mikael mikael parents: 46 diff changeset	422
118 1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	423 case offline:
1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	424 xmlnode_put_attrib(x, "type", "unavailable");
1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	425 break;
1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	426
51 85bbc6ed3796 [/trunk] Changeset 67 by mikael mikael parents: 46 diff changeset	427 default:
85bbc6ed3796 [/trunk] Changeset 67 by mikael mikael parents: 46 diff changeset	428 break;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	429 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	430
531 aee9a279a0f3 Allow changing priority on the fly Mikael Berthe <mikael@lilotux.net> parents: 527 diff changeset	431 prio = settings_opt_get_int("priority");
272 7f2e61392b2e Add resource priority option mikael@matrix parents: 244 diff changeset	432 if (prio) {
7f2e61392b2e Add resource priority option mikael@matrix parents: 244 diff changeset	433 char strprio[8];
842 f74c5c6d2c24 Fix negative priority Mikael Berthe <mikael@lilotux.net> parents: 837 diff changeset	434 snprintf(strprio, 8, "%d", (int)prio);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	435 xmlnode_insert_cdata(xmlnode_insert_tag(x, "priority"),
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	436 strprio, (unsigned) -1);
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	437 }
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	438
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	439 if (msg)
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	440 xmlnode_insert_cdata(xmlnode_insert_tag(x, "status"), msg, (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	441
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	442 return x;
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	443 }
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	444
1050 ea71d31a2607 PGP: Do not sign presence messages to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 1046 diff changeset	445 void jb_setstatus(enum imstatus st, const char recipient, const char msg,
ea71d31a2607 PGP: Do not sign presence messages to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 1046 diff changeset	446 int do_not_sign)
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	447 {
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	448 xmlnode x;
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	449
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	450 if (msg) {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	451 // 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	452 // "-" which is a special case (option meaning "no status message").
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	453 if (!strcmp(msg, "-"))
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	454 msg = "";
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	455 } else {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	456 // No status message specified; we'll use:
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	457 // a) the default status message (if provided by the user);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	458 // b) the current status message;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	459 // c) no status message (i.e. an empty one).
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	460 msg = settings_get_status_msg(st);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	461 if (!msg) {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	462 if (mystatusmsg)
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	463 msg = mystatusmsg;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	464 else
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	465 msg = "";
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	466 }
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	467 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	468
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	469 // Only send the packet if we're online.
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	470 // (But we want to update internal status even when disconnected,
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	471 // in order to avoid some problems during network failures)
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	472 if (online) {
1042 8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	473 const char *s_msg = (st != invisible ? msg : NULL);
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	474 x = presnew(st, recipient, s_msg);
1215 80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	475 insert_entity_capabilities(x); // Entity Capabilities (XEP-0115)
1042 8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	476 #ifdef HAVE_GPGME
1052 c8a8edd5c50d PGP: Sign empty <status/> presence elements Mikael Berthe <mikael@lilotux.net> parents: 1050 diff changeset	477 if (!do_not_sign && gpg_enabled()) {
c8a8edd5c50d PGP: Sign empty <status/> presence elements Mikael Berthe <mikael@lilotux.net> parents: 1050 diff changeset	478 char *signature;
c8a8edd5c50d PGP: Sign empty <status/> presence elements Mikael Berthe <mikael@lilotux.net> parents: 1050 diff changeset	479 signature = gpg_sign(s_msg ? s_msg : "");
1042 8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	480 if (signature) {
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	481 xmlnode y;
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	482 y = xmlnode_insert_tag(x, "x");
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	483 xmlnode_put_attrib(y, "xmlns", NS_SIGNED);
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	484 xmlnode_insert_cdata(y, signature, (unsigned) -1);
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	485 g_free(signature);
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	486 }
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	487 }
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	488 #endif
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	489 jab_send(jc, x);
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	490 xmlnode_free(x);
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	491 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	492
444 5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	493 // 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	494 if (recipient) return;
5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	495
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	496 if (online) {
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	497 // Send presence to chatrooms
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	498 if (st != invisible) {
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	499 struct T_presence room_presence;
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	500 room_presence.st = st;
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	501 room_presence.msg = msg;
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	502 foreach_buddy(ROSTER_TYPE_ROOM, &roompresence, &room_presence);
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	503 }
1365 c7e709719c43 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1363 diff changeset	504
c7e709719c43 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1363 diff changeset	505 // We'll have to update the roster if we switch to/from offline because
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	506 // we don't know the presences of buddies when offline...
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	507 if (mystatus == offline \|\| st == offline)
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	508 update_roster = TRUE;
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	509
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	510 hk_mystatuschange(0, mystatus, st, (st != invisible ? msg : ""));
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	511 mystatus = st;
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	512 }
1365 c7e709719c43 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1363 diff changeset	513
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	514 if (st)
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	515 mywantedstatus = st;
1365 c7e709719c43 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1363 diff changeset	516
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	517 if (msg != mystatusmsg) {
774 46304b773a44 Remove useless checks before g_free() calls Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	518 g_free(mystatusmsg);
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	519 if (*msg)
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	520 mystatusmsg = g_strdup(msg);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	521 else
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	522 mystatusmsg = NULL;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	523 }
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 706 diff changeset	524
1254 401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	525 if (!Autoaway)
401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	526 update_last_use();
401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	527
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 706 diff changeset	528 // Update status line
724 264375fe7159 Fix a roster refresh issue Mikael Berthe <mikael@lilotux.net> parents: 721 diff changeset	529 scr_UpdateMainStatus(TRUE);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	530 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	531
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	532 // jb_setprevstatus()
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	533 // Set previous status. This wrapper function is used after a disconnection.
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	534 inline void jb_setprevstatus(void)
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	535 {
1050 ea71d31a2607 PGP: Do not sign presence messages to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 1046 diff changeset	536 jb_setstatus(mywantedstatus, NULL, mystatusmsg, FALSE);
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	537 }
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	538
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	539 // new_msgid()
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	540 // Generate a new id string. The caller should free it.
1071 866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	541 // The caller must free the string when no longer needed.
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	542 static char *new_msgid(void)
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	543 {
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	544 static guint msg_idn;
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	545 time_t now;
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	546 time(&now);
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	547 if (!msg_idn)
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	548 srand(now);
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	549 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	550 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	551 }
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	552
1399 187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	553 // jb_send_msg(jid, text, type, subject, msgid, *encrypted, type_overwrite)
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	554 // When encrypted is not NULL, the function set *encrypted to 1 if the
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	555 // message has been PGP-encrypted. If encryption enforcement is set and
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	556 // encryption fails, *encrypted is set to -1.
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	557 void jb_send_msg(const char fjid, const char text, int type,
1305 9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	558 const char subject, const char msgid, gint *encrypted,
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	559 const char *type_overwrite)
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	560 {
475 fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	561 xmlnode x;
1305 9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	562 const gchar *strtype;
1304 8ada97e5eb75 Fix a gcc warning Mikael Berthe <mikael@lilotux.net> parents: 1299 diff changeset	563 #ifdef HAVE_LIBOTR
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	564 int otr_msg = 0;
1304 8ada97e5eb75 Fix a gcc warning Mikael Berthe <mikael@lilotux.net> parents: 1299 diff changeset	565 #endif
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	566 #if defined HAVE_GPGME \|\| defined JEP0022 \|\| defined JEP0085
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	567 char rname, barejid;
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	568 GSList *sl_buddy;
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	569 #endif
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	570 #if defined JEP0022 \|\| defined JEP0085
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	571 xmlnode event;
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	572 guint use_jep85 = 0;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	573 struct jep0085 *jep85 = NULL;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	574 #endif
1071 866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	575 #if defined JEP0022
866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	576 gchar *nmsgid = NULL;
866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	577 #endif
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	578 gchar *enc = NULL;
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	579
1055 6eb1efea75d0 PGP: Visual encryption flag Mikael Berthe <mikael@lilotux.net> parents: 1053 diff changeset	580 if (encrypted)
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	581 *encrypted = 0;
1055 6eb1efea75d0 PGP: Visual encryption flag Mikael Berthe <mikael@lilotux.net> parents: 1053 diff changeset	582
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	583 if (!online) return;
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	584
1305 9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	585 if (type_overwrite)
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	586 strtype = type_overwrite;
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	587 else {
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	588 if (type == ROSTER_TYPE_ROOM)
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	589 strtype = TMSG_GROUPCHAT;
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	590 else
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	591 strtype = TMSG_CHAT;
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	592 }
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	593
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	594 #if defined HAVE_GPGME \|\| defined HAVE_LIBOTR \|\| defined JEP0022 \|\| defined JEP0085
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	595 rname = strchr(fjid, JID_RESOURCE_SEPARATOR);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	596 barejid = jidtodisp(fjid);
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	597 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	598
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	599 // 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	600 // which hopefully will give us the most likely resource.
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	601 if (rname)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	602 rname++;
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	603
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	604 #ifdef HAVE_LIBOTR
1347 07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	605 if (otr_enabled()) {
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	606 if (msgid && strcmp(msgid, "otrinject") == 0)
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	607 msgid = NULL;
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	608 else if (type == ROSTER_TYPE_USER) {
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	609 otr_msg = otr_send((char **)&text, barejid);
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	610 if (!text) {
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	611 g_free(barejid);
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	612 if (encrypted)
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	613 *encrypted = -1;
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	614 return;
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	615 }
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	616 }
1347 07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	617 if (otr_msg && encrypted) {
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	618 *encrypted = 1;
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	619 }
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	620 }
3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	621 #endif
3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	622
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	623 #ifdef HAVE_GPGME
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	624 if (type == ROSTER_TYPE_USER && sl_buddy && gpg_enabled()) {
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	625 if (!settings_pgp_getdisabled(barejid)) { // not disabled for this contact?
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	626 guint force;
1065 230dca34dbea Extand pgp_data structure Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	627 struct pgp_data *res_pgpdata;
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	628 force = settings_pgp_getforce(barejid);
1065 230dca34dbea Extand pgp_data structure Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	629 res_pgpdata = buddy_resource_pgp(sl_buddy->data, rname);
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	630 if (force \|\| (res_pgpdata && res_pgpdata->sign_keyid)) {
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	631 /* Remote client has PGP support (we have a signature)
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	632 * OR encryption is enforced (force = TRUE).
1067 a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	633 * If the contact has a specific KeyId, we'll use it;
a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	634 * if not, we'll use the key used for the signature.
a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	635 * Both keys should match, in theory (cf. XEP-0027). */
a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	636 const char *key;
a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	637 key = settings_pgp_getkeyid(barejid);
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	638 if (!key && res_pgpdata)
1067 a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	639 key = res_pgpdata->sign_keyid;
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	640 if (key)
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	641 enc = gpg_encrypt(text, key);
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	642 if (!enc && force) {
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	643 if (encrypted)
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	644 *encrypted = -1;
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	645 g_free(barejid);
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	646 return;
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	647 }
1067 a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	648 }
1065 230dca34dbea Extand pgp_data structure Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	649 }
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	650 }
1067 a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	651 #endif // HAVE_GPGME
a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	652
1065 230dca34dbea Extand pgp_data structure Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	653 g_free(barejid);
1067 a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	654 #endif // HAVE_GPGME \|\| defined JEP0022 \|\| defined JEP0085
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	655
1306 a7d21918234c Fix jb_send_msg() call in OTR Mikael Berthe <mikael@lilotux.net> parents: 1305 diff changeset	656 x = jutil_msgnew((char)strtype, (char)fjid, NULL,
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	657 (enc ? "This message is PGP-encrypted." : (char*)text));
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	658 if (subject) {
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	659 xmlnode y;
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	660 y = xmlnode_insert_tag(x, "subject");
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	661 xmlnode_insert_cdata(y, subject, (unsigned) -1);
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	662 }
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	663 if (enc) {
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	664 xmlnode y;
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	665 y = xmlnode_insert_tag(x, "x");
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	666 xmlnode_put_attrib(y, "xmlns", NS_ENCRYPTED);
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	667 xmlnode_insert_cdata(y, enc, (unsigned) -1);
1055 6eb1efea75d0 PGP: Visual encryption flag Mikael Berthe <mikael@lilotux.net> parents: 1053 diff changeset	668 if (encrypted)
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	669 *encrypted = 1;
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	670 g_free(enc);
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	671 }
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	672
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	673 #if defined JEP0022 \|\| defined JEP0085
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	674 // If typing notifications are disabled, we can skip all this stuff...
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	675 if (chatstates_disabled \|\| type == ROSTER_TYPE_ROOM)
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	676 goto jb_send_msg_no_chatstates;
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	677
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	678 if (sl_buddy)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	679 jep85 = buddy_resource_jep85(sl_buddy->data, rname);
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	680 #endif
ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	681
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	682 #ifdef JEP0085
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	683 /* JEP-0085 5.1
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	684 * "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	685 * 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	686 * state notifications to the Contact."
1378 61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	687 * In our implementation support is initially "unknown", then it's "probed"
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	688 * and can become "ok".
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	689 */
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	690 if (jep85 && (jep85->support == CHATSTATES_SUPPORT_OK \|\|
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	691 jep85->support == CHATSTATES_SUPPORT_UNKNOWN)) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	692 event = xmlnode_insert_tag(x, "active");
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	693 xmlnode_put_attrib(event, "xmlns", NS_CHATSTATES);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	694 if (jep85->support == CHATSTATES_SUPPORT_UNKNOWN)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	695 jep85->support = CHATSTATES_SUPPORT_PROBED;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	696 else
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	697 use_jep85 = 1;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	698 jep85->last_state_sent = ROSTER_EVENT_ACTIVE;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	699 }
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	700 #endif
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	701 #ifdef JEP0022
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	702 /* JEP-22
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	703 * 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	704 * If not, we try to fall back to JEP-0022.
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	705 */
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	706 if (!use_jep85) {
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	707 struct jep0022 *jep22 = NULL;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	708 event = xmlnode_insert_tag(x, "x");
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	709 xmlnode_put_attrib(event, "xmlns", NS_EVENT);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	710 xmlnode_insert_tag(event, "composing");
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	711
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	712 if (sl_buddy)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	713 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	714 if (jep22)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	715 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	716
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	717 // An id is mandatory when using JEP-0022.
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	718 if (!msgid && (text \|\| subject)) {
1071 866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	719 msgid = nmsgid = new_msgid();
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	720 // Let's update last_msgid_sent
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	721 // (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	722 // because this is probably a special message...)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	723 if (jep22) {
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	724 g_free(jep22->last_msgid_sent);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	725 jep22->last_msgid_sent = g_strdup(msgid);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	726 }
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	727 }
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	728 }
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	729 #endif
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	730
993 0759f4c7da68 Add option 'disable_chatstates' Mikael Berthe <mikael@lilotux.net> parents: 992 diff changeset	731 jb_send_msg_no_chatstates:
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	732 xmlnode_put_attrib(x, "id", msgid);
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	733
1254 401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	734 if (mystatus != invisible)
401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	735 update_last_use();
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	736 jab_send(jc, x);
a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	737 xmlnode_free(x);
1071 866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	738 #if defined JEP0022
866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	739 g_free(nmsgid);
866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	740 #endif
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	741
114 065d8368c36b [/trunk] Changeset 128 by mikael mikael parents: 113 diff changeset	742 jb_reset_keepalive();
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	743 }
a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	744
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	745
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	746 #ifdef JEP0085
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	747 // jb_send_jep85_chatstate()
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	748 // Send a JEP-85 chatstate.
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	749 static void jb_send_jep85_chatstate(const char bjid, const char resname,
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	750 guint state)
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	751 {
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	752 xmlnode x;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	753 xmlnode event;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	754 GSList *sl_buddy;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	755 const char *chattag;
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	756 char rjid, fjid = NULL;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	757 struct jep0085 *jep85 = NULL;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	758
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	759 if (!online) return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	760
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	761 sl_buddy = roster_find(bjid, jidsearch, ROSTER_TYPE_USER);
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	762
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	763 // If we have a resource name, we use it. Else we use NULL,
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	764 // 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	765 if (sl_buddy)
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	766 jep85 = buddy_resource_jep85(sl_buddy->data, resname);
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	767
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	768 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	769 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	770
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	771 if (state == jep85->last_state_sent)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	772 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	773
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	774 if (state == ROSTER_EVENT_ACTIVE)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	775 chattag = "active";
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	776 else if (state == ROSTER_EVENT_COMPOSING)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	777 chattag = "composing";
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	778 else if (state == ROSTER_EVENT_PAUSED)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	779 chattag = "paused";
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	780 else {
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	781 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	782 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	783 }
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	784
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	785 jep85->last_state_sent = state;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	786
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	787 if (resname)
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	788 fjid = g_strdup_printf("%s/%s", bjid, resname);
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	789
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	790 rjid = resname ? fjid : (char*)bjid;
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	791 x = jutil_msgnew(TMSG_CHAT, rjid, NULL, NULL);
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	792
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	793 event = xmlnode_insert_tag(x, chattag);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	794 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	795
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	796 jab_send(jc, x);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	797 xmlnode_free(x);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	798
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	799 g_free(fjid);
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	800 jb_reset_keepalive();
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	801 }
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	802 #endif
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	803
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	804 #ifdef JEP0022
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	805 // jb_send_jep22_event()
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	806 // Send a JEP-22 message event (delivered, composing...).
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	807 static void jb_send_jep22_event(const char *fjid, guint type)
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	808 {
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	809 xmlnode x;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	810 xmlnode event;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	811 const char *msgid;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	812 char rname, barejid;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	813 GSList *sl_buddy;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	814 struct jep0022 *jep22 = NULL;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	815 guint jep22_state;
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	816
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	817 if (!online) return;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	818
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	819 rname = strchr(fjid, JID_RESOURCE_SEPARATOR);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	820 barejid = jidtodisp(fjid);
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	821 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	822 g_free(barejid);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	823
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	824 // 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	825 // which hopefully will give us the most likely resource.
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	826 if (rname)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	827 rname++;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	828 if (sl_buddy)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	829 jep22 = buddy_resource_jep22(sl_buddy->data, rname);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	830
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	831 if (!jep22)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	832 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	833
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	834 msgid = jep22->last_msgid_rcvd;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	835
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	836 // 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	837 // 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	838 if (type == ROSTER_EVENT_COMPOSING)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	839 jep22_state = ROSTER_EVENT_COMPOSING;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	840 else if (type == ROSTER_EVENT_ACTIVE \|\|
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	841 type == ROSTER_EVENT_PAUSED)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	842 jep22_state = ROSTER_EVENT_ACTIVE;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	843 else
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	844 jep22_state = 0; // ROSTER_EVENT_NONE
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	845
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	846 if (jep22_state) {
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	847 // 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	848 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	849 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	850 jep22->last_state_sent = jep22_state;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	851 }
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	852
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	853 x = jutil_msgnew(TMSG_CHAT, (char*)fjid, NULL, NULL);
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	854
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	855 event = xmlnode_insert_tag(x, "x");
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	856 xmlnode_put_attrib(event, "xmlns", NS_EVENT);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	857 if (type == ROSTER_EVENT_DELIVERED)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	858 xmlnode_insert_tag(event, "delivered");
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	859 else if (type == ROSTER_EVENT_COMPOSING)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	860 xmlnode_insert_tag(event, "composing");
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	861 xmlnode_put_attrib(event, "id", msgid);
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	862
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	863 jab_send(jc, x);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	864 xmlnode_free(x);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	865
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	866 jb_reset_keepalive();
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	867 }
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	868 #endif
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	869
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	870 // jb_send_chatstate(buddy, state)
d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	871 // Send a chatstate or event (JEP-22/85) according to the buddy's capabilities.
d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	872 // The message is sent to one of the resources with the highest priority.
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	873 #if defined JEP0022 \|\| defined JEP0085
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	874 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	875 {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	876 const char *bjid;
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	877 #ifdef JEP0085
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	878 GSList resources, p_res, *p_next;
1099 7804dbac3875 Fix a potential JEP22/85 issue introduced by changeset 10f9d6fcfeab Mikael Berthe <mikael@lilotux.net> parents: 1091 diff changeset	879 struct jep0085 *jep85 = NULL;;
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	880 #endif
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	881 #ifdef JEP0022
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	882 struct jep0022 *jep22;
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	883 #endif
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	884
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	885 bjid = buddy_getjid(buddy);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	886 if (!bjid) return;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	887
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	888 #ifdef JEP0085
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	889 /* Send the chatstate to the last resource (which should have the highest
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	890 priority).
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	891 If chatstate is "active", send an "active" state to all resources
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	892 which do not curently have this state.
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	893 */
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	894 resources = buddy_getresources(buddy);
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	895 for (p_res = resources ; p_res ; p_res = p_next) {
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	896 p_next = g_slist_next(p_res);
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	897 jep85 = buddy_resource_jep85(buddy, p_res->data);
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	898 if (jep85 && jep85->support == CHATSTATES_SUPPORT_OK) {
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	899 // If p_next is NULL, this is the highest (prio) resource, i.e.
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	900 // the one we are probably writing to.
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	901 if (!p_next \|\| (jep85->last_state_sent != ROSTER_EVENT_ACTIVE &&
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	902 chatstate == ROSTER_EVENT_ACTIVE))
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	903 jb_send_jep85_chatstate(bjid, p_res->data, chatstate);
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	904 }
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	905 g_free(p_res->data);
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	906 }
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	907 g_slist_free(resources);
1099 7804dbac3875 Fix a potential JEP22/85 issue introduced by changeset 10f9d6fcfeab Mikael Berthe <mikael@lilotux.net> parents: 1091 diff changeset	908 // If the last resource had chatstates support when can return now,
7804dbac3875 Fix a potential JEP22/85 issue introduced by changeset 10f9d6fcfeab Mikael Berthe <mikael@lilotux.net> parents: 1091 diff changeset	909 // we don't want to send a JEP22 event.
7804dbac3875 Fix a potential JEP22/85 issue introduced by changeset 10f9d6fcfeab Mikael Berthe <mikael@lilotux.net> parents: 1091 diff changeset	910 if (jep85 && jep85->support == CHATSTATES_SUPPORT_OK)
7804dbac3875 Fix a potential JEP22/85 issue introduced by changeset 10f9d6fcfeab Mikael Berthe <mikael@lilotux.net> parents: 1091 diff changeset	911 return;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	912 #endif
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	913 #ifdef JEP0022
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	914 jep22 = buddy_resource_jep22(buddy, NULL);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	915 if (jep22 && jep22->support == CHATSTATES_SUPPORT_OK) {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	916 jb_send_jep22_event(bjid, chatstate);
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	917 }
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	918 #endif
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	919 }
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	920 #endif
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	921
999 9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	922 // chatstates_reset_probed(fulljid)
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	923 // If the JEP has been probed for this contact, set it back to unknown so
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	924 // that we probe it again. The parameter must be a full jid (w/ resource).
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	925 #if defined JEP0022 \|\| defined JEP0085
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	926 static void chatstates_reset_probed(const char *fulljid)
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	927 {
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	928 char rname, barejid;
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	929 GSList *sl_buddy;
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	930 struct jep0085 *jep85;
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	931 struct jep0022 *jep22;
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	932
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	933 rname = strchr(fulljid, JID_RESOURCE_SEPARATOR);
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	934 if (!rname++)
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	935 return;
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	936
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	937 barejid = jidtodisp(fulljid);
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	938 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER);
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	939 g_free(barejid);
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	940
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	941 if (!sl_buddy)
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	942 return;
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	943
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	944 jep85 = buddy_resource_jep85(sl_buddy->data, rname);
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	945 jep22 = buddy_resource_jep22(sl_buddy->data, rname);
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	946
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	947 if (jep85 && jep85->support == CHATSTATES_SUPPORT_PROBED)
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	948 jep85->support = CHATSTATES_SUPPORT_UNKNOWN;
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	949 if (jep22 && jep22->support == CHATSTATES_SUPPORT_PROBED)
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	950 jep22->support = CHATSTATES_SUPPORT_UNKNOWN;
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	951 }
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	952 #endif
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	953
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	954 // jb_subscr_send_auth(jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	955 // Allow jid to receive our presence updates
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	956 void jb_subscr_send_auth(const char *bjid)
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	957 {
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	958 xmlnode x;
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	959
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	960 x = jutil_presnew(JPACKET__SUBSCRIBED, (char *)bjid, NULL);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	961 jab_send(jc, x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	962 xmlnode_free(x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	963 }
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	964
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	965 // jb_subscr_cancel_auth(jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	966 // Cancel jid's subscription to our presence updates
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	967 void jb_subscr_cancel_auth(const char *bjid)
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	968 {
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	969 xmlnode x;
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	970
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	971 x = jutil_presnew(JPACKET__UNSUBSCRIBED, (char *)bjid, NULL);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	972 jab_send(jc, x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	973 xmlnode_free(x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	974 }
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	975
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	976 // jb_subscr_request_auth(jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	977 // Request a subscription to jid's presence updates
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	978 void jb_subscr_request_auth(const char *bjid)
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	979 {
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	980 xmlnode x;
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	981
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	982 x = jutil_presnew(JPACKET__SUBSCRIBE, (char *)bjid, NULL);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	983 jab_send(jc, x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	984 xmlnode_free(x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	985 }
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	986
834 6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	987 // jb_subscr_request_cancel(jid)
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	988 // Request to cancel jour subscription to jid's presence updates
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	989 void jb_subscr_request_cancel(const char *bjid)
834 6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	990 {
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	991 xmlnode x;
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	992
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	993 x = jutil_presnew(JPACKET__UNSUBSCRIBE, (char *)bjid, NULL);
834 6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	994 jab_send(jc, x);
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	995 xmlnode_free(x);
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	996 }
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	997
213 4fcdbfdf7c20 [/trunk] Changeset 225 by mikael mikael parents: 208 diff changeset	998 // Note: the caller should check the jid is correct
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	999 void jb_addbuddy(const char bjid, const char name, const char *group)
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1000 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1001 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1002 eviqs *iqn;
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	1003 char *cleanjid;
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1004
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1005 if (!online) return;
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1006
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1007 cleanjid = jidtodisp(bjid); // Stripping resource, just in case...
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	1008
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1009 // We don't check if the jabber user already exists in the roster,
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1010 // because it allows to re-ask for notification.
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1011
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1012 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	1013 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	1014
454399f026fa Fix a bug in jb_addbuddy() Mikael Berthe <mikael@lilotux.net> parents: 625 diff changeset	1015 xmlnode_put_attrib(y, "jid", cleanjid);
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1016
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1017 if (name)
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1018 xmlnode_put_attrib(y, "name", name);
244 5f8b529412bd [/trunk] Changeset 257 by mikael mikael parents: 241 diff changeset	1019
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1020 if (group) {
628 454399f026fa Fix a bug in jb_addbuddy() Mikael Berthe <mikael@lilotux.net> parents: 625 diff changeset	1021 z = xmlnode_insert_tag(y, "group");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1022 xmlnode_insert_cdata(z, group, (unsigned) -1);
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1023 }
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1024
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1025 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1026 iqs_del(iqn->id); // XXX
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1027
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1028 jb_subscr_request_auth(cleanjid);
612 789ec6aed764 Respect RFC 3921 order advice Mikael Berthe <mikael@lilotux.net> parents: 611 diff changeset	1029
1355 9716cf8a0726 Add on_server flag Mikael Berthe <mikael@lilotux.net> parents: 1354 diff changeset	1030 roster_add_user(cleanjid, name, group, ROSTER_TYPE_USER, sub_pending, -1);
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	1031 g_free(cleanjid);
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1032 buddylist_build();
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1033
244 5f8b529412bd [/trunk] Changeset 257 by mikael mikael parents: 241 diff changeset	1034 update_roster = TRUE;
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1035 }
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1036
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1037 void jb_delbuddy(const char *bjid)
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1038 {
834 6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	1039 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1040 eviqs *iqn;
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1041 char *cleanjid;
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1042
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1043 if (!online) return;
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1044
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1045 cleanjid = jidtodisp(bjid); // Stripping resource, just in case...
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1046
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1047 // If the current buddy is an agent, unsubscribe from it
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1048 if (roster_gettype(cleanjid) == ROSTER_TYPE_AGENT) {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1049 scr_LogPrint(LPRINT_LOGNORM, "Unregistering from the %s agent", cleanjid);
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1050
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1051 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	1052 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	1053 y = xmlnode_get_tag(iqn->xmldata, "query");
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1054 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	1055 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1056 iqs_del(iqn->id); // XXX
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1057 }
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1058
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1059 // Cancel the subscriptions
834 6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	1060 jb_subscr_cancel_auth(cleanjid); // Cancel "from"
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	1061 jb_subscr_request_cancel(cleanjid); // Cancel "to"
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1062
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1063 // 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	1064 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	1065 y = xmlnode_get_tag(iqn->xmldata, "query");
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1066 z = xmlnode_insert_tag(y, "item");
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1067 xmlnode_put_attrib(z, "jid", cleanjid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1068 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	1069 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1070 iqs_del(iqn->id); // XXX
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1071
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1072 roster_del_user(cleanjid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1073 g_free(cleanjid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1074 buddylist_build();
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1075
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1076 update_roster = TRUE;
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1077 }
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1078
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1079 void jb_updatebuddy(const char bjid, const char name, const char *group)
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1080 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1081 xmlnode y;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1082 eviqs *iqn;
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1083 char *cleanjid;
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1084
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1085 if (!online) return;
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1086
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1087 // XXX We should check name's and group's correctness
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1088
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1089 cleanjid = jidtodisp(bjid); // Stripping resource, just in case...
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1090
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1091 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	1092 y = xmlnode_insert_tag(xmlnode_get_tag(iqn->xmldata, "query"), "item");
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1093 xmlnode_put_attrib(y, "jid", cleanjid);
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1094 xmlnode_put_attrib(y, "name", name);
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1095
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1096 if (group) {
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1097 y = xmlnode_insert_tag(y, "group");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1098 xmlnode_insert_cdata(y, group, (unsigned) -1);
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1099 }
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1100
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1101 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1102 iqs_del(iqn->id); // XXX
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1103 g_free(cleanjid);
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1104 }
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1105
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1106 void jb_request(const char *fjid, enum iqreq_type reqtype)
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 686 diff changeset	1107 {
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1071 diff changeset	1108 GSList resources, p_res;
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1109 GSList *roster_elt;
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1110 void (request_fn)(const char );
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1111 const char *strreqtype;
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1112
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1113 if (reqtype == iqreq_version) {
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1114 request_fn = &request_version;
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1115 strreqtype = "version";
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1116 } else if (reqtype == iqreq_time) {
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1117 request_fn = &request_time;
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1118 strreqtype = "time";
1015 579299b1c9b2 Add /request last Mikael Berthe <mikael@lilotux.net> parents: 1014 diff changeset	1119 } else if (reqtype == iqreq_last) {
579299b1c9b2 Add /request last Mikael Berthe <mikael@lilotux.net> parents: 1014 diff changeset	1120 request_fn = &request_last;
579299b1c9b2 Add /request last Mikael Berthe <mikael@lilotux.net> parents: 1014 diff changeset	1121 strreqtype = "last";
1003 c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1122 } else if (reqtype == iqreq_vcard) {
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1123 // Special case
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1124 } else
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1125 return;
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1126
1003 c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1127 // vCard request
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1128 if (reqtype == iqreq_vcard) {
1310 a5336c44d4e2 Allow vcard requests to a full jid Mikael Berthe <mikael@lilotux.net> parents: 1306 diff changeset	1129 request_vcard(fjid);
a5336c44d4e2 Allow vcard requests to a full jid Mikael Berthe <mikael@lilotux.net> parents: 1306 diff changeset	1130 scr_LogPrint(LPRINT_NORMAL, "Sent vCard request to <%s>", fjid);
1003 c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1131 return;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1132 }
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1133
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1134 if (strchr(fjid, JID_RESOURCE_SEPARATOR)) {
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1135 // This is a full JID
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1136 (*request_fn)(fjid);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1137 scr_LogPrint(LPRINT_NORMAL, "Sent %s request to <%s>", strreqtype, fjid);
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1138 return;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1139 }
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1140
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1141 // The resource has not been specified
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1142 roster_elt = roster_find(fjid, jidsearch, ROSTER_TYPE_USER\|ROSTER_TYPE_ROOM);
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1143 if (!roster_elt) {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1144 scr_LogPrint(LPRINT_NORMAL, "No known resource for <%s>...", fjid);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1145 (*request_fn)(fjid); // Let's send a request anyway...
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1146 scr_LogPrint(LPRINT_NORMAL, "Sent %s request to <%s>", strreqtype, fjid);
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1147 return;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1148 }
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1149
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1150 // Send a request to each resource
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1151 resources = buddy_getresources(roster_elt->data);
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1152 if (!resources) {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1153 scr_LogPrint(LPRINT_NORMAL, "No known resource for <%s>...", fjid);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1154 (*request_fn)(fjid); // Let's send a request anyway...
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1155 scr_LogPrint(LPRINT_NORMAL, "Sent %s request to <%s>", strreqtype, fjid);
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1156 }
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1071 diff changeset	1157 for (p_res = resources ; p_res ; p_res = g_slist_next(p_res)) {
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1158 gchar *fulljid;
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1071 diff changeset	1159 fulljid = g_strdup_printf("%s/%s", fjid, (char*)p_res->data);
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1160 (*request_fn)(fulljid);
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1161 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	1162 g_free(fulljid);
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1071 diff changeset	1163 g_free(p_res->data);
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1164 }
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1071 diff changeset	1165 g_slist_free(resources);
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 686 diff changeset	1166 }
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 686 diff changeset	1167
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1168 // Join a MUC room
900 b41684465283 MUC: join password-protected room Mikael Berthe <mikael@lilotux.net> parents: 896 diff changeset	1169 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	1170 {
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1171 xmlnode x, y;
643 dd73c3dad815 Fix double UTF-8 encoding when joining a room Mikael Berthe <mikael@lilotux.net> parents: 642 diff changeset	1172 gchar *roomid;
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1173 GSList *room_elt;
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1174
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	1175 if (!online \|\| !room) return;
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	1176 if (!nickname) return;
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1177
643 dd73c3dad815 Fix double UTF-8 encoding when joining a room Mikael Berthe <mikael@lilotux.net> parents: 642 diff changeset	1178 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	1179 if (check_jid_syntax(roomid)) {
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1180 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	1181 nickname);
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1182 g_free(roomid);
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1183 return;
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1184 }
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1185
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1186 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	1187 // 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	1188 if (!room_elt) {
1355 9716cf8a0726 Add on_server flag Mikael Berthe <mikael@lilotux.net> parents: 1354 diff changeset	1189 room_elt = roster_add_user(room, NULL, NULL, ROSTER_TYPE_ROOM,
9716cf8a0726 Add on_server flag Mikael Berthe <mikael@lilotux.net> parents: 1354 diff changeset	1190 sub_none, -1);
649 3ad6675caaf1 MUC: fix join bug when the conference is in the roster Mikael Berthe <mikael@lilotux.net> parents: 645 diff changeset	1191 } else {
3ad6675caaf1 MUC: fix join bug when the conference is in the roster Mikael Berthe <mikael@lilotux.net> parents: 645 diff changeset	1192 // 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	1193 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	1194 }
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1195 // 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	1196 if (!buddy_getinsideroom(room_elt->data)) {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1197 // 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	1198 buddy_setnickname(room_elt->data, nickname);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1199 }
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1200
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1201 // Send the XML request
535 b407d19c39ab Set status correctly when joining a room Mikael Berthe <mikael@lilotux.net> parents: 534 diff changeset	1202 x = presnew(mystatus, roomid, mystatusmsg);
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1203 y = xmlnode_insert_tag(x, "x");
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1204 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	1205 if (passwd) {
b41684465283 MUC: join password-protected room Mikael Berthe <mikael@lilotux.net> parents: 896 diff changeset	1206 xmlnode_insert_cdata(xmlnode_insert_tag(y, "password"), passwd,
b41684465283 MUC: join password-protected room Mikael Berthe <mikael@lilotux.net> parents: 896 diff changeset	1207 (unsigned) -1);
b41684465283 MUC: join password-protected room Mikael Berthe <mikael@lilotux.net> parents: 896 diff changeset	1208 }
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1209
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1210 jab_send(jc, x);
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1211 xmlnode_free(x);
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1212 jb_reset_keepalive();
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	1213 g_free(roomid);
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1214 }
03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1215
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1216 // Unlock a MUC room
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1217 // room syntax: "room@server"
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1218 void jb_room_unlock(const char *room)
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1219 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1220 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1221 eviqs *iqn;
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1222
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	1223 if (!online \|\| !room) return;
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1224
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1225 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	1226 "unlock", IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1227 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	1228 y = xmlnode_get_tag(iqn->xmldata, "query");
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1229 z = xmlnode_insert_tag(y, "x");
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1230 xmlnode_put_attrib(z, "xmlns", "jabber:x:data");
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1231 xmlnode_put_attrib(z, "type", "submit");
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1232
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1233 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1234 iqs_del(iqn->id); // XXX
449 e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1235 jb_reset_keepalive();
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1236 }
e08b0c2d0e54 Add "/room unlock" Mikael Berthe <mikael@lilotux.net> parents: 447 diff changeset	1237
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1238 // Destroy a MUC room
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1239 // room syntax: "room@server"
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1240 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	1241 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1242 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1243 eviqs *iqn;
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1244
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1245 if (!online \|\| !room) return;
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1246
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1247 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	1248 "destroy", IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1249 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	1250 y = xmlnode_get_tag(iqn->xmldata, "query");
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1251 z = xmlnode_insert_tag(y, "destroy");
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1252
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1253 if (venue && *venue)
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1254 xmlnode_put_attrib(z, "jid", venue);
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1255
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1256 if (reason) {
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1257 y = xmlnode_insert_tag(z, "reason");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1258 xmlnode_insert_cdata(y, reason, (unsigned) -1);
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1259 }
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1260
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1261 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1262 iqs_del(iqn->id); // XXX
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1263 jb_reset_keepalive();
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1264 }
fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	1265
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1266 // Change role or affiliation of a MUC user
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1267 // room syntax: "room@server"
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1268 // 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	1269 // allowed)
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1270 // ra: new role or affiliation
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1271 // (ex. role none for kick, affil outcast for ban...)
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1272 // The reason can be null
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1273 // Return 0 if everything is ok
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1274 int jb_room_setattrib(const char roomid, const char fjid, const char *nick,
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1275 struct role_affil ra, const char *reason)
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1276 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1277 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1278 eviqs *iqn;
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1279
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1280 if (!online \|\| !roomid) return 1;
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1281 if (!fjid && !nick) return 1;
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1282
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1283 if (check_jid_syntax((char*)roomid)) {
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1284 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	1285 return 1;
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1286 }
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1287 if (fjid && check_jid_syntax((char*)fjid)) {
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1288 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", fjid);
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1289 return 1;
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1290 }
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1291
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1292 if (ra.type == type_affil && ra.val.affil == affil_outcast && !fjid)
572 afc2bd38b15c Implement affiliations handling, add "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 569 diff changeset	1293 return 1; // Shouldn't happen (jid mandatory when banning)
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1294
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1295 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	1296 "roleaffil", IQS_DEFAULT_TIMEOUT);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1297 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	1298 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	1299 y = xmlnode_get_tag(iqn->xmldata, "query");
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1300 z = xmlnode_insert_tag(y, "item");
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1301
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1302 if (fjid) {
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1303 xmlnode_put_attrib(z, "jid", fjid);
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1304 } else { // nickname
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1305 xmlnode_put_attrib(z, "nick", nick);
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1306 }
584 414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1307
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1308 if (ra.type == type_affil)
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1309 xmlnode_put_attrib(z, "affiliation", straffil[ra.val.affil]);
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1310 else if (ra.type == type_role)
414fbf558f1e jb_room_setattrib() Mikael Berthe <mikael@lilotux.net> parents: 583 diff changeset	1311 xmlnode_put_attrib(z, "role", strrole[ra.val.role]);
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1312
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1313 if (reason) {
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1314 y = xmlnode_insert_tag(z, "reason");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1315 xmlnode_insert_cdata(y, reason, (unsigned) -1);
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1316 }
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1317
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1318 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1319 iqs_del(iqn->id); // XXX
568 eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1320 jb_reset_keepalive();
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1321
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1322 return 0;
eb1df2371581 Add "/room kick" Mikael Berthe <mikael@lilotux.net> parents: 562 diff changeset	1323 }
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1324
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1325 // Invite a user to a MUC room
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1326 // room syntax: "room@server"
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1327 // reason can be null.
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1328 void jb_room_invite(const char room, const char fjid, const char *reason)
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1329 {
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1330 xmlnode x, y, z;
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1331
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1332 if (!online \|\| !room \|\| !fjid) return;
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1333
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1334 x = jutil_msgnew(NULL, (char*)room, NULL, NULL);
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1335
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1336 y = xmlnode_insert_tag(x, "x");
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1337 xmlnode_put_attrib(y, "xmlns", "http://jabber.org/protocol/muc#user");
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1338
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1339 z = xmlnode_insert_tag(y, "invite");
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1340 xmlnode_put_attrib(z, "to", fjid);
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1341
569 69afee8e1232 "/room invite": Do not send epty reason Mikael Berthe <mikael@lilotux.net> parents: 568 diff changeset	1342 if (reason) {
69afee8e1232 "/room invite": Do not send epty reason Mikael Berthe <mikael@lilotux.net> parents: 568 diff changeset	1343 y = xmlnode_insert_tag(z, "reason");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1344 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	1345 }
486 2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1346
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1347 jab_send(jc, x);
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1348 xmlnode_free(x);
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1349 jb_reset_keepalive();
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1350 }
2a6a8ebb813b Add "/room invite" Mikael Berthe <mikael@lilotux.net> parents: 478 diff changeset	1351
1395 d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1352 // jb_is_bookmarked(roomjid)
1363 32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1353 // Return TRUE if there's a bookmark for the given jid.
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1354 guint jb_is_bookmarked(const char *bjid)
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1355 {
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1356 xmlnode x;
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1357
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1358 if (!bookmarks)
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1359 return FALSE;
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1360
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1361 // Walk through the storage bookmark tags
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1362 x = xmlnode_get_firstchild(bookmarks);
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1363 for ( ; x; x = xmlnode_get_nextsibling(x)) {
1397 5f91bac887ee Minor style change Mikael Berthe <mikael@lilotux.net> parents: 1396 diff changeset	1364 const char *p = xmlnode_get_name(x);
1363 32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1365 // If the node is a conference item, check the jid.
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1366 if (p && !strcmp(p, "conference")) {
1397 5f91bac887ee Minor style change Mikael Berthe <mikael@lilotux.net> parents: 1396 diff changeset	1367 const char *fjid = xmlnode_get_attrib(x, "jid");
1363 32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1368 if (fjid && !strcasecmp(bjid, fjid))
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1369 return TRUE;
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1370 }
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1371 }
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1372 return FALSE;
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1373 }
32077249de77 Warn if a MUC room without bookmark is renamed Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	1374
1395 d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1375 // jb_get_bookmark_nick(roomjid)
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1376 // Return the room nickname if it is present in a bookmark.
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1377 const char jb_get_bookmark_nick(const char bjid)
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1378 {
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1379 xmlnode x;
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1380
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1381 if (!bookmarks \|\| !bjid)
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1382 return NULL;
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1383
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1384 // Walk through the storage bookmark tags
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1385 x = xmlnode_get_firstchild(bookmarks);
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1386 for ( ; x; x = xmlnode_get_nextsibling(x)) {
1397 5f91bac887ee Minor style change Mikael Berthe <mikael@lilotux.net> parents: 1396 diff changeset	1387 const char *p = xmlnode_get_name(x);
1395 d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1388 // If the node is a conference item, check the jid.
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1389 if (p && !strcmp(p, "conference")) {
1397 5f91bac887ee Minor style change Mikael Berthe <mikael@lilotux.net> parents: 1396 diff changeset	1390 const char *fjid = xmlnode_get_attrib(x, "jid");
1395 d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1391 if (fjid && !strcasecmp(bjid, fjid))
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1392 return xmlnode_get_tag_data(x, "nick");
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1393 }
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1394 }
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1395 return NULL;
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1396 }
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1397
d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	1398
1163 2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1399 // jb_get_all_storage_bookmarks()
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1400 // Return a GSList with all storage bookmarks.
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1401 // The caller should g_free the list (not the MUC jids).
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1402 GSList *jb_get_all_storage_bookmarks(void)
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1403 {
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1404 xmlnode x;
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1405 GSList *sl_bookmarks = NULL;
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1406
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1407 // If we have no bookmarks, probably the server doesn't support them.
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1408 if (!bookmarks)
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1409 return NULL;
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1410
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1411 // Walk through the storage bookmark tags
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1412 x = xmlnode_get_firstchild(bookmarks);
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1413 for ( ; x; x = xmlnode_get_nextsibling(x)) {
1397 5f91bac887ee Minor style change Mikael Berthe <mikael@lilotux.net> parents: 1396 diff changeset	1414 const char *p = xmlnode_get_name(x);
1163 2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1415 // If the node is a conference item, let's add the note to our list.
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1416 if (p && !strcmp(p, "conference")) {
1397 5f91bac887ee Minor style change Mikael Berthe <mikael@lilotux.net> parents: 1396 diff changeset	1417 const char *fjid = xmlnode_get_attrib(x, "jid");
1163 2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1418 if (!fjid)
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1419 continue;
1164 683d64f2c055 Silence a warning Mikael Berthe <mikael@lilotux.net> parents: 1163 diff changeset	1420 sl_bookmarks = g_slist_append(sl_bookmarks, (char*)fjid);
1163 2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1421 }
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1422 }
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1423 return sl_bookmarks;
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1424 }
2913310a7be6 Make /roster bookmark in the status buffer show all bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1161 diff changeset	1425
1379 74b7621537d7 MUC: Store room settings (print_status, auto_whois) in private storage Mikael Berthe <mikael@lilotux.net> parents: 1378 diff changeset	1426 // jb_set_storage_bookmark(roomid, name, nick, passwd, autojoin,
74b7621537d7 MUC: Store room settings (print_status, auto_whois) in private storage Mikael Berthe <mikael@lilotux.net> parents: 1378 diff changeset	1427 // printstatus, autowhois)
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1428 // Update the private storage bookmarks: add a conference room.
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1429 // If name is nil, we remove the bookmark.
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1430 void jb_set_storage_bookmark(const char roomid, const char name,
1379 74b7621537d7 MUC: Store room settings (print_status, auto_whois) in private storage Mikael Berthe <mikael@lilotux.net> parents: 1378 diff changeset	1431 const char nick, const char passwd,
74b7621537d7 MUC: Store room settings (print_status, auto_whois) in private storage Mikael Berthe <mikael@lilotux.net> parents: 1378 diff changeset	1432 int autojoin, enum room_printstatus pstatus,
74b7621537d7 MUC: Store room settings (print_status, auto_whois) in private storage Mikael Berthe <mikael@lilotux.net> parents: 1378 diff changeset	1433 enum room_autowhois awhois)
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1434 {
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1435 xmlnode x;
1017 41f9a2a4c1de Only update server private storage data if they've changed Mikael Berthe <mikael@lilotux.net> parents: 1016 diff changeset	1436 bool changed = FALSE;
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1437
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1438 if (!roomid)
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1439 return;
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1440
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1441 // If we have no bookmarks, probably the server doesn't support them.
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1442 if (!bookmarks) {
1244 f7b9a00c512d Make room bookark more verbose, and remove duplicate bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1237 diff changeset	1443 scr_LogPrint(LPRINT_NORMAL,
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1444 "Sorry, your server doesn't seem to support private storage.");
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1445 return;
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1446 }
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1447
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1448 // Walk through the storage tags
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1449 x = xmlnode_get_firstchild(bookmarks);
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1450 for ( ; x; x = xmlnode_get_nextsibling(x)) {
1397 5f91bac887ee Minor style change Mikael Berthe <mikael@lilotux.net> parents: 1396 diff changeset	1451 const char *p = xmlnode_get_name(x);
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1452 // If the current node is a conference item, see if we have to replace it.
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1453 if (p && !strcmp(p, "conference")) {
1397 5f91bac887ee Minor style change Mikael Berthe <mikael@lilotux.net> parents: 1396 diff changeset	1454 const char *fjid = xmlnode_get_attrib(x, "jid");
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1455 if (!fjid)
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1456 continue;
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1457 if (!strcmp(fjid, roomid)) {
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1458 // We've found a bookmark for this room. Let's hide it and we'll
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1459 // create a new one.
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1460 xmlnode_hide(x);
1017 41f9a2a4c1de Only update server private storage data if they've changed Mikael Berthe <mikael@lilotux.net> parents: 1016 diff changeset	1461 changed = TRUE;
1244 f7b9a00c512d Make room bookark more verbose, and remove duplicate bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1237 diff changeset	1462 if (!name)
f7b9a00c512d Make room bookark more verbose, and remove duplicate bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1237 diff changeset	1463 scr_LogPrint(LPRINT_LOGNORM, "Deleting bookmark...");
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1464 }
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1465 }
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1466 }
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1467
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1468 // Let's create a node/bookmark for this roomid, if the name is not NULL.
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1469 if (name) {
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1470 x = xmlnode_insert_tag(bookmarks, "conference");
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1471 xmlnode_put_attrib(x, "jid", roomid);
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1472 xmlnode_put_attrib(x, "name", name);
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1473 xmlnode_put_attrib(x, "autojoin", autojoin ? "1" : "0");
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1474 if (nick)
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1475 xmlnode_insert_cdata(xmlnode_insert_tag(x, "nick"), nick, -1);
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1476 if (passwd)
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1477 xmlnode_insert_cdata(xmlnode_insert_tag(x, "password"), passwd, -1);
1379 74b7621537d7 MUC: Store room settings (print_status, auto_whois) in private storage Mikael Berthe <mikael@lilotux.net> parents: 1378 diff changeset	1478 if (pstatus)
74b7621537d7 MUC: Store room settings (print_status, auto_whois) in private storage Mikael Berthe <mikael@lilotux.net> parents: 1378 diff changeset	1479 xmlnode_insert_cdata(xmlnode_insert_tag(x, "print_status"),
74b7621537d7 MUC: Store room settings (print_status, auto_whois) in private storage Mikael Berthe <mikael@lilotux.net> parents: 1378 diff changeset	1480 strprintstatus[pstatus], -1);
74b7621537d7 MUC: Store room settings (print_status, auto_whois) in private storage Mikael Berthe <mikael@lilotux.net> parents: 1378 diff changeset	1481 if (awhois)
74b7621537d7 MUC: Store room settings (print_status, auto_whois) in private storage Mikael Berthe <mikael@lilotux.net> parents: 1378 diff changeset	1482 xmlnode_put_attrib(x, "autowhois", (awhois == autowhois_on ? "1" : "0"));
1017 41f9a2a4c1de Only update server private storage data if they've changed Mikael Berthe <mikael@lilotux.net> parents: 1016 diff changeset	1483 changed = TRUE;
1244 f7b9a00c512d Make room bookark more verbose, and remove duplicate bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1237 diff changeset	1484 scr_LogPrint(LPRINT_LOGNORM, "Updating bookmarks...");
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1485 }
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1486
1017 41f9a2a4c1de Only update server private storage data if they've changed Mikael Berthe <mikael@lilotux.net> parents: 1016 diff changeset	1487 if (!changed)
41f9a2a4c1de Only update server private storage data if they've changed Mikael Berthe <mikael@lilotux.net> parents: 1016 diff changeset	1488 return;
41f9a2a4c1de Only update server private storage data if they've changed Mikael Berthe <mikael@lilotux.net> parents: 1016 diff changeset	1489
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1490 if (online)
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1491 send_storage_bookmarks();
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1492 else
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1493 scr_LogPrint(LPRINT_LOGNORM,
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1494 "Warning: you're not connected to the server.");
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1495 }
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1496
1022 4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1497 static struct annotation *parse_storage_rosternote(xmlnode notenode)
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1498 {
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1499 const char *p;
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1500 struct annotation *note = g_new0(struct annotation, 1);
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1501 p = xmlnode_get_attrib(notenode, "cdate");
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1502 if (p)
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1503 note->cdate = from_iso8601(p, 1);
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1504 p = xmlnode_get_attrib(notenode, "mdate");
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1505 if (p)
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1506 note->mdate = from_iso8601(p, 1);
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1507 note->text = g_strdup(xmlnode_get_data(notenode));
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1508 note->jid = g_strdup(xmlnode_get_attrib(notenode, "jid"));
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1509 return note;
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1510 }
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1511
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1512 // jb_get_all_storage_rosternotes()
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1513 // Return a GSList with all storage annotations.
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1514 // The caller should g_free the list and its contents.
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1515 GSList *jb_get_all_storage_rosternotes(void)
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1516 {
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1517 xmlnode x;
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1518 GSList *sl_notes = NULL;
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1519
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1520 // If we have no rosternotes, probably the server doesn't support them.
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1521 if (!rosternotes)
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1522 return NULL;
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1523
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1524 // Walk through the storage rosternotes tags
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1525 x = xmlnode_get_firstchild(rosternotes);
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1526 for ( ; x; x = xmlnode_get_nextsibling(x)) {
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1527 const char *p;
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1528 struct annotation *note;
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1529 p = xmlnode_get_name(x);
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1530
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1531 // We want a note item
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1532 if (!p \|\| strcmp(p, "note"))
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1533 continue;
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1534 // Just in case, check the jid...
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1535 if (!xmlnode_get_attrib(x, "jid"))
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1536 continue;
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1537 // Ok, let's add the note to our list
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1538 note = parse_storage_rosternote(x);
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1539 sl_notes = g_slist_append(sl_notes, note);
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1540 }
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1541 return sl_notes;
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1542 }
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1543
1023 94d9a3cbb211 Remove useless message Mikael Berthe <mikael@lilotux.net> parents: 1022 diff changeset	1544 // jb_get_storage_rosternotes(barejid, silent)
1019 9d5f6e0ea7b3 XEP-0145: display note dates Mikael Berthe <mikael@lilotux.net> parents: 1018 diff changeset	1545 // Return the annotation associated with this jid.
1023 94d9a3cbb211 Remove useless message Mikael Berthe <mikael@lilotux.net> parents: 1022 diff changeset	1546 // If silent is TRUE, no warning is displayed when rosternotes is disabled
1019 9d5f6e0ea7b3 XEP-0145: display note dates Mikael Berthe <mikael@lilotux.net> parents: 1018 diff changeset	1547 // The caller should g_free the string and structure after use.
1023 94d9a3cbb211 Remove useless message Mikael Berthe <mikael@lilotux.net> parents: 1022 diff changeset	1548 struct annotation jb_get_storage_rosternotes(const char barejid, int silent)
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1549 {
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1550 xmlnode x;
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1551
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1552 if (!barejid)
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1553 return NULL;
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1554
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1555 // If we have no rosternotes, probably the server doesn't support them.
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1556 if (!rosternotes) {
1023 94d9a3cbb211 Remove useless message Mikael Berthe <mikael@lilotux.net> parents: 1022 diff changeset	1557 if (!silent)
1244 f7b9a00c512d Make room bookark more verbose, and remove duplicate bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1237 diff changeset	1558 scr_LogPrint(LPRINT_NORMAL, "Sorry, "
1023 94d9a3cbb211 Remove useless message Mikael Berthe <mikael@lilotux.net> parents: 1022 diff changeset	1559 "your server doesn't seem to support private storage.");
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1560 return NULL;
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1561 }
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1562
1022 4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1563 // Walk through the storage rosternotes tags
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1564 x = xmlnode_get_firstchild(rosternotes);
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1565 for ( ; x; x = xmlnode_get_nextsibling(x)) {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1566 const char *fjid;
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1567 const char *p;
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1568 p = xmlnode_get_name(x);
1022 4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1569 // We want a note item
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1570 if (!p \|\| strcmp(p, "note"))
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1571 continue;
4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1572 // Just in case, check the jid...
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1573 fjid = xmlnode_get_attrib(x, "jid");
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1574 if (fjid && !strcmp(fjid, barejid)) // We've found a note for this contact.
1022 4c8d7b558e83 Annotations listing (/roster note in the status buffer) Mikael Berthe <mikael@lilotux.net> parents: 1019 diff changeset	1575 return parse_storage_rosternote(x);
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1576 }
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1577 return NULL; // No note found
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1578 }
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1579
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1580 // jb_set_storage_rosternotes(barejid, note)
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1581 // Update the private storage rosternotes: add/delete a note.
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1582 // If note is nil, we remove the existing note.
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1583 void jb_set_storage_rosternotes(const char barejid, const char note)
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1584 {
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1585 xmlnode x;
1017 41f9a2a4c1de Only update server private storage data if they've changed Mikael Berthe <mikael@lilotux.net> parents: 1016 diff changeset	1586 bool changed = FALSE;
1018 45d022fbce3a XEP-0145: Handle dates Mikael Berthe <mikael@lilotux.net> parents: 1017 diff changeset	1587 const char *cdate = NULL;
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1588
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1589 if (!barejid)
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1590 return;
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1591
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1592 // If we have no rosternotes, probably the server doesn't support them.
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1593 if (!rosternotes) {
1244 f7b9a00c512d Make room bookark more verbose, and remove duplicate bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1237 diff changeset	1594 scr_LogPrint(LPRINT_NORMAL,
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1595 "Sorry, your server doesn't seem to support private storage.");
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1596 return;
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1597 }
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1598
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1599 // Walk through the storage tags
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1600 x = xmlnode_get_firstchild(rosternotes);
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1601 for ( ; x; x = xmlnode_get_nextsibling(x)) {
1397 5f91bac887ee Minor style change Mikael Berthe <mikael@lilotux.net> parents: 1396 diff changeset	1602 const char *p = xmlnode_get_name(x);
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1603 // If the current node is a conference item, see if we have to replace it.
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1604 if (p && !strcmp(p, "note")) {
1397 5f91bac887ee Minor style change Mikael Berthe <mikael@lilotux.net> parents: 1396 diff changeset	1605 const char *fjid = xmlnode_get_attrib(x, "jid");
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1606 if (!fjid)
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1607 continue;
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1608 if (!strcmp(fjid, barejid)) {
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1609 // We've found a note for this jid. Let's hide it and we'll
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1610 // create a new one.
1018 45d022fbce3a XEP-0145: Handle dates Mikael Berthe <mikael@lilotux.net> parents: 1017 diff changeset	1611 cdate = xmlnode_get_attrib(x, "cdate");
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1612 xmlnode_hide(x);
1017 41f9a2a4c1de Only update server private storage data if they've changed Mikael Berthe <mikael@lilotux.net> parents: 1016 diff changeset	1613 changed = TRUE;
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1614 break;
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1615 }
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1616 }
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1617 }
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1618
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1619 // Let's create a node for this jid, if the note is not NULL.
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1620 if (note) {
1018 45d022fbce3a XEP-0145: Handle dates Mikael Berthe <mikael@lilotux.net> parents: 1017 diff changeset	1621 char mdate[20];
45d022fbce3a XEP-0145: Handle dates Mikael Berthe <mikael@lilotux.net> parents: 1017 diff changeset	1622 time_t now;
45d022fbce3a XEP-0145: Handle dates Mikael Berthe <mikael@lilotux.net> parents: 1017 diff changeset	1623 time(&now);
45d022fbce3a XEP-0145: Handle dates Mikael Berthe <mikael@lilotux.net> parents: 1017 diff changeset	1624 to_iso8601(mdate, now);
45d022fbce3a XEP-0145: Handle dates Mikael Berthe <mikael@lilotux.net> parents: 1017 diff changeset	1625 if (!cdate)
45d022fbce3a XEP-0145: Handle dates Mikael Berthe <mikael@lilotux.net> parents: 1017 diff changeset	1626 cdate = mdate;
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1627 x = xmlnode_insert_tag(rosternotes, "note");
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1628 xmlnode_put_attrib(x, "jid", barejid);
1018 45d022fbce3a XEP-0145: Handle dates Mikael Berthe <mikael@lilotux.net> parents: 1017 diff changeset	1629 xmlnode_put_attrib(x, "cdate", cdate);
45d022fbce3a XEP-0145: Handle dates Mikael Berthe <mikael@lilotux.net> parents: 1017 diff changeset	1630 xmlnode_put_attrib(x, "mdate", mdate);
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1631 xmlnode_insert_cdata(x, note, -1);
1017 41f9a2a4c1de Only update server private storage data if they've changed Mikael Berthe <mikael@lilotux.net> parents: 1016 diff changeset	1632 changed = TRUE;
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1633 }
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1634
1017 41f9a2a4c1de Only update server private storage data if they've changed Mikael Berthe <mikael@lilotux.net> parents: 1016 diff changeset	1635 if (!changed)
41f9a2a4c1de Only update server private storage data if they've changed Mikael Berthe <mikael@lilotux.net> parents: 1016 diff changeset	1636 return;
41f9a2a4c1de Only update server private storage data if they've changed Mikael Berthe <mikael@lilotux.net> parents: 1016 diff changeset	1637
1016 4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1638 if (online)
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1639 send_storage_rosternotes();
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1640 else
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1641 scr_LogPrint(LPRINT_LOGNORM,
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1642 "Warning: you're not connected to the server.");
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1643 }
4d3c48844746 Add /roster note Mikael Berthe <mikael@lilotux.net> parents: 1015 diff changeset	1644
1194 03d8fafe8104 Remove a warning when gpgme is disabled Mikael Berthe <mikael@lilotux.net> parents: 1166 diff changeset	1645 #ifdef HAVE_GPGME
1104 382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1646 // keys_mismatch(key, expectedkey)
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1647 // Return TRUE if both keys are non-null and "expectedkey" doesn't match
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1648 // the end of "key".
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1649 // If one of the keys is null, return FALSE.
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1650 // If expectedkey is less than 8 bytes long, return TRUE.
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1651 //
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1652 // Example: keys_mismatch("C9940A9BB0B92210", "B0B92210") will return FALSE.
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1653 static bool keys_mismatch(const char key, const char expectedkey)
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1654 {
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1655 int lk, lek;
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1656
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1657 if (!expectedkey \|\| !key)
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1658 return FALSE;
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1659
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1660 lk = strlen(key);
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1661 lek = strlen(expectedkey);
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1662
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1663 // If the expectedkey is less than 8 bytes long, this is probably a
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1664 // user mistake so we consider it's a mismatch.
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1665 if (lek < 8)
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1666 return TRUE;
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1667
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1668 if (lek < lk)
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1669 key += lk - lek;
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1670
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1671 return strcasecmp(key, expectedkey);
382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1672 }
1194 03d8fafe8104 Remove a warning when gpgme is disabled Mikael Berthe <mikael@lilotux.net> parents: 1166 diff changeset	1673 #endif
1104 382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1674
1043 ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1675 // check_signature(barejid, resourcename, xmldata, text)
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1676 // Verify the signature (in xmldata) of "text" for the contact
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1677 // barejid/resourcename.
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1678 // xmldata is the 'jabber:x:signed' stanza.
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1679 // If the key id is found, the contact's PGP data are updated.
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1680 static void check_signature(const char barejid, const char rname,
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1681 xmlnode xmldata, const char *text)
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1682 {
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1683 #ifdef HAVE_GPGME
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1684 char p, key;
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1685 GSList *sl_buddy;
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1686 struct pgp_data *res_pgpdata;
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1687 gpgme_sigsum_t sigsum;
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1688
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1689 // All parameters must be valid
1045 96be69d3a5fd Verify signatures for empty status messages Mikael Berthe <mikael@lilotux.net> parents: 1044 diff changeset	1690 if (!(xmldata && barejid && rname && text))
1043 ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1691 return;
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1692
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1693 if (!gpg_enabled())
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1694 return;
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1695
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1696 // Get the resource PGP data structure
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1697 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER);
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1698 if (!sl_buddy)
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1699 return;
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1700 res_pgpdata = buddy_resource_pgp(sl_buddy->data, rname);
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1701 if (!res_pgpdata)
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1702 return;
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1703
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1704 p = xmlnode_get_name(xmldata);
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1705 if (!p \|\| strcmp(p, "x"))
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1706 return; // We expect "<x xmlns='jabber:x:signed'>"
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1707
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1708 // Get signature
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1709 p = xmlnode_get_data(xmldata);
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1710 if (!p)
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1711 return;
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1712
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1713 key = gpg_verify(p, text, &sigsum);
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1714 if (key) {
1067 a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	1715 const char *expectedkey;
a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	1716 char *buf;
1043 ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1717 g_free(res_pgpdata->sign_keyid);
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1718 res_pgpdata->sign_keyid = key;
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1719 res_pgpdata->last_sigsum = sigsum;
1046 a3748bd3d010 Tell the user when a signature is bad Mikael Berthe <mikael@lilotux.net> parents: 1045 diff changeset	1720 if (sigsum & GPGME_SIGSUM_RED) {
1067 a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	1721 buf = g_strdup_printf("Bad signature from <%s/%s>", barejid, rname);
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	1722 scr_WriteIncomingMessage(barejid, buf, 0, HBB_PREFIX_INFO, 0);
1067 a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	1723 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	1724 g_free(buf);
a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	1725 }
a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	1726 // Verify that the key id is the one we expect.
a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	1727 expectedkey = settings_pgp_getkeyid(barejid);
1104 382972712208 Allow short key format in check_signature() Mikael Berthe <mikael@lilotux.net> parents: 1099 diff changeset	1728 if (keys_mismatch(key, expectedkey)) {
1067 a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	1729 buf = g_strdup_printf("Warning: The KeyId from <%s/%s> doesn't match "
a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	1730 "the key you set up", barejid, rname);
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	1731 scr_WriteIncomingMessage(barejid, buf, 0, HBB_PREFIX_INFO, 0);
1046 a3748bd3d010 Tell the user when a signature is bad Mikael Berthe <mikael@lilotux.net> parents: 1045 diff changeset	1732 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
a3748bd3d010 Tell the user when a signature is bad Mikael Berthe <mikael@lilotux.net> parents: 1045 diff changeset	1733 g_free(buf);
a3748bd3d010 Tell the user when a signature is bad Mikael Berthe <mikael@lilotux.net> parents: 1045 diff changeset	1734 }
1043 ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1735 }
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1736 #endif
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1737 }
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1738
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	1739 static void gotmessage(char type, const char from, const char *body,
1399 187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	1740 const char enc, const char subject, time_t timestamp,
1043 ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1741 xmlnode xmldata_signed)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	1742 {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1743 char *bjid;
956 819396bebdf5 Do not block system messages when block_unsubscribed is set Mikael Berthe <mikael@lilotux.net> parents: 940 diff changeset	1744 const char rname, s;
1347 07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1745 char *decrypted_pgp = NULL;
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1746 char *decrypted_otr = NULL;
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	1747 int otr_msg = 0, free_msg = 0;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	1748
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1749 bjid = jidtodisp(from);
441 51b8f10cfeb8 Handle g_locale_from_utf8() failures Mikael Berthe <mikael@lilotux.net> parents: 438 diff changeset	1750
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 960 diff changeset	1751 rname = strchr(from, JID_RESOURCE_SEPARATOR);
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	1752 if (rname) rname++;
819 c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1753
1042 8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	1754 #ifdef HAVE_GPGME
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	1755 if (enc && gpg_enabled()) {
1347 07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1756 decrypted_pgp = gpg_decrypt(enc);
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1757 if (decrypted_pgp) {
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1758 body = decrypted_pgp;
1043 ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1759 }
1042 8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	1760 }
1043 ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	1761 // Check signature of an unencrypted message
1053 1ec7ec9bda60 Cleanup/cosmetics Mikael Berthe <mikael@lilotux.net> parents: 1052 diff changeset	1762 if (xmldata_signed && gpg_enabled())
1347 07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1763 check_signature(bjid, rname, xmldata_signed, decrypted_pgp);
1042 8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	1764 #endif
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	1765
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	1766 #ifdef HAVE_LIBOTR
1347 07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1767 if (otr_enabled()) {
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1768 decrypted_otr = (char*)body;
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1769 otr_msg = otr_receive(&decrypted_otr, bjid, &free_msg);
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1770 if (!decrypted_otr) {
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1771 goto gotmessage_return;
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1772 }
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1773 body = decrypted_otr;
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	1774 }
3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	1775 #endif
3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	1776
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1777 // Check for unexpected groupchat messages
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1778 // 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	1779 // 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	1780 // a type unavailable.
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1781 if (type && !strcmp(type, "groupchat") && !roster_getnickname(bjid)) {
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1782 // It shouldn't happen, probably a server issue
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1783 GSList *room_elt;
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1784 char *mbuf;
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1785
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1786 mbuf = g_strdup_printf("Unexpected groupchat packet!");
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1787 scr_LogPrint(LPRINT_LOGNORM, "%s", mbuf);
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	1788 scr_WriteIncomingMessage(bjid, mbuf, 0, HBB_PREFIX_INFO, 0);
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1789 g_free(mbuf);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1790
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1791 // Send back an unavailable packet
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1792 jb_setstatus(offline, bjid, "", TRUE);
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1793
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1794 // MUC
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1795 // Make sure this is a room (it can be a conversion user->room)
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1796 room_elt = roster_find(bjid, jidsearch, 0);
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1797 if (!room_elt) {
1355 9716cf8a0726 Add on_server flag Mikael Berthe <mikael@lilotux.net> parents: 1354 diff changeset	1798 room_elt = roster_add_user(bjid, NULL, NULL, ROSTER_TYPE_ROOM,
9716cf8a0726 Add on_server flag Mikael Berthe <mikael@lilotux.net> parents: 1354 diff changeset	1799 sub_none, -1);
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1800 } else {
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1801 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1802 }
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1803
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1804 buddylist_build();
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1805 scr_DrawRoster();
1347 07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1806 goto gotmessage_return;
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1807 }
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	1808
819 c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1809 // 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	1810 // 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	1811 // System messages (from our server) are allowed.
819 c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1812 if (!settings_opt_get_int("block_unsubscribed") \|\|
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1813 (roster_getsubscription(bjid) & sub_from) \|\|
956 819396bebdf5 Do not block system messages when block_unsubscribed is set Mikael Berthe <mikael@lilotux.net> parents: 940 diff changeset	1814 (type && strcmp(type, "chat")) \|\|
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1815 ((s = settings_opt_get("server")) != NULL && !strcasecmp(bjid, s))) {
1399 187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	1816 gchar *fullbody = NULL;
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	1817 if (subject) {
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	1818 if (body)
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	1819 fullbody = g_strdup_printf("[%s]\n%s", subject, body);
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	1820 else
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	1821 fullbody = g_strdup_printf("[%s]\n", subject);
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	1822 body = fullbody;
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	1823 }
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1824 hk_message_in(bjid, rname, timestamp, body, type,
1347 07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1825 ((decrypted_pgp \|\| otr_msg) ? TRUE : FALSE));
1399 187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	1826 g_free(fullbody);
819 c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1827 } else {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1828 scr_LogPrint(LPRINT_LOGNORM, "Blocked a message from <%s>", bjid);
819 c2d7d9dd4193 New option 'block_unsubscribed' Mikael Berthe <mikael@lilotux.net> parents: 818 diff changeset	1829 }
1347 07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1830
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1831 gotmessage_return:
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1832 // Clean up and exit
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1833 g_free(bjid);
1347 07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1834 g_free(decrypted_pgp);
1333 e30a9d907105 Minor coding style adjustments Mikael Berthe <mikael@lilotux.net> parents: 1330 diff changeset	1835 if (free_msg)
1347 07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	1836 g_free(decrypted_otr);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	1837 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	1838
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	1839 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	1840 {
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1841 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	1842
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1843 switch(code) {
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1844 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	1845 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1846 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	1847 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1848 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	1849 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1850 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	1851 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1852 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	1853 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1854 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	1855 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1856 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	1857 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1858 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	1859 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1860 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	1861 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1862 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	1863 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1864 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	1865 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1866 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	1867 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1868 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	1869 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1870 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	1871 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1872 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	1873 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1874 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	1875 break;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1876 default:
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1877 desc = NULL;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1878 }
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1879
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1880 return desc;
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1881 }
04a0b450380b Display error code/message when receiving a message packet with "error" type Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	1882
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1883 // display_server_error(x)
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1884 // 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	1885 // x: error tag xmlnode pointer
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	1886 void display_server_error(xmlnode x)
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1887 {
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1888 const char *desc = NULL;
862 5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1889 char *sdesc;
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1890 int code = 0;
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1891 char *s;
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1892 const char *p;
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1893
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	1894 if (!x) return;
4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	1895
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1896 /* RFC3920:
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1897 * The <error/> element:
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1898 * 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	1899 * 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	1900 * 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	1901 */
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1902 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	1903 if (p)
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1904 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	1905
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1906 // For backward compatibility
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1907 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	1908 code = atoi(s);
2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1909 // Default message
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1910 desc = defaulterrormsg(code);
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1911 }
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1912
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1913 // 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	1914 s = xmlnode_get_data(x);
d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1915 if (s && *s) desc = s;
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1916
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	1917 // 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	1918 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	1919 if (s && *s) desc = s;
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1920
1344 44ff580ee388 Fix a potential segfault in display_server_error() Mikael Berthe <mikael@lilotux.net> parents: 1343 diff changeset	1921 // If we still have no description, let's give up
44ff580ee388 Fix a potential segfault in display_server_error() Mikael Berthe <mikael@lilotux.net> parents: 1343 diff changeset	1922 if (!desc)
44ff580ee388 Fix a potential segfault in display_server_error() Mikael Berthe <mikael@lilotux.net> parents: 1343 diff changeset	1923 return;
44ff580ee388 Fix a potential segfault in display_server_error() Mikael Berthe <mikael@lilotux.net> parents: 1343 diff changeset	1924
862 5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1925 // Strip trailing newlines
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1926 sdesc = g_strdup(desc);
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1927 for (s = sdesc; *s; s++) ;
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1928 if (s > sdesc)
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1929 s--;
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1930 while (s >= sdesc && (s == '\n' \|\| s == '\r'))
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1931 *s-- = '\0';
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1932
5ed97fc7afa0 Strip trailing empty lines from error messages Mikael Berthe <mikael@lilotux.net> parents: 861 diff changeset	1933 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	1934 g_free(sdesc);
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1935 }
2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	1936
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	1937 static void statehandler(jconn conn, int state)
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1938 {
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1939 static int previous_state = -1;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1940
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1941 scr_LogPrint(LPRINT_DEBUG, "StateHandler called (state=%d).", state);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1942
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1943 switch(state) {
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1944 case JCONN_STATE_OFF:
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	1945 if (previous_state != JCONN_STATE_OFF)
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1946 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Not connected to the server");
37 1441ba37a5c1 [/trunk] Changeset 53 by mikael mikael parents: 36 diff changeset	1947
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	1948 // Sometimes the state isn't correctly updated
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	1949 if (jc)
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	1950 jc->state = JCONN_STATE_OFF;
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	1951 online = FALSE;
159 ba51d1737086 [/trunk] Changeset 171 by mikael mikael parents: 154 diff changeset	1952 mystatus = offline;
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1953 // Free bookmarks
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1954 xmlnode_free(bookmarks);
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1955 bookmarks = NULL;
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1956 // Free roster
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	1957 roster_free();
1212 3b21353e4ad3 Free rosternotes data when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1205 diff changeset	1958 xmlnode_free(rosternotes);
3b21353e4ad3 Free rosternotes data when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1205 diff changeset	1959 rosternotes = NULL;
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	1960 // Update display
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	1961 update_roster = TRUE;
865 cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 864 diff changeset	1962 scr_UpdateBuddyWindow();
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1963 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1964
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1965 case JCONN_STATE_CONNECTED:
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1966 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Connected to the server");
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1967 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1968
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1969 case JCONN_STATE_AUTH:
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1970 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Authenticating to the server");
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1971 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1972
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1973 case JCONN_STATE_ON:
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1974 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Communication with the server "
bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1975 "established");
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	1976 online = TRUE;
1254 401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	1977 update_last_use();
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	1978 // We set AutoConnection to true after the 1st successful connection
1381 40095d413da9 Fix compilation on OpenBSD Mikael Berthe <mikael@lilotux.net> parents: 1380 diff changeset	1979 AutoConnection = TRUE;
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1980 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1981
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	1982 case JCONN_STATE_CONNECTING:
357 e8adc3c96e68 Better messages for server connection states Mikael Berthe <mikael@lilotux.net> parents: 353 diff changeset	1983 if (previous_state != state)
408 73433860665c Tune previous usleep() change Mikael Berthe <mikael@lilotux.net> parents: 407 diff changeset	1984 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Connecting to the server");
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	1985 break;
a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	1986
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1987 default:
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1988 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1989 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1990 previous_state = state;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1991 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	1992
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	1993 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	1994 {
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1995 xmlnode x;
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1996 char *p;
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1997
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1998 x = xmlnode_get_firstchild(xmldata);
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	1999 for ( ; x; x = xmlnode_get_nextsibling(x)) {
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2000 if ((p = xmlnode_get_attrib(x, "xmlns")) && !strcmp(p, xmlns))
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2001 break;
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	2002 }
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2003 return x;
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2004 }
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2005
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2006 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	2007 {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2008 xmlnode x;
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2009 char *p;
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2010
1282 d438b56990cd Implement XEP-0203 (Delayed Delivery) Mikael Berthe <mikael@lilotux.net> parents: 1255 diff changeset	2011 x = xml_get_xmlns(xmldata, NS_XMPP_DELAY);
d438b56990cd Implement XEP-0203 (Delayed Delivery) Mikael Berthe <mikael@lilotux.net> parents: 1255 diff changeset	2012 if (x && !strcmp(xmlnode_get_name(x), "delay") &&
d438b56990cd Implement XEP-0203 (Delayed Delivery) Mikael Berthe <mikael@lilotux.net> parents: 1255 diff changeset	2013 (p = xmlnode_get_attrib(x, "stamp")) != NULL)
d438b56990cd Implement XEP-0203 (Delayed Delivery) Mikael Berthe <mikael@lilotux.net> parents: 1255 diff changeset	2014 return from_iso8601(p, 1);
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2015 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	2016 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	2017 return from_iso8601(p, 1);
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	2018 return 0;
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	2019 }
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	2020
1384 f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2021 // muc_get_item_info(...)
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2022 // Get room member's information from xmlndata.
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2023 // The variables must be initialized before calling this function,
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2024 // because they are not touched if the relevant information is missing.
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2025 static void muc_get_item_info(const char *from, xmlnode xmldata,
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2026 enum imrole mbrole, enum imaffiliation mbaffil,
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2027 const char mbjid, const char mbnick,
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2028 const char actorjid, const char reason)
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2029 {
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2030 xmlnode y, z;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2031 char *p;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2032
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2033 y = xmlnode_get_tag(xmldata, "item");
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2034 if (!y)
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2035 return;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2036
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2037 p = xmlnode_get_attrib(y, "affiliation");
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2038 if (p) {
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2039 if (!strcmp(p, "owner")) *mbaffil = affil_owner;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2040 else if (!strcmp(p, "admin")) *mbaffil = affil_admin;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2041 else if (!strcmp(p, "member")) *mbaffil = affil_member;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2042 else if (!strcmp(p, "outcast")) *mbaffil = affil_outcast;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2043 else if (!strcmp(p, "none")) *mbaffil = affil_none;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2044 else scr_LogPrint(LPRINT_LOGNORM, "<%s>: Unknown affiliation \"%s\"",
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2045 from, p);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2046 }
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2047 p = xmlnode_get_attrib(y, "role");
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2048 if (p) {
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2049 if (!strcmp(p, "moderator")) *mbrole = role_moderator;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2050 else if (!strcmp(p, "participant")) *mbrole = role_participant;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2051 else if (!strcmp(p, "visitor")) *mbrole = role_visitor;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2052 else if (!strcmp(p, "none")) *mbrole = role_none;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2053 else scr_LogPrint(LPRINT_LOGNORM, "<%s>: Unknown role \"%s\"",
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2054 from, p);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2055 }
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2056 *mbjid = xmlnode_get_attrib(y, "jid");
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2057 *mbnick = xmlnode_get_attrib(y, "nick");
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2058 // For kick/ban, there can be actor and reason tags
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2059 *reason = xmlnode_get_tag_data(y, "reason");
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2060 z = xmlnode_get_tag(y, "actor");
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2061 if (z)
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2062 *actorjid = xmlnode_get_attrib(z, "jid");
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2063 }
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2064
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2065 // muc_handle_join(...)
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2066 // Handle a join event in a MUC room.
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2067 // This function will return the new_member value TRUE if somebody else joins
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2068 // the room (and FALSE if _we_ are joining the room).
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2069 static bool muc_handle_join(const GSList room_elt, const char rname,
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2070 const char roomjid, const char ournick,
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2071 enum room_printstatus printstatus,
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2072 time_t usttime, int log_muc_conf)
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2073 {
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2074 bool new_member = FALSE; // True if somebody else joins the room (not us)
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2075 gchar *mbuf;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2076
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2077 if (!buddy_getinsideroom(room_elt->data)) {
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2078 // We weren't inside the room yet. Now we are.
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2079 // However, this could be a presence packet from another room member
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2080
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2081 buddy_setinsideroom(room_elt->data, TRUE);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2082 // Set the message flag unless we're already in the room buffer window
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2083 scr_setmsgflag_if_needed(roomjid, FALSE);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2084 // Add a message to the tracelog file
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2085 mbuf = g_strdup_printf("You have joined %s as \"%s\"", roomjid, ournick);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2086 scr_LogPrint(LPRINT_LOGNORM, "%s", mbuf);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2087 g_free(mbuf);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2088 mbuf = g_strdup_printf("You have joined as \"%s\"", ournick);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2089
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2090 // The 1st presence message could be for another room member
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2091 if (strcmp(ournick, rname)) {
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2092 // Display current mbuf and create a new message for the member
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2093 // Note: the usttime timestamp is related to the other member,
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2094 // so we use 0 here.
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2095 scr_WriteIncomingMessage(roomjid, mbuf, 0,
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2096 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG, 0);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2097 if (log_muc_conf)
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2098 hlog_write_message(roomjid, 0, -1, mbuf);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2099 g_free(mbuf);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2100 if (printstatus != status_none)
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2101 mbuf = g_strdup_printf("%s has joined", rname);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2102 else
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2103 mbuf = NULL;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2104 new_member = TRUE;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2105 }
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2106 } else {
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2107 mbuf = NULL;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2108 if (strcmp(ournick, rname)) {
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2109 if (printstatus != status_none)
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2110 mbuf = g_strdup_printf("%s has joined", rname);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2111 new_member = TRUE;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2112 }
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2113 }
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2114
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2115 if (mbuf) {
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2116 guint msgflags = HBB_PREFIX_INFO;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2117 if (!settings_opt_get_int("muc_flag_joins"))
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2118 msgflags \|= HBB_PREFIX_NOFLAG;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2119 scr_WriteIncomingMessage(roomjid, mbuf, usttime, msgflags, 0);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2120 if (log_muc_conf)
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2121 hlog_write_message(roomjid, 0, -1, mbuf);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2122 g_free(mbuf);
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2123 }
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2124
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2125 return new_member;
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2126 }
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2127
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2128 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	2129 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	2130 enum imstatus ust, char *ustmsg,
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	2131 time_t usttime, char bpprio)
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2132 {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2133 xmlnode y;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2134 char *p;
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2135 char *mbuf;
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2136 const char *ournick;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2137 enum imrole mbrole = role_none;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2138 enum imaffiliation mbaffil = affil_none;
1377 cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2139 enum room_printstatus printstatus;
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2140 enum room_autowhois autowhois;
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	2141 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	2142 const char actorjid = NULL, reason = NULL;
837 7c74eef1d0e0 New option "muc_auto_whois" Mikael Berthe <mikael@lilotux.net> parents: 834 diff changeset	2143 bool new_member = FALSE; // True if somebody else joins the room (not us)
1377 cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2144 guint statuscode = 0;
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2145 guint nickchange = 0;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2146 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	2147 int log_muc_conf;
1013 f1a9ca2348e5 Set the msg_flag when we leave a MUC room Mikael Berthe <mikael@lilotux.net> parents: 1010 diff changeset	2148 guint msgflags;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2149
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	2150 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	2151
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	2152 room_elt = roster_find(roomjid, jidsearch, 0);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2153 if (!room_elt) {
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2154 // Add room if it doesn't already exist
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2155 // 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	2156 // network issue?)
1355 9716cf8a0726 Add on_server flag Mikael Berthe <mikael@lilotux.net> parents: 1354 diff changeset	2157 room_elt = roster_add_user(roomjid, NULL, NULL, ROSTER_TYPE_ROOM,
9716cf8a0726 Add on_server flag Mikael Berthe <mikael@lilotux.net> parents: 1354 diff changeset	2158 sub_none, -1);
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2159 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	2160 } else {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2161 // 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	2162 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2163 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2164
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2165 // Get room member's information
1384 f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2166 muc_get_item_info(from, xmldata, &mbrole, &mbaffil, &mbjid, &mbnick,
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2167 &actorjid, &reason);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2168
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2169 // Get our room nickname
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2170 ournick = buddy_getnickname(room_elt->data);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2171
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2172 if (!ournick) {
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2173 // It shouldn't happen, probably a server issue
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2174 mbuf = g_strdup_printf("Unexpected groupchat packet!");
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2175
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2176 scr_LogPrint(LPRINT_LOGNORM, "%s", mbuf);
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	2177 scr_WriteIncomingMessage(roomjid, mbuf, 0, HBB_PREFIX_INFO, 0);
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2178 g_free(mbuf);
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2179 // Send back an unavailable packet
1050 ea71d31a2607 PGP: Do not sign presence messages to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 1046 diff changeset	2180 jb_setstatus(offline, roomjid, "", TRUE);
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2181 scr_DrawRoster();
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2182 return;
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2183 }
a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2184
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	2185 // 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	2186 // 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	2187 // 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	2188 // 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	2189 // 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	2190 // 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	2191 y = xmlnode_get_tag(xmldata, "status");
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2192 if (y) {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2193 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	2194 if (p)
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	2195 statuscode = atoi(p);
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	2196 }
ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	2197
1377 cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2198 // Get the room's "print_status" settings
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2199 printstatus = buddy_getprintstatus(room_elt->data);
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2200 if (printstatus == status_default) {
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2201 printstatus = (guint) settings_opt_get_int("muc_print_status");
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2202 if (printstatus > 3)
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2203 printstatus = status_default;
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2204 }
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2205
1396 8f9928839a36 Automatically unlock new rooms (suggested by Michael Weiser) Mikael Berthe <mikael@lilotux.net> parents: 1395 diff changeset	2206 // A new room has been created; accept MUC default config
8f9928839a36 Automatically unlock new rooms (suggested by Michael Weiser) Mikael Berthe <mikael@lilotux.net> parents: 1395 diff changeset	2207 if (statuscode == 201)
8f9928839a36 Automatically unlock new rooms (suggested by Michael Weiser) Mikael Berthe <mikael@lilotux.net> parents: 1395 diff changeset	2208 jb_room_unlock(roomjid);
8f9928839a36 Automatically unlock new rooms (suggested by Michael Weiser) Mikael Berthe <mikael@lilotux.net> parents: 1395 diff changeset	2209
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	2210 // 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	2211 if (statuscode == 303 && mbnick) {
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2212 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	2213 scr_WriteIncomingMessage(roomjid, mbuf, usttime,
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	2214 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG, 0);
1166 c4da23bf8958 Add option 'muc_flag_joins' Mikael Berthe <mikael@lilotux.net> parents: 1164 diff changeset	2215 if (log_muc_conf)
1342 06441b6cc23a History logfile: Use a special code (MI) for local MUC info messages Mikael Berthe <mikael@lilotux.net> parents: 1333 diff changeset	2216 hlog_write_message(roomjid, 0, -1, mbuf);
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	2217 g_free(mbuf);
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2218 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	2219 // Maybe it's _our_ nickname...
864 a7b3409df6bc MUC: Work around user server restart Mikael Berthe <mikael@lilotux.net> parents: 862 diff changeset	2220 if (ournick && !strcmp(rname, ournick))
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2221 buddy_setnickname(room_elt->data, mbnick);
1377 cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2222 nickchange = TRUE;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2223 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2224
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2225 // Check for departure/arrival
1161 45d3b9dda43d Fix a MUC problem with some servers Mikael Berthe <mikael@lilotux.net> parents: 1132 diff changeset	2226 if (!mbnick && ust == offline) {
1384 f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2227 // Somebody is leaving
586 d8f64e74206c Missing initialization Mikael Berthe <mikael@lilotux.net> parents: 584 diff changeset	2228 enum { leave=0, kick, ban } how = leave;
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2229 bool we_left = FALSE;
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2230
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2231 if (statuscode == 307)
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2232 how = kick;
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2233 else if (statuscode == 301)
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2234 how = ban;
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2235
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2236 // 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	2237 if (ournick && !strcmp(rname, ournick)) {
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2238 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	2239 buddy_setinsideroom(room_elt->data, FALSE);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2240 buddy_setnickname(room_elt->data, NULL);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2241 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	2242 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	2243 scr_UpdateChatStatus(FALSE);
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2244 update_roster = TRUE;
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2245 }
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	2246
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2247 // The message depends on _who_ left, and _how_
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2248 if (how) {
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2249 gchar *mbuf_end;
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2250 // Forced leave
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2251 if (actorjid) {
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2252 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	2253 (how == ban ? "banned" : "kicked"),
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2254 roomjid, actorjid, reason);
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2255 } else {
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2256 mbuf_end = g_strdup_printf("%s from %s.",
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2257 (how == ban ? "banned" : "kicked"),
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2258 roomjid);
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2259 }
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2260 if (we_left)
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2261 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	2262 else
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2263 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	2264
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2265 g_free(mbuf_end);
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2266 } else {
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2267 // Natural leave
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2268 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	2269 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	2270 if (destroynode) {
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2271 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	2272 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	2273 "the room has been destroyed: %s",
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2274 roomjid, reason);
616 a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	2275 } else {
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	2276 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	2277 "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	2278 }
a61a257ec38b MUC: display reason, if any, when a room has been destroyed Mikael Berthe <mikael@lilotux.net> parents: 612 diff changeset	2279 } else {
599 fb67bf62f4eb Add "/room destroy" Mikael Berthe <mikael@lilotux.net> parents: 598 diff changeset	2280 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	2281 }
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2282 } 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	2283 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	2284 // 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	2285 // 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	2286 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	2287 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	2288 } 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	2289 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	2290 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	2291 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	2292 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	2293 }
581 ad07c868ff43 Tell the user when he or she has been kicked/banned Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	2294 }
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2295 }
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2296
1377 cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2297 // Display the mbuf message if we're concerned
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2298 // or if the print_status isn't set to none.
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2299 if (we_left \|\| printstatus != status_none) {
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2300 msgflags = HBB_PREFIX_INFO;
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2301 if (!we_left && settings_opt_get_int("muc_flag_joins") != 2)
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2302 msgflags \|= HBB_PREFIX_NOFLAG;
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2303 scr_WriteIncomingMessage(roomjid, mbuf, usttime, msgflags, 0);
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2304 }
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2305
1166 c4da23bf8958 Add option 'muc_flag_joins' Mikael Berthe <mikael@lilotux.net> parents: 1164 diff changeset	2306 if (log_muc_conf)
1342 06441b6cc23a History logfile: Use a special code (MI) for local MUC info messages Mikael Berthe <mikael@lilotux.net> parents: 1333 diff changeset	2307 hlog_write_message(roomjid, 0, -1, mbuf);
583 32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2308
32ae027a3238 MUC: clean up departure message code Mikael Berthe <mikael@lilotux.net> parents: 581 diff changeset	2309 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	2310 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	2311 g_free(mbuf);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2312 return;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2313 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2314 g_free(mbuf);
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2315 } 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	2316 ust != offline) {
1384 f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2317 // Somebody is joining
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2318 new_member = muc_handle_join(room_elt, rname, roomjid, ournick,
f762805b3f42 Split function handle_presence_muc() Mikael Berthe <mikael@lilotux.net> parents: 1383 diff changeset	2319 printstatus, usttime, log_muc_conf);
1377 cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2320 } else {
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2321 // This is a simple member status change
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2322
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2323 if (printstatus == status_all && !nickchange) {
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2324 mbuf = g_strdup_printf("Member status has changed: %s [%c] %s", rname,
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2325 imstatus2char[ust], ((ustmsg) ? ustmsg : ""));
1380 605f9e1f9f76 Add missing PREFIX_NOFLAG flag... Mikael Berthe <mikael@lilotux.net> parents: 1379 diff changeset	2326 scr_WriteIncomingMessage(roomjid, mbuf, usttime,
605f9e1f9f76 Add missing PREFIX_NOFLAG flag... Mikael Berthe <mikael@lilotux.net> parents: 1379 diff changeset	2327 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG, 0);
1377 cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2328 g_free(mbuf);
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2329 }
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2330 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2331
1377 cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2332 // Sanity check, shouldn't happen...
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2333 if (!rname)
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2334 return;
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2335
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2336 // Update room member status
1377 cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2337 roster_setstatus(roomjid, rname, bpprio, ust, ustmsg, usttime,
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2338 mbrole, mbaffil, mbjid);
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2339
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2340 autowhois = buddy_getautowhois(room_elt->data);
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2341 if (autowhois == autowhois_default)
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2342 autowhois = (settings_opt_get_int("muc_auto_whois") ?
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2343 autowhois_on : autowhois_off);
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2344
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2345 if (new_member && autowhois == autowhois_on) {
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2346 // FIXME: This will fail for some UTF-8 nicknames.
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2347 gchar *joiner_nick = from_utf8(rname);
1415 317f8d181626 Rename command public functions Mikael Berthe <mikael@lilotux.net> parents: 1414 diff changeset	2348 cmd_room_whois(room_elt->data, joiner_nick, FALSE);
1377 cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2349 g_free(joiner_nick);
cd9182f0b5c7 Add /room setopt {print_status,auto_whois} Mikael Berthe <mikael@lilotux.net> parents: 1365 diff changeset	2350 }
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2351
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2352 scr_DrawRoster();
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2353 }
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2354
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2355 static void handle_packet_presence(jconn conn, char type, char from,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2356 xmlnode xmldata)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2357 {
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2358 char p, r;
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2359 char *ustmsg;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2360 const char *rname;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2361 enum imstatus ust;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2362 char bpprio;
1001 dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	2363 time_t timestamp = 0L;
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2364 xmlnode muc_packet;
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2365
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 960 diff changeset	2366 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	2367 if (rname) rname++;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2368
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2369 r = jidtodisp(from);
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2370
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2371 // Check for MUC presence packet
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2372 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	2373
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2374 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	2375 xmlnode x;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2376 scr_LogPrint(LPRINT_LOGNORM, "Error presence packet from <%s>", r);
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2377 x = xmlnode_get_tag(xmldata, TMSG_ERROR);
4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2378 display_server_error(x);
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2379
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2380 // 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	2381 // 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	2382 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	2383 if (atoi(p) == 409) {
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2384 // 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	2385 // 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	2386 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	2387 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	2388 buddy_setnickname(room_elt->data, NULL);
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2389 }
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2390 }
68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2391
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2392 g_free(r);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2393 return;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2394 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2395
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2396 p = xmlnode_get_tag_data(xmldata, "priority");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2397 if (p && *p) bpprio = (gchar)atoi(p);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2398 else bpprio = 0;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2399
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2400 ust = available;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2401 p = xmlnode_get_tag_data(xmldata, "show");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2402 if (p) {
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2403 if (!strcmp(p, "away")) ust = away;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2404 else if (!strcmp(p, "dnd")) ust = dontdisturb;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2405 else if (!strcmp(p, "xa")) ust = notavail;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2406 else if (!strcmp(p, "chat")) ust = freeforchat;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2407 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2408
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2409 if (type && !strcmp(type, "unavailable"))
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2410 ust = offline;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2411
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2412 ustmsg = xmlnode_get_tag_data(xmldata, "status");
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2413
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	2414 // Timestamp?
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	2415 timestamp = xml_get_timestamp(xmldata);
028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	2416
644 68fb0c1dfb15 MUC: better nickname check when entering a room Mikael Berthe <mikael@lilotux.net> parents: 643 diff changeset	2417 if (muc_packet) {
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2418 // 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	2419 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	2420 ust, ustmsg, timestamp, bpprio);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2421 } else {
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2422 // 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	2423 // 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	2424 // status message is different
1043 ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	2425 const char *m;
ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	2426 m = roster_getstatusmsg(r, rname);
579 0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2427 if ((ust != roster_getstatus(r, rname)) \|\|
0c67755e0fa7 Introduce a handle_presence_muc() function Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	2428 (!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	2429 hk_statuschange(r, rname, bpprio, timestamp, ust, ustmsg);
1043 ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	2430 // Presence signature processing
1045 96be69d3a5fd Verify signatures for empty status messages Mikael Berthe <mikael@lilotux.net> parents: 1044 diff changeset	2431 if (!ustmsg)
96be69d3a5fd Verify signatures for empty status messages Mikael Berthe <mikael@lilotux.net> parents: 1044 diff changeset	2432 ustmsg = ""; // Some clients omit the <status/> element :-(
1043 ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	2433 check_signature(r, rname, xml_get_xmlns(xmldata, NS_SIGNED), ustmsg);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2434 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2435
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2436 g_free(r);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2437 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2438
1330 7ba1b6d7ddcd Fix a bug when receiving an invitation Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	2439 // got_invite(from, to, reason, passwd)
7ba1b6d7ddcd Fix a bug when receiving an invitation Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	2440 // This function should be called when receiving an invitation from user
7ba1b6d7ddcd Fix a bug when receiving an invitation Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	2441 // "from", to enter the room "to". Optional reason and room password can
7ba1b6d7ddcd Fix a bug when receiving an invitation Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	2442 // be provided.
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2443 static void got_invite(char* from, char to, char reason, char* passwd)
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2444 {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2445 eviqs *evn;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2446 event_muc_invitation *invitation;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2447 GString *sbuf;
1236 f7b35b1c343d Fix a roster bug when receiving a MUC invitation Mikael Berthe <mikael@lilotux.net> parents: 1215 diff changeset	2448 char *barejid;
1237 dcb99f0b5aaa Small MUC invitation improvement Mikael Berthe <mikael@lilotux.net> parents: 1236 diff changeset	2449 GSList *room_elt;
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2450
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2451 sbuf = g_string_new("");
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2452 if (reason) {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2453 g_string_printf(sbuf,
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2454 "Received an invitation to <%s>, from <%s>, reason: %s",
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2455 to, from, reason);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2456 } else {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2457 g_string_printf(sbuf, "Received an invitation to <%s>, from <%s>",
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2458 to, from);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2459 }
1236 f7b35b1c343d Fix a roster bug when receiving a MUC invitation Mikael Berthe <mikael@lilotux.net> parents: 1215 diff changeset	2460
f7b35b1c343d Fix a roster bug when receiving a MUC invitation Mikael Berthe <mikael@lilotux.net> parents: 1215 diff changeset	2461 barejid = jidtodisp(from);
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	2462 scr_WriteIncomingMessage(barejid, sbuf->str, 0, HBB_PREFIX_INFO, 0);
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2463 scr_LogPrint(LPRINT_LOGNORM, "%s", sbuf->str);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2464
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2465 evn = evs_new(EVS_TYPE_INVITATION, EVS_MAX_TIMEOUT);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2466 if (evn) {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2467 evn->callback = &evscallback_invitation;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2468 invitation = g_new(event_muc_invitation, 1);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2469 invitation->to = g_strdup(to);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2470 invitation->from = g_strdup(from);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2471 invitation->passwd = g_strdup(passwd);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2472 invitation->reason = g_strdup(reason);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2473 evn->data = invitation;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2474 evn->desc = g_strdup_printf("<%s> invites you to %s ", from, to);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2475 g_string_printf(sbuf, "Please use /event %s accept\|reject", evn->id);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2476 } else {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2477 g_string_printf(sbuf, "Unable to create a new event!");
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2478 }
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	2479 scr_WriteIncomingMessage(barejid, sbuf->str, 0, HBB_PREFIX_INFO, 0);
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2480 scr_LogPrint(LPRINT_LOGNORM, "%s", sbuf->str);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2481 g_string_free(sbuf, TRUE);
1330 7ba1b6d7ddcd Fix a bug when receiving an invitation Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	2482 g_free(barejid);
7ba1b6d7ddcd Fix a bug when receiving an invitation Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	2483
7ba1b6d7ddcd Fix a bug when receiving an invitation Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	2484 // Make sure the MUC room barejid is a room in the roster
7ba1b6d7ddcd Fix a bug when receiving an invitation Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	2485 barejid = jidtodisp(to);
1237 dcb99f0b5aaa Small MUC invitation improvement Mikael Berthe <mikael@lilotux.net> parents: 1236 diff changeset	2486 room_elt = roster_find(barejid, jidsearch, 0);
dcb99f0b5aaa Small MUC invitation improvement Mikael Berthe <mikael@lilotux.net> parents: 1236 diff changeset	2487 if (room_elt)
dcb99f0b5aaa Small MUC invitation improvement Mikael Berthe <mikael@lilotux.net> parents: 1236 diff changeset	2488 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);
dcb99f0b5aaa Small MUC invitation improvement Mikael Berthe <mikael@lilotux.net> parents: 1236 diff changeset	2489
1236 f7b35b1c343d Fix a roster bug when receiving a MUC invitation Mikael Berthe <mikael@lilotux.net> parents: 1215 diff changeset	2490 g_free(barejid);
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2491 }
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2492
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2493 // Specific MUC message handling (for example invitation processing)
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2494 static void got_muc_message(char *from, xmlnode x)
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2495 {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2496 xmlnode invite = xmlnode_get_tag(x, "invite");
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2497 if (invite)
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2498 {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2499 char* invite_from;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2500 char *reason = NULL;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2501 char *password = NULL;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2502 xmlnode r;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2503
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2504 invite_from = xmlnode_get_attrib(invite, "from");
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2505 r = xmlnode_get_tag(invite, "reason");
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2506 if (r)
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2507 reason = xmlnode_get_tag_data(r, NULL);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2508 r = xmlnode_get_tag(invite, "password");
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2509 if (r)
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2510 password = xmlnode_get_tag_data(r, NULL);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2511 if (invite_from)
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2512 got_invite(invite_from, from, reason, password);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2513 }
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2514 // TODO
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2515 // handle status code = 100 ( not anonymous )
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2516 // handle status code = 170 ( changement de config )
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2517 // 10.2.1 Notification of Configuration Changes
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2518 // declined invitation
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2519 }
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2520
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2521 static void handle_packet_message(jconn conn, char type, char from,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2522 xmlnode xmldata)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2523 {
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2524 char p, r, *s;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2525 xmlnode x;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2526 char *body = NULL;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2527 char *enc = NULL;
1399 187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	2528 char *subject = NULL;
1001 dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	2529 time_t timestamp = 0L;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2530
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2531 body = xmlnode_get_tag_data(xmldata, "body");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2532
1399 187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	2533 x = xml_get_xmlns(xmldata, NS_ENCRYPTED);
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	2534 if (x && (p = xmlnode_get_data(x)) != NULL)
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	2535 enc = p;
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	2536
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2537 p = xmlnode_get_tag_data(xmldata, "subject");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2538 if (p != NULL) {
1399 187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	2539 if (!type \|\| strcmp(type, TMSG_GROUPCHAT)) { // Chat message
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	2540 subject = p;
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	2541 } else { // Room topic
549 448e299e45da MUC: "/room topic" shows the current room topic Mikael Berthe <mikael@lilotux.net> parents: 547 diff changeset	2542 GSList *roombuddy;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2543 gchar *mbuf;
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2544 gchar *subj = p;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2545 // Get the room (s) and the nickname (r)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2546 s = g_strdup(from);
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 960 diff changeset	2547 r = strchr(s, JID_RESOURCE_SEPARATOR);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2548 if (r) *r++ = 0;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2549 else r = s;
549 448e299e45da MUC: "/room topic" shows the current room topic Mikael Berthe <mikael@lilotux.net> parents: 547 diff changeset	2550 // Set the new topic
448e299e45da MUC: "/room topic" shows the current room topic Mikael Berthe <mikael@lilotux.net> parents: 547 diff changeset	2551 roombuddy = roster_find(s, jidsearch, 0);
448e299e45da MUC: "/room topic" shows the current room topic Mikael Berthe <mikael@lilotux.net> parents: 547 diff changeset	2552 if (roombuddy)
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2553 buddy_settopic(roombuddy->data, subj);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2554 // Display inside the room window
560 64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	2555 if (r == s) {
64cb4de94972 Better topic attribution Mikael Berthe <mikael@lilotux.net> parents: 549 diff changeset	2556 // 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	2557 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	2558 } else {
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2559 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	2560 }
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2561 scr_WriteIncomingMessage(s, mbuf, 0,
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	2562 HBB_PREFIX_INFO\|HBB_PREFIX_NOFLAG, 0);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2563 if (settings_opt_get_int("log_muc_conf"))
1342 06441b6cc23a History logfile: Use a special code (MI) for local MUC info messages Mikael Berthe <mikael@lilotux.net> parents: 1333 diff changeset	2564 hlog_write_message(s, 0, -1, mbuf);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2565 g_free(s);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2566 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	2567 // 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	2568 scr_UpdateChatStatus(TRUE);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2569 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2570 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2571
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2572 // Timestamp?
625 028c01940490 Show presence timestamps in "/info" and "/room whois" Mikael Berthe <mikael@lilotux.net> parents: 624 diff changeset	2573 timestamp = xml_get_timestamp(xmldata);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2574
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2575 if (type && !strcmp(type, TMSG_ERROR)) {
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2576 x = xmlnode_get_tag(xmldata, TMSG_ERROR);
4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2577 display_server_error(x);
999 9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	2578 #if defined JEP0022 \|\| defined JEP0085
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	2579 // If the JEP85/22 support is probed, set it back to unknown so that
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	2580 // we probe it again.
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	2581 chatstates_reset_probed(from);
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	2582 #endif
1132 1650056b96fc Do not use chat states of error messages :) Mikael Berthe <mikael@lilotux.net> parents: 1128 diff changeset	2583 } else {
1650056b96fc Do not use chat states of error messages :) Mikael Berthe <mikael@lilotux.net> parents: 1128 diff changeset	2584 handle_state_events(from, xmldata);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2585 }
1399 187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	2586 if (from && (body \|\| subject))
187985455020 Correctly display PGP-encoded messages with a subject Mikael Berthe <mikael@lilotux.net> parents: 1397 diff changeset	2587 gotmessage(type, from, body, enc, subject, timestamp,
1043 ebbde723614b Store contacts PGP keys Mikael Berthe <mikael@lilotux.net> parents: 1042 diff changeset	2588 xml_get_xmlns(xmldata, NS_SIGNED));
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2589
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2590 if (from) {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2591 x = xml_get_xmlns(xmldata, "http://jabber.org/protocol/muc#user");
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2592 if (x && !strcmp(xmlnode_get_name(x), "x"))
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2593 got_muc_message(from, x);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2594 }
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2595 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2596
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2597 static void handle_state_events(char *from, xmlnode xmldata)
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	2598 {
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2599 #if defined JEP0022 \|\| defined JEP0085
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	2600 xmlnode state_ns = NULL;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2601 const char *body;
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	2602 char rname, bjid;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2603 GSList *sl_buddy;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2604 guint events;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	2605 struct jep0022 *jep22 = NULL;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	2606 struct jep0085 *jep85 = NULL;
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2607 enum {
d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2608 JEP_none,
d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2609 JEP_85,
d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2610 JEP_22
d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2611 } which_jep = JEP_none;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2612
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2613 rname = strchr(from, JID_RESOURCE_SEPARATOR);
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	2614 bjid = jidtodisp(from);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	2615 sl_buddy = roster_find(bjid, jidsearch, ROSTER_TYPE_USER);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	2616 g_free(bjid);
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2617
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2618 /* XXX Actually that's wrong, since it filters out server "offline"
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2619 messages (for JEP-0022). This JEP is (almost) deprecated so
d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2620 we don't really care. */
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2621 if (!sl_buddy \|\| !rname++) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2622 return;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2623 }
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	2624
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2625 /* Let's see chich JEP the contact uses. If possible, we'll use
d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2626 JEP-85, if not we'll look for JEP-22 support. */
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2627 events = buddy_resource_getevents(sl_buddy->data, rname);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2628
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2629 jep85 = buddy_resource_jep85(sl_buddy->data, rname);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2630 if (jep85) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2631 state_ns = xml_get_xmlns(xmldata, NS_CHATSTATES);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2632 if (state_ns)
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2633 which_jep = JEP_85;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2634 }
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	2635
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2636 if (which_jep != JEP_85) { /* Fall back to JEP-0022 */
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2637 jep22 = buddy_resource_jep22(sl_buddy->data, rname);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2638 if (jep22) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2639 state_ns = xml_get_xmlns(xmldata, NS_EVENT);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2640 if (state_ns)
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2641 which_jep = JEP_22;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2642 }
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2643 }
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2644
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2645 if (!which_jep) { /* Sender does not use chat states */
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2646 return;
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	2647 }
ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	2648
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2649 body = xmlnode_get_tag_data(xmldata, "body");
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2650
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	2651 if (which_jep == JEP_85) { /* JEP-0085 */
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2652 const char *p;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2653 jep85->support = CHATSTATES_SUPPORT_OK;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2654
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2655 p = xmlnode_get_name(state_ns);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2656 if (!strcmp(p, "composing")) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2657 jep85->last_state_rcvd = ROSTER_EVENT_COMPOSING;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2658 } else if (!strcmp(p, "active")) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2659 jep85->last_state_rcvd = ROSTER_EVENT_ACTIVE;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2660 } else if (!strcmp(p, "paused")) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2661 jep85->last_state_rcvd = ROSTER_EVENT_PAUSED;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2662 } else if (!strcmp(p, "inactive")) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2663 jep85->last_state_rcvd = ROSTER_EVENT_INACTIVE;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2664 } else if (!strcmp(p, "gone")) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2665 jep85->last_state_rcvd = ROSTER_EVENT_GONE;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2666 }
992 b37348c2aa79 Chatstates: display "paused" states in the roster Mikael Berthe <mikael@lilotux.net> parents: 991 diff changeset	2667 events = jep85->last_state_rcvd;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2668 } else { /* JEP-0022 */
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	2669 #ifdef JEP0022
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2670 const char *msgid;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2671 jep22->support = CHATSTATES_SUPPORT_OK;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2672 jep22->last_state_rcvd = ROSTER_EVENT_NONE;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2673
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2674 msgid = xmlnode_get_attrib(xmldata, "id");
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2675
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2676 if (xmlnode_get_tag(state_ns, "composing")) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2677 // Clear composing if the message contains a body
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2678 if (body)
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	2679 events &= ~ROSTER_EVENT_COMPOSING;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2680 else
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2681 events \|= ROSTER_EVENT_COMPOSING;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2682 jep22->last_state_rcvd \|= ROSTER_EVENT_COMPOSING;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2683
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2684 } else {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2685 events &= ~ROSTER_EVENT_COMPOSING;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2686 }
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2687
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2688 // Cache the message id
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2689 g_free(jep22->last_msgid_rcvd);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2690 if (msgid)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2691 jep22->last_msgid_rcvd = g_strdup(msgid);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2692 else
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2693 jep22->last_msgid_rcvd = NULL;
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	2694
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	2695 if (xmlnode_get_tag(state_ns, "delivered")) {
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	2696 jep22->last_state_rcvd \|= ROSTER_EVENT_DELIVERED;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	2697
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	2698 // Do we have to send back an ACK?
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	2699 if (body)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	2700 jb_send_jep22_event(from, ROSTER_EVENT_DELIVERED);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	2701 }
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	2702 #endif
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	2703 }
ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	2704
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2705 buddy_resource_setevents(sl_buddy->data, rname, events);
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	2706
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2707 update_roster = TRUE;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2708 #endif
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	2709 }
ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	2710
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2711 static int evscallback_subscription(eviqs *evp, guint evcontext)
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2712 {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2713 char *barejid;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2714 char *buf;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2715
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2716 if (evcontext == EVS_CONTEXT_TIMEOUT) {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2717 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	2718 evp->id);
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2719 return 0;
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2720 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2721 if (evcontext == EVS_CONTEXT_CANCEL) {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2722 scr_LogPrint(LPRINT_LOGNORM, "Event %s cancelled.", evp->id);
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2723 return 0;
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2724 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2725 if (!(evcontext & EVS_CONTEXT_USER))
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2726 return 0;
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2727
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2728 // Sanity check
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2729 if (!evp->data) {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2730 // 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	2731 scr_LogPrint(LPRINT_LOGNORM, "Error in evs callback.");
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2732 return 0;
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2733 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2734
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2735 // Ok, let's work now.
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2736 // evcontext: 0, 1 == reject, accept
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2737
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2738 barejid = evp->data;
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2739
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2740 if (evcontext & ~EVS_CONTEXT_USER) {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2741 // Accept subscription request
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2742 jb_subscr_send_auth(barejid);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2743 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	2744 barejid);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2745 } else {
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2746 // Reject subscription request
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2747 jb_subscr_cancel_auth(barejid);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2748 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	2749 if (settings_opt_get_int("delete_on_reject")) {
19c615fd071e New option "delete_on_reject" Mikael Berthe <mikael@lilotux.net> parents: 819 diff changeset	2750 // 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	2751 if (roster_getsubscription(barejid) == sub_none)
19c615fd071e New option "delete_on_reject" Mikael Berthe <mikael@lilotux.net> parents: 819 diff changeset	2752 jb_delbuddy(barejid);
19c615fd071e New option "delete_on_reject" Mikael Berthe <mikael@lilotux.net> parents: 819 diff changeset	2753 }
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2754 }
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	2755 scr_WriteIncomingMessage(barejid, buf, 0, HBB_PREFIX_INFO, 0);
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2756 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2757 g_free(buf);
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2758 return 0;
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2759 }
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2760
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2761 static void decline_invitation(event_muc_invitation invitation, char reason)
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2762 {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2763 // cut and paste from jb_room_invite
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2764 xmlnode x,y,z;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2765
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2766 if (!invitation) return;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2767 if (!invitation->to \|\| !invitation->from) return;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2768
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2769 x = jutil_msgnew(NULL, (char*)invitation->to, NULL, NULL);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2770
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2771 y = xmlnode_insert_tag(x, "x");
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2772 xmlnode_put_attrib(y, "xmlns", "http://jabber.org/protocol/muc#user");
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2773
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2774 z = xmlnode_insert_tag(y, "decline");
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2775 xmlnode_put_attrib(z, "to", invitation->from);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2776
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2777 if (reason) {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2778 y = xmlnode_insert_tag(z, "reason");
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2779 xmlnode_insert_cdata(y, reason, (unsigned) -1);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2780 }
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2781
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2782 jab_send(jc, x);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2783 xmlnode_free(x);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2784 jb_reset_keepalive();
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2785 }
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2786
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2787 static int evscallback_invitation(eviqs *evp, guint evcontext)
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2788 {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2789 event_muc_invitation *invitation = evp->data;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2790
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2791 // Sanity check
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2792 if (!invitation) {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2793 // Shouldn't happen.
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2794 scr_LogPrint(LPRINT_LOGNORM, "Error in evs callback.");
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2795 return 0;
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2796 }
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2797
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2798 if (evcontext == EVS_CONTEXT_TIMEOUT) {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2799 scr_LogPrint(LPRINT_LOGNORM, "Event %s timed out, cancelled.", evp->id);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2800 goto evscallback_invitation_free;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2801 }
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2802 if (evcontext == EVS_CONTEXT_CANCEL) {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2803 scr_LogPrint(LPRINT_LOGNORM, "Event %s cancelled.", evp->id);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2804 goto evscallback_invitation_free;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2805 }
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2806 if (!(evcontext & EVS_CONTEXT_USER))
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2807 goto evscallback_invitation_free;
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2808 // Ok, let's work now.
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2809 // evcontext: 0, 1 == reject, accept
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2810
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2811 if (evcontext & ~EVS_CONTEXT_USER) {
1395 d431cd75eb53 Use bookmarked nickname when manually joining a room Mikael Berthe <mikael@lilotux.net> parents: 1385 diff changeset	2812 char *nickname = default_muc_nickname(invitation->to);
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2813 jb_room_join(invitation->to, nickname, invitation->passwd);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2814 g_free(nickname);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2815 } else {
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2816 scr_LogPrint(LPRINT_LOGNORM, "Invitation to %s refused.", invitation->to);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2817 decline_invitation(invitation, NULL);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2818 }
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2819
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2820 evscallback_invitation_free:
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2821 g_free(invitation->to);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2822 g_free(invitation->from);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2823 g_free(invitation->passwd);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2824 g_free(invitation->reason);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2825 g_free(invitation);
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2826 evp->data = NULL;
1213 4a7db2870685 Improve Private Storage detection. Mikael Berthe <mikael@lilotux.net> parents: 1212 diff changeset	2827 return 0;
1128 ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2828 }
ac9c89f6cb51 Support for invitations to muc rooms misc@mandriva.org parents: 1104 diff changeset	2829
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2830 static void handle_packet_s10n(jconn conn, char type, char from,
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2831 xmlnode xmldata)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2832 {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2833 char *r;
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2834 char *buf;
818 55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	2835 int newbuddy;
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2836
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2837 r = jidtodisp(from);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2838
818 55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	2839 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	2840
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2841 if (!strcmp(type, "subscribe")) {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2842 /* The sender wishes to subscribe to our presence */
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2843 char *msg;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2844 int isagent;
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2845 eviqs *evn;
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2846
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2847 isagent = (roster_gettype(r) & ROSTER_TYPE_AGENT) != 0;
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	2848 msg = xmlnode_get_tag_data(xmldata, "status");
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2849
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	2850 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	2851 from);
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	2852 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	2853 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	2854 g_free(buf);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	2855
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2856 if (msg) {
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2857 buf = g_strdup_printf("<%s> said: %s", from, msg);
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	2858 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0);
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2859 replace_nl_with_dots(buf);
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2860 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2861 g_free(buf);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2862 }
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2863
749 6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2864 // Create a new event item
6c633adaae10 Use events system for subscription requests Mikael Berthe <mikael@lilotux.net> parents: 745 diff changeset	2865 evn = evs_new(EVS_TYPE_SUBSCRIPTION, EVS_MAX_TIMEOUT);
751 4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	2866 if (evn) {
752 d2d5ee71e68c Fix small typo Mikael Berthe <mikael@lilotux.net> parents: 751 diff changeset	2867 evn->callback = &evscallback_subscription;
751 4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	2868 evn->data = g_strdup(r);
754 5b962b978573 Add event description when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 752 diff changeset	2869 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	2870 "presence updates", r);
751 4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	2871 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	2872 } else {
4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	2873 buf = g_strdup_printf("Unable to create a new event!");
4a7271e69694 Avoid reusing events ids Mikael Berthe <mikael@lilotux.net> parents: 749 diff changeset	2874 }
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	2875 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	2876 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2877 g_free(buf);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2878 } else if (!strcmp(type, "unsubscribe")) {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2879 /* The sender is unsubscribing from our presence */
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	2880 jb_subscr_cancel_auth(from);
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2881 buf = g_strdup_printf("<%s> is unsubscribing from your "
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2882 "presence updates", from);
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	2883 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0);
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2884 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2885 g_free(buf);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	2886 } else if (!strcmp(type, "subscribed")) {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2887 /* The sender has allowed us to receive their presence */
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2888 buf = g_strdup_printf("<%s> has allowed you to receive their "
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2889 "presence updates", from);
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	2890 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0);
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2891 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2892 g_free(buf);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	2893 } else if (!strcmp(type, "unsubscribed")) {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2894 /* The subscription request has been denied or a previously-granted
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2895 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	2896 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	2897 update_roster = TRUE;
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2898 buf = g_strdup_printf("<%s> has cancelled your subscription to "
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2899 "their presence updates", from);
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1282 diff changeset	2900 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0);
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2901 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2902 g_free(buf);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 600 diff changeset	2903 } else {
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2904 scr_LogPrint(LPRINT_LOGNORM, "Received unrecognized packet from <%s>, "
ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2905 "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	2906 newbuddy = FALSE;
55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	2907 }
55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	2908
1010 54405d09b15a Add a call to buddylist_build() Mikael Berthe <mikael@lilotux.net> parents: 1008 diff changeset	2909 if (newbuddy)
818 55cd45481a07 Fix a buddylist bug when receiving a subscription request Mikael Berthe <mikael@lilotux.net> parents: 793 diff changeset	2910 update_roster = TRUE;
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	2911 g_free(r);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2912 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2913
533 c478e8f7f074 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 532 diff changeset	2914 static void packethandler(jconn conn, jpacket packet)
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2915 {
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	2916 char *p;
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2917 char from=NULL, type=NULL;
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2918
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	2919 jb_reset_keepalive(); // reset keepalive timeout
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2920 jpacket_reset(packet);
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2921
671 c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	2922 if (!packet->type) {
c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	2923 scr_LogPrint(LPRINT_LOG, "Packet type = 0");
c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	2924 return;
c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	2925 }
c5da36fd437a Do not process packet if type = 0 Mikael Berthe <mikael@lilotux.net> parents: 668 diff changeset	2926
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2927 p = xmlnode_get_attrib(packet->x, "type");
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2928 if (p) type = p;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2929
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	2930 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	2931 if (p) from = p;
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	2932
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	2933 if (!from && packet->type != JPACKET_IQ) {
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2934 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	2935 return;
a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	2936 }
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2937
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2938 switch (packet->type) {
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2939 case JPACKET_MESSAGE:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2940 handle_packet_message(conn, type, from, packet->x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2941 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2942
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2943 case JPACKET_IQ:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2944 handle_packet_iq(conn, type, from, packet->x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2945 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2946
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2947 case JPACKET_PRESENCE:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2948 handle_packet_presence(conn, type, from, packet->x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2949 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2950
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2951 case JPACKET_S10N:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2952 handle_packet_s10n(conn, type, from, packet->x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2953 break;
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2954
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2955 default:
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	2956 scr_LogPrint(LPRINT_LOG, "Unhandled packet type (%d)", packet->type);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2957 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2958 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	2959
580 fed6d1e4d7a9 Fix modelines Mikael Berthe <mikael@lilotux.net> parents: 579 diff changeset	2960 /* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */

Mercurial > ~mikael > mcabber > hg

annotate mcabber/src/jabglue.c @ 1415:317f8d181626