mcabber: mcabber/src/jabglue.c annotate

annotate mcabber/src/jabglue.c @ 1378:61fc9eddf763

Small code cleanup

author	Mikael Berthe <mikael@lilotux.net>
date	Wed, 28 Nov 2007 22:42:48 +0100
parents	cd9182f0b5c7
children	74b7621537d7

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 *
1205 2de8f8ba1f34 Update copyrights Mikael Berthe <mikael@lilotux.net> parents: 1197 diff changeset	4 * Copyright (C) 2005-2007 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 {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	99 char *fjid = g_new(char, 3 +
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	100 strlen(username) + strlen(servername) + strlen(resource));
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	101 strcpy(fjid, username);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	102 if (!strchr(fjid, JID_DOMAIN_SEPARATOR)) {
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	103 strcat(fjid, JID_DOMAIN_SEPARATORSTR);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	104 strcat(fjid, servername);
403 17aa60c6dc63 Allow a different server name than the jid domain name Mikael Berthe <mikael@lilotux.net> parents: 393 diff changeset	105 }
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	106 strcat(fjid, JID_RESOURCE_SEPARATORSTR);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	107 strcat(fjid, resource);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	108 return fjid;
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	109 }
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	110
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	111 inline unsigned char jb_getonline(void)
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	112 {
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	113 return online;
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	114 }
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	115
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	116 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	117 int ssl, const char *pass)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	118 {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	119 if (!port) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	120 if (ssl)
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	121 port = JABBERSSLPORT;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	122 else
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	123 port = JABBERPORT;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	124 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	125
357 e8adc3c96e68 Better messages for server connection states Mikael Berthe <mikael@lilotux.net> parents: 353 diff changeset	126 jb_disconnect();
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	127
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	128 if (!fjid) return jc;
469 a926523d2392 Use UTF8 to handle resources and room nicknames Mikael Berthe <mikael@lilotux.net> parents: 468 diff changeset	129
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	130 jc = jab_new((char)fjid, (char)pass, (char*)server, port, ssl);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	131
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	132 /* 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	133 jab_logger(jc, logger);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	134 jab_packet_handler(jc, &packethandler);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	135 jab_state_handler(jc, &statehandler);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	136
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	137 if (jc && jc->user) {
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	138 online = TRUE;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	139 jstate = STATE_CONNECTING;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	140 statehandler(0, -1);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	141 jab_start(jc);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	142 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	143
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	144 return jc;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	145 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	146
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	147 void jb_disconnect(void)
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	148 {
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	149 if (!jc) return;
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	150
668 d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	151 if (online) {
1354 c373ff3fe7e1 Add pre-disconnect internal hook Mikael Berthe <mikael@lilotux.net> parents: 1347 diff changeset	152 // Launch pre-disconnect internal hook
c373ff3fe7e1 Add pre-disconnect internal hook Mikael Berthe <mikael@lilotux.net> parents: 1347 diff changeset	153 hook_execute_internal("hook-pre-disconnect");
668 d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	154 // Announce it to everyone else
1050 ea71d31a2607 PGP: Do not sign presence messages to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 1046 diff changeset	155 jb_setstatus(offline, NULL, "", FALSE);
668 d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	156 // End the XML flow
d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	157 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	158 /*
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	159 // Free status message
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	160 g_free(mystatusmsg);
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	161 mystatusmsg = NULL;
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	162 */
668 d0928694c81b Small jb_disconnect() improvement Mikael Berthe <mikael@lilotux.net> parents: 655 diff changeset	163 }
634 f3c05d5fe459 Send "</stream:stream>" when disconnecting from the server Mikael Berthe <mikael@lilotux.net> parents: 633 diff changeset	164
f3c05d5fe459 Send "</stream:stream>" when disconnecting from the server Mikael Berthe <mikael@lilotux.net> parents: 633 diff changeset	165 // Announce it to the user
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	166 statehandler(jc, JCONN_STATE_OFF);
416 48e7808c4191 Allow offline status message Mikael Berthe <mikael@lilotux.net> parents: 411 diff changeset	167
298 35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	168 jab_delete(jc);
35cda94e570d Add /connect and /disconnect commands Mikael Berthe <mikael@lilotux.net> parents: 294 diff changeset	169 jc = NULL;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	170 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	171
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	172 inline void jb_reset_keepalive()
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	173 {
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	174 time(&LastPingTime);
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	175 }
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	176
436 802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	177 void jb_send_raw(const char *str)
802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	178 {
461 1d8f5b3a5f2b Convert /rawxml argument to UTF8 Mikael Berthe <mikael@lilotux.net> parents: 449 diff changeset	179 if (jc && online && str)
436 802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	180 jab_send_raw(jc, str);
802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	181 }
802da817a684 Add /rawxml command Mikael Berthe <mikael@lilotux.net> parents: 430 diff changeset	182
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	183 void jb_keepalive()
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	184 {
113 8ac67e951eab [/trunk] Changeset 127 by mikael mikael parents: 112 diff changeset	185 if (jc && online)
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	186 jab_send_raw(jc, " \t ");
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	187 jb_reset_keepalive();
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	188 }
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	189
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	190 void jb_set_keepalive_delay(unsigned int delay)
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	191 {
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	192 KeepaliveDelay = delay;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	193 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	194
1001 dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	195 // check_connection()
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	196 // 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	197 // and if so try to reconnect.
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	198 static void check_connection(void)
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	199 {
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	200 static time_t disconnection_timestamp = 0L;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	201 time_t now;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	202
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	203 // 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	204 if (!AutoConnection)
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	205 return;
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	206
1001 dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	207 // Are we totally disconnected?
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	208 if (jc && jc->state != JCONN_STATE_OFF) {
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	209 disconnection_timestamp = 0L;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	210 return;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	211 }
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 time(&now);
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	214 if (!disconnection_timestamp) {
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	215 disconnection_timestamp = now;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	216 return;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	217 }
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 // 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	220 if (now > disconnection_timestamp + RECONNECTION_TIMEOUT) {
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	221 mcabber_connect();
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	222 disconnection_timestamp = 0L;
dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	223 }
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
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	226 void jb_main()
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	227 {
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	228 time_t now;
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	229 fd_set fds;
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	230 long tmout;
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	231 struct timeval tv;
1001 dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	232 static time_t last_eviqs_check = 0L;
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	233
406 a9dd91e08eb3 Add usleep() calls Mikael Berthe <mikael@lilotux.net> parents: 403 diff changeset	234 if (!online) {
419 2f9852610cf4 Small code review Mikael Berthe <mikael@lilotux.net> parents: 416 diff changeset	235 safe_usleep(10000);
1001 dff25377c11f Auto-reconnect after a network/server failure Mikael Berthe <mikael@lilotux.net> parents: 999 diff changeset	236 check_connection();
406 a9dd91e08eb3 Add usleep() calls Mikael Berthe <mikael@lilotux.net> parents: 403 diff changeset	237 return;
a9dd91e08eb3 Add usleep() calls Mikael Berthe <mikael@lilotux.net> parents: 403 diff changeset	238 }
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	239
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	240 if (jc && jc->state == JCONN_STATE_CONNECTING) {
419 2f9852610cf4 Small code review Mikael Berthe <mikael@lilotux.net> parents: 416 diff changeset	241 safe_usleep(75000);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	242 jab_start(jc);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	243 return;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	244 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	245
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	246 FD_ZERO(&fds);
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	247 FD_SET(0, &fds);
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	248 FD_SET(jc->fd, &fds);
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	249
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	250 tv.tv_sec = 60;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	251 tv.tv_usec = 0;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	252
940 fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	253 time(&now);
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	254
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	255 if (KeepaliveDelay) {
940 fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	256 if (now >= LastPingTime + (time_t)KeepaliveDelay) {
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	257 tv.tv_sec = 0;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	258 } else {
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	259 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	260 }
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);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	265 if (tv.tv_sec > tmout) {
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	266 tv.tv_sec = tmout;
940 fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	267 }
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	268
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	269 #if defined JEP0022 \|\| defined JEP0085
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	270 // Check composing timeout
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	271 tmout = scr_GetChatStatesTimeout(now);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	272 if (tv.tv_sec > tmout) {
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	273 tv.tv_sec = tmout;
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	274 }
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	275 #endif
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	276
940 fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	277 if (!tv.tv_sec)
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	278 tv.tv_usec = 350000;
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	279
fc30221b952d Fix an autoaway problem Mikael Berthe <mikael@lilotux.net> parents: 939 diff changeset	280 scr_DoUpdate();
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	281 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	282 if (FD_ISSET(jc->fd, &fds))
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	283 jab_poll(jc, 0);
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 924 diff changeset	284 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	285
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	286 if (jstate == STATE_CONNECTING) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	287 if (jc) {
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	288 eviqs *iqn;
686 98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	289 xmlnode z;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	290
686 98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	291 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	292 iqn->callback = &iqscallback_auth;
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	293
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	294 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	295 "username");
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	296 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	297 jab_send(jc, iqn->xmldata);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	298
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	299 jstate = STATE_GETAUTH;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	300 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	301
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	302 if (!jc \|\| jc->state == JCONN_STATE_OFF) {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	303 scr_LogPrint(LPRINT_LOGNORM, "Unable to connect to the server");
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	304 online = FALSE;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	305 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	306 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	307
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	308 if (!jc) {
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 } else if (jc->state == JCONN_STATE_OFF \|\| jc->fd == -1) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	311 statehandler(jc, JCONN_STATE_OFF);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	312 }
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	313
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	314 time(&now);
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	315
756 12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	316 // Check for EV & IQ requests timeouts
12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	317 if (now > last_eviqs_check + 20) {
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	318 iqs_check_timeout(now);
756 12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	319 evs_check_timeout(now);
12dc6bdff8c1 Check for events timeout Mikael Berthe <mikael@lilotux.net> parents: 754 diff changeset	320 last_eviqs_check = now;
706 934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	321 }
934fddc99592 Check for IQ requests timeouts Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	322
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	323 // Keepalive
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	324 if (KeepaliveDelay) {
735 2f027806cd48 Some code cleanup Mikael Berthe <mikael@lilotux.net> parents: 732 diff changeset	325 if (now > LastPingTime + (time_t)KeepaliveDelay)
112 edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	326 jb_keepalive();
edb5591e2e64 [/trunk] Changeset 126 by mikael mikael parents: 91 diff changeset	327 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	328 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	329
116 1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	330 inline enum imstatus jb_getstatus()
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	331 {
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	332 return mystatus;
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	333 }
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	334
519 5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	335 inline const char *jb_getstatusmsg()
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 return mystatusmsg;
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	338 }
5c338d31de56 Show current global status message in "/status" Mikael Berthe <mikael@lilotux.net> parents: 513 diff changeset	339
1254 401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	340 inline void update_last_use(void)
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 iqlast = time(NULL);
401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	343 }
401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	344
1215 80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	345 // insert_entity_capabilities(presence_stanza)
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	346 // Entity Capabilities (XEP-0115)
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	347 static void insert_entity_capabilities(xmlnode x)
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	348 {
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	349 xmlnode y;
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	350 const char *ver = entity_version();
1255 ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	351 char exts, exts2;
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	352
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	353 exts = NULL;
1215 80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	354
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	355 y = xmlnode_insert_tag(x, "c");
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	356 xmlnode_put_attrib(y, "xmlns", NS_CAPS);
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	357 xmlnode_put_attrib(y, "node", MCABBER_CAPS_NODE);
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	358 xmlnode_put_attrib(y, "ver", ver);
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	359 #ifdef JEP0085
1255 ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	360 if (!chatstates_disabled) {
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	361 exts2 = g_strjoin(" ", "csn", exts, NULL);
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	362 g_free(exts);
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	363 exts = exts2;
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	364 }
1215 80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	365 #endif
1255 ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	366 if (!settings_opt_get_int("iq_last_disable")) {
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	367 exts2 = g_strjoin(" ", "iql", exts, NULL);
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	368 g_free(exts);
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	369 exts = exts2;
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	370 }
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	371 if (exts) {
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	372 xmlnode_put_attrib(y, "ext", exts);
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	373 g_free(exts);
ceada40bbe20 Update Entity Capabilities (add iq:last) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	374 }
1215 80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	375 }
80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	376
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	377 static void roompresence(gpointer room, void *presencedata)
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	378 {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	379 const char *bjid;
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	380 const char *nickname;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	381 char *to;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	382 struct T_presence *pres = presencedata;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	383
652 b243d3b3ff1b We do not need buddy_isresource() anymore Mikael Berthe <mikael@lilotux.net> parents: 651 diff changeset	384 if (!buddy_getinsideroom(room))
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	385 return;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	386
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	387 bjid = buddy_getjid(room);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	388 if (!bjid) return;
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	389 nickname = buddy_getnickname(room);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	390 if (!nickname) return;
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	391
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	392 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	393 jb_setstatus(pres->st, to, pres->msg, TRUE);
532 2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	394 g_free(to);
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	395 }
2ac8d8e49e81 Send status changes to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 531 diff changeset	396
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	397 // presnew(status, recipient, message)
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	398 // Create an xmlnode with default presence attributes
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	399 // Note: the caller must free the node after use
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	400 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	401 const char *msg)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	402 {
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	403 unsigned int prio;
116 1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	404 xmlnode x;
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	405
1e7e59775f12 [/trunk] Changeset 130 by mikael mikael parents: 114 diff changeset	406 x = jutil_presnew(JPACKET__UNKNOWN, 0, 0);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	407
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	408 if (recipient) {
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	409 xmlnode_put_attrib(x, "to", recipient);
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	410 }
444 5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	411
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	412 switch(st) {
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	413 case away:
1378 61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	414 case notavail:
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	415 case dontdisturb:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	416 case freeforchat:
1378 61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	417 xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"),
61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	418 imstatus_showmap[st], (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	419 break;
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	420
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	421 case invisible:
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	422 xmlnode_put_attrib(x, "type", "invisible");
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	423 break;
51 85bbc6ed3796 [/trunk] Changeset 67 by mikael mikael parents: 46 diff changeset	424
118 1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	425 case offline:
1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	426 xmlnode_put_attrib(x, "type", "unavailable");
1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	427 break;
1e8f646e2c5b [/trunk] Changeset 131 by mikael mikael parents: 116 diff changeset	428
51 85bbc6ed3796 [/trunk] Changeset 67 by mikael mikael parents: 46 diff changeset	429 default:
85bbc6ed3796 [/trunk] Changeset 67 by mikael mikael parents: 46 diff changeset	430 break;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	431 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	432
531 aee9a279a0f3 Allow changing priority on the fly Mikael Berthe <mikael@lilotux.net> parents: 527 diff changeset	433 prio = settings_opt_get_int("priority");
272 7f2e61392b2e Add resource priority option mikael@matrix parents: 244 diff changeset	434 if (prio) {
7f2e61392b2e Add resource priority option mikael@matrix parents: 244 diff changeset	435 char strprio[8];
842 f74c5c6d2c24 Fix negative priority Mikael Berthe <mikael@lilotux.net> parents: 837 diff changeset	436 snprintf(strprio, 8, "%d", (int)prio);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	437 xmlnode_insert_cdata(xmlnode_insert_tag(x, "priority"),
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	438 strprio, (unsigned) -1);
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	439 }
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	440
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	441 if (msg)
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	442 xmlnode_insert_cdata(xmlnode_insert_tag(x, "status"), msg, (unsigned) -1);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	443
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	444 return x;
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	445 }
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	446
1050 ea71d31a2607 PGP: Do not sign presence messages to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 1046 diff changeset	447 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	448 int do_not_sign)
534 3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	449 {
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	450 xmlnode x;
3569d38f7bbb Add presnew() Mikael Berthe <mikael@lilotux.net> parents: 533 diff changeset	451
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	452 if (msg) {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	453 // 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	454 // "-" which is a special case (option meaning "no status message").
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	455 if (!strcmp(msg, "-"))
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	456 msg = "";
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	457 } else {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	458 // No status message specified; we'll use:
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	459 // a) the default status message (if provided by the user);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	460 // b) the current status message;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	461 // c) no status message (i.e. an empty one).
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	462 msg = settings_get_status_msg(st);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	463 if (!msg) {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	464 if (mystatusmsg)
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	465 msg = mystatusmsg;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	466 else
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	467 msg = "";
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	468 }
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	469 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	470
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	471 // 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	472 // (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	473 // 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	474 if (online) {
1042 8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	475 const char *s_msg = (st != invisible ? msg : NULL);
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	476 x = presnew(st, recipient, s_msg);
1215 80c095886fb5 Entity Capabilities support (XEP-0115) Mikael Berthe <mikael@lilotux.net> parents: 1213 diff changeset	477 insert_entity_capabilities(x); // Entity Capabilities (XEP-0115)
1042 8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	478 #ifdef HAVE_GPGME
1052 c8a8edd5c50d PGP: Sign empty <status/> presence elements Mikael Berthe <mikael@lilotux.net> parents: 1050 diff changeset	479 if (!do_not_sign && gpg_enabled()) {
c8a8edd5c50d PGP: Sign empty <status/> presence elements Mikael Berthe <mikael@lilotux.net> parents: 1050 diff changeset	480 char *signature;
c8a8edd5c50d PGP: Sign empty <status/> presence elements Mikael Berthe <mikael@lilotux.net> parents: 1050 diff changeset	481 signature = gpg_sign(s_msg ? s_msg : "");
1042 8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	482 if (signature) {
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	483 xmlnode y;
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	484 y = xmlnode_insert_tag(x, "x");
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	485 xmlnode_put_attrib(y, "xmlns", NS_SIGNED);
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	486 xmlnode_insert_cdata(y, signature, (unsigned) -1);
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	487 g_free(signature);
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	488 }
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	489 }
8a395c2cafc4 Initial PGP support (decrypt) Mikael Berthe <mikael@lilotux.net> parents: 1023 diff changeset	490 #endif
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	491 jab_send(jc, x);
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	492 xmlnode_free(x);
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	493 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	494
444 5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	495 // 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	496 if (recipient) return;
5927c3bfba13 Add /status_to command Mikael Berthe <mikael@lilotux.net> parents: 441 diff changeset	497
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	498 if (online) {
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	499 // Send presence to chatrooms
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	500 if (st != invisible) {
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	501 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	502 room_presence.st = st;
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	503 room_presence.msg = msg;
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	504 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	505 }
1365 c7e709719c43 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1363 diff changeset	506
c7e709719c43 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1363 diff changeset	507 // 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	508 // 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	509 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	510 update_roster = TRUE;
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	511
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	512 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	513 mystatus = st;
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	514 }
1365 c7e709719c43 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1363 diff changeset	515
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	516 if (st)
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	517 mywantedstatus = st;
1365 c7e709719c43 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1363 diff changeset	518
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	519 if (msg != mystatusmsg) {
774 46304b773a44 Remove useless checks before g_free() calls Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	520 g_free(mystatusmsg);
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	521 if (*msg)
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	522 mystatusmsg = g_strdup(msg);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	523 else
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	524 mystatusmsg = NULL;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 519 diff changeset	525 }
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 706 diff changeset	526
1254 401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	527 if (!Autoaway)
401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	528 update_last_use();
401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	529
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 706 diff changeset	530 // Update status line
724 264375fe7159 Fix a roster refresh issue Mikael Berthe <mikael@lilotux.net> parents: 721 diff changeset	531 scr_UpdateMainStatus(TRUE);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	532 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	533
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	534 // jb_setprevstatus()
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	535 // 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	536 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	537 {
1050 ea71d31a2607 PGP: Do not sign presence messages to chatrooms Mikael Berthe <mikael@lilotux.net> parents: 1046 diff changeset	538 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	539 }
99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1013 diff changeset	540
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	541 // new_msgid()
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	542 // 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	543 // 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	544 static char *new_msgid(void)
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	545 {
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	546 static guint msg_idn;
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	547 time_t now;
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	548 time(&now);
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	549 if (!msg_idn)
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	550 srand(now);
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	551 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	552 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	553 }
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	554
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	555 // jb_send_msg(jid, text, type, subject, msgid, *encrypted)
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	556 // 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	557 // message has been PGP-encrypted. If encryption enforcement is set and
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	558 // encryption fails, *encrypted is set to -1.
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	559 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	560 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	561 const char *type_overwrite)
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	562 {
475 fa49ac0bb8f3 Add "/room topic", and display topic changes Mikael Berthe <mikael@lilotux.net> parents: 474 diff changeset	563 xmlnode x;
1305 9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	564 const gchar *strtype;
1304 8ada97e5eb75 Fix a gcc warning Mikael Berthe <mikael@lilotux.net> parents: 1299 diff changeset	565 #ifdef HAVE_LIBOTR
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	566 int otr_msg = 0;
1304 8ada97e5eb75 Fix a gcc warning Mikael Berthe <mikael@lilotux.net> parents: 1299 diff changeset	567 #endif
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	568 #if defined HAVE_GPGME \|\| defined JEP0022 \|\| defined JEP0085
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	569 char rname, barejid;
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	570 GSList *sl_buddy;
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	571 #endif
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	572 #if defined JEP0022 \|\| defined JEP0085
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	573 xmlnode event;
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	574 guint use_jep85 = 0;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	575 struct jep0085 *jep85 = NULL;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	576 #endif
1071 866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	577 #if defined JEP0022
866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	578 gchar *nmsgid = NULL;
866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	579 #endif
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	580 gchar *enc = NULL;
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	581
1055 6eb1efea75d0 PGP: Visual encryption flag Mikael Berthe <mikael@lilotux.net> parents: 1053 diff changeset	582 if (encrypted)
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	583 *encrypted = 0;
1055 6eb1efea75d0 PGP: Visual encryption flag Mikael Berthe <mikael@lilotux.net> parents: 1053 diff changeset	584
472 75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	585 if (!online) return;
75442262c082 Disable some commands when not connected Mikael Berthe <mikael@lilotux.net> parents: 470 diff changeset	586
1305 9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	587 if (type_overwrite)
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	588 strtype = type_overwrite;
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	589 else {
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	590 if (type == ROSTER_TYPE_ROOM)
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	591 strtype = TMSG_GROUPCHAT;
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	592 else
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	593 strtype = TMSG_CHAT;
9bc68473f8a3 -n and -f flags to message-sending commands Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1304 diff changeset	594 }
447 03bb57383cea Initial Multi-User Chat support Mikael Berthe <mikael@lilotux.net> parents: 444 diff changeset	595
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	596 #if defined HAVE_GPGME \|\| defined HAVE_LIBOTR \|\| defined JEP0022 \|\| defined JEP0085
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	597 rname = strchr(fjid, JID_RESOURCE_SEPARATOR);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	598 barejid = jidtodisp(fjid);
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	599 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	600
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	601 // 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	602 // which hopefully will give us the most likely resource.
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	603 if (rname)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	604 rname++;
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	605
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	606 #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	607 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	608 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	609 msgid = NULL;
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	610 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	611 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	612 if (!text) {
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	613 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	614 if (encrypted)
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	615 *encrypted = -1;
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	616 return;
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	617 }
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	618 }
1347 07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	619 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	620 *encrypted = 1;
07816313073b Add an option 'otr' to enable OTR support in the configuration file Mikael Berthe <mikael@lilotux.net> parents: 1344 diff changeset	621 }
1299 3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	622 }
3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	623 #endif
3b338a5c01fc OTR support Frank Zschockelt <mcabber_otr[at]freakysoft.de> parents: 1290 diff changeset	624
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	625 #ifdef HAVE_GPGME
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	626 if (type == ROSTER_TYPE_USER && sl_buddy && gpg_enabled()) {
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	627 if (!settings_pgp_getdisabled(barejid)) { // not disabled for this contact?
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	628 guint force;
1065 230dca34dbea Extand pgp_data structure Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	629 struct pgp_data *res_pgpdata;
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	630 force = settings_pgp_getforce(barejid);
1065 230dca34dbea Extand pgp_data structure Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	631 res_pgpdata = buddy_resource_pgp(sl_buddy->data, rname);
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	632 if (force \|\| (res_pgpdata && res_pgpdata->sign_keyid)) {
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	633 /* Remote client has PGP support (we have a signature)
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	634 * 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	635 * 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	636 * 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	637 * 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	638 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	639 key = settings_pgp_getkeyid(barejid);
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	640 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	641 key = res_pgpdata->sign_keyid;
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	642 if (key)
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	643 enc = gpg_encrypt(text, key);
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	644 if (!enc && force) {
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	645 if (encrypted)
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	646 *encrypted = -1;
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	647 g_free(barejid);
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	648 return;
6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	649 }
1067 a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	650 }
1065 230dca34dbea Extand pgp_data structure Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	651 }
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	652 }
1067 a5dc85fdebde Add key comparison for signatures & use user-provided PGP keys for encryption Mikael Berthe <mikael@lilotux.net> parents: 1065 diff changeset	653 #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	654
1065 230dca34dbea Extand pgp_data structure Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	655 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	656 #endif // HAVE_GPGME \|\| defined JEP0022 \|\| defined JEP0085
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	657
1306 a7d21918234c Fix jb_send_msg() call in OTR Mikael Berthe <mikael@lilotux.net> parents: 1305 diff changeset	658 x = jutil_msgnew((char)strtype, (char)fjid, NULL,
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	659 (enc ? "This message is PGP-encrypted." : (char*)text));
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	660 if (subject) {
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	661 xmlnode y;
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	662 y = xmlnode_insert_tag(x, "subject");
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	663 xmlnode_insert_cdata(y, subject, (unsigned) -1);
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	664 }
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	665 if (enc) {
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	666 xmlnode y;
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	667 y = xmlnode_insert_tag(x, "x");
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	668 xmlnode_put_attrib(y, "xmlns", NS_ENCRYPTED);
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	669 xmlnode_insert_cdata(y, enc, (unsigned) -1);
1055 6eb1efea75d0 PGP: Visual encryption flag Mikael Berthe <mikael@lilotux.net> parents: 1053 diff changeset	670 if (encrypted)
1197 6f602d3270a4 Add /pgp [-]force Mikael Berthe <mikael@lilotux.net> parents: 1194 diff changeset	671 *encrypted = 1;
1044 52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	672 g_free(enc);
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	673 }
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	674
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	675 #if defined JEP0022 \|\| defined JEP0085
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	676 // 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	677 if (chatstates_disabled \|\| type == ROSTER_TYPE_ROOM)
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	678 goto jb_send_msg_no_chatstates;
52cfe9bf9840 Encryption support for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 1043 diff changeset	679
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	680 if (sl_buddy)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	681 jep85 = buddy_resource_jep85(sl_buddy->data, rname);
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	682 #endif
ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	683
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	684 #ifdef JEP0085
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	685 /* JEP-0085 5.1
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	686 * "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	687 * 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	688 * state notifications to the Contact."
1378 61fc9eddf763 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1377 diff changeset	689 * 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	690 * and can become "ok".
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	691 */
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	692 if (jep85 && (jep85->support == CHATSTATES_SUPPORT_OK \|\|
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	693 jep85->support == CHATSTATES_SUPPORT_UNKNOWN)) {
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	694 event = xmlnode_insert_tag(x, "active");
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	695 xmlnode_put_attrib(event, "xmlns", NS_CHATSTATES);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	696 if (jep85->support == CHATSTATES_SUPPORT_UNKNOWN)
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	697 jep85->support = CHATSTATES_SUPPORT_PROBED;
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	698 else
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	699 use_jep85 = 1;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	700 jep85->last_state_sent = ROSTER_EVENT_ACTIVE;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	701 }
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	702 #endif
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	703 #ifdef JEP0022
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	704 /* JEP-22
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	705 * 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	706 * If not, we try to fall back to JEP-0022.
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	707 */
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	708 if (!use_jep85) {
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	709 struct jep0022 *jep22 = NULL;
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	710 event = xmlnode_insert_tag(x, "x");
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	711 xmlnode_put_attrib(event, "xmlns", NS_EVENT);
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	712 xmlnode_insert_tag(event, "composing");
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	713
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	714 if (sl_buddy)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	715 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	716 if (jep22)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	717 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	718
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	719 // An id is mandatory when using JEP-0022.
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	720 if (!msgid && (text \|\| subject)) {
1071 866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	721 msgid = nmsgid = new_msgid();
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	722 // Let's update last_msgid_sent
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	723 // (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	724 // because this is probably a special message...)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	725 if (jep22) {
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	726 g_free(jep22->last_msgid_sent);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	727 jep22->last_msgid_sent = g_strdup(msgid);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	728 }
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	729 }
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	730 }
f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	731 #endif
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	732
993 0759f4c7da68 Add option 'disable_chatstates' Mikael Berthe <mikael@lilotux.net> parents: 992 diff changeset	733 jb_send_msg_no_chatstates:
988 6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	734 xmlnode_put_attrib(x, "id", msgid);
6e2bfd1ffded Add ids to message stanzas if needed Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	735
1254 401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	736 if (mystatus != invisible)
401639413340 More jabber:iq:last support... (misc) Mikael Berthe <mikael@lilotux.net> parents: 1244 diff changeset	737 update_last_use();
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	738 jab_send(jc, x);
a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	739 xmlnode_free(x);
1071 866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	740 #if defined JEP0022
866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	741 g_free(nmsgid);
866be086cc9b Fix a memory leak in JEP22 handling Mikael Berthe <mikael@lilotux.net> parents: 1067 diff changeset	742 #endif
590 a5707d61e469 Fix a few UTF-8 related issues Mikael Berthe <mikael@lilotux.net> parents: 589 diff changeset	743
114 065d8368c36b [/trunk] Changeset 128 by mikael mikael parents: 113 diff changeset	744 jb_reset_keepalive();
35 a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	745 }
a8ceaa3005fd [/trunk] Changeset 51 by mikael mikael parents: 33 diff changeset	746
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	747
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	748 #ifdef JEP0085
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	749 // jb_send_jep85_chatstate()
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	750 // 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	751 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	752 guint state)
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	753 {
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	754 xmlnode x;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	755 xmlnode event;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	756 GSList *sl_buddy;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	757 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	758 char rjid, fjid = NULL;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	759 struct jep0085 *jep85 = NULL;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	760
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	761 if (!online) return;
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 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	764
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	765 // 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	766 // 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	767 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	768 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	769
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	770 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	771 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	772
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	773 if (state == jep85->last_state_sent)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	774 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	775
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	776 if (state == ROSTER_EVENT_ACTIVE)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	777 chattag = "active";
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	778 else if (state == ROSTER_EVENT_COMPOSING)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	779 chattag = "composing";
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	780 else if (state == ROSTER_EVENT_PAUSED)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	781 chattag = "paused";
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	782 else {
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	783 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	784 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	785 }
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	786
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	787 jep85->last_state_sent = state;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	788
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	789 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	790 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	791
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	792 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	793 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	794
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	795 event = xmlnode_insert_tag(x, chattag);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	796 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	797
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	798 jab_send(jc, x);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	799 xmlnode_free(x);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	800
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	801 g_free(fjid);
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	802 jb_reset_keepalive();
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	803 }
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	804 #endif
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	805
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	806 #ifdef JEP0022
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	807 // jb_send_jep22_event()
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	808 // Send a JEP-22 message event (delivered, composing...).
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	809 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	810 {
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	811 xmlnode x;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	812 xmlnode event;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	813 const char *msgid;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	814 char rname, barejid;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	815 GSList *sl_buddy;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	816 struct jep0022 *jep22 = NULL;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	817 guint jep22_state;
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	818
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	819 if (!online) return;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	820
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	821 rname = strchr(fjid, JID_RESOURCE_SEPARATOR);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	822 barejid = jidtodisp(fjid);
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	823 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	824 g_free(barejid);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	825
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	826 // 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	827 // which hopefully will give us the most likely resource.
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	828 if (rname)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	829 rname++;
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	830 if (sl_buddy)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	831 jep22 = buddy_resource_jep22(sl_buddy->data, rname);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	832
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	833 if (!jep22)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	834 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	835
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	836 msgid = jep22->last_msgid_rcvd;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	837
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	838 // 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	839 // 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	840 if (type == ROSTER_EVENT_COMPOSING)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	841 jep22_state = ROSTER_EVENT_COMPOSING;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	842 else if (type == ROSTER_EVENT_ACTIVE \|\|
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	843 type == ROSTER_EVENT_PAUSED)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	844 jep22_state = ROSTER_EVENT_ACTIVE;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	845 else
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	846 jep22_state = 0; // ROSTER_EVENT_NONE
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	847
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	848 if (jep22_state) {
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	849 // 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	850 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	851 return;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	852 jep22->last_state_sent = jep22_state;
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	853 }
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	854
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	855 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	856
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	857 event = xmlnode_insert_tag(x, "x");
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	858 xmlnode_put_attrib(event, "xmlns", NS_EVENT);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	859 if (type == ROSTER_EVENT_DELIVERED)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	860 xmlnode_insert_tag(event, "delivered");
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	861 else if (type == ROSTER_EVENT_COMPOSING)
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	862 xmlnode_insert_tag(event, "composing");
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	863 xmlnode_put_attrib(event, "id", msgid);
989 859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	864
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	865 jab_send(jc, x);
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	866 xmlnode_free(x);
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 jb_reset_keepalive();
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	869 }
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	870 #endif
859ab76e5093 Send JEP-22 delivered messages Mikael Berthe <mikael@lilotux.net> parents: 988 diff changeset	871
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	872 // jb_send_chatstate(buddy, state)
d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	873 // 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	874 // 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	875 #if defined JEP0022 \|\| defined JEP0085
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	876 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	877 {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	878 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	879 #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	880 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	881 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	882 #endif
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	883 #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	884 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	885 #endif
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	886
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	887 bjid = buddy_getjid(buddy);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	888 if (!bjid) return;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	889
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	890 #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	891 /* 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	892 priority).
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	893 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	894 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	895 */
10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	896 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	897 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	898 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	899 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	900 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	901 // 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	902 // 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	903 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	904 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	905 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	906 }
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_free(p_res->data);
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	908 }
1091 10f9d6fcfeab JEP85: Reset composing/paused state when a resource with higher prio comes up Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	909 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	910 // 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	911 // 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	912 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	913 return;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	914 #endif
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	915 #ifdef JEP0022
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	916 jep22 = buddy_resource_jep22(buddy, NULL);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	917 if (jep22 && jep22->support == CHATSTATES_SUPPORT_OK) {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	918 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	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 }
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	922 #endif
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 989 diff changeset	923
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	924 // 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	925 // 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	926 // 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	927 #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	928 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	929 {
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 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	931 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	932 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	933 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	934
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 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	936 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	937 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	938
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 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	940 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	941 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	942
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 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	944 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	945
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 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	947 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	948
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 (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	950 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	951 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	952 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	953 }
9687ecc59303 Redo chat states detection if we receive a message error packet from a contact Mikael Berthe <mikael@lilotux.net> parents: 998 diff changeset	954 #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	955
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	956 // jb_subscr_send_auth(jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	957 // Allow jid to receive our presence updates
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	958 void jb_subscr_send_auth(const char *bjid)
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	959 {
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	960 xmlnode x;
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	961
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	962 x = jutil_presnew(JPACKET__SUBSCRIBED, (char *)bjid, NULL);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	963 jab_send(jc, x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	964 xmlnode_free(x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	965 }
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	966
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	967 // jb_subscr_cancel_auth(jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	968 // Cancel jid's subscription to our presence updates
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	969 void jb_subscr_cancel_auth(const char *bjid)
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	970 {
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	971 xmlnode x;
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	972
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	973 x = jutil_presnew(JPACKET__UNSUBSCRIBED, (char *)bjid, NULL);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	974 jab_send(jc, x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	975 xmlnode_free(x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	976 }
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	977
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	978 // jb_subscr_request_auth(jid)
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	979 // Request a subscription to jid's presence updates
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	980 void jb_subscr_request_auth(const char *bjid)
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	981 {
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	982 xmlnode x;
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	983
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	984 x = jutil_presnew(JPACKET__SUBSCRIBE, (char *)bjid, NULL);
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	985 jab_send(jc, x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	986 xmlnode_free(x);
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	987 }
d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	988
834 6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	989 // jb_subscr_request_cancel(jid)
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	990 // Request to cancel jour subscription to jid's presence updates
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	991 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	992 {
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	993 xmlnode x;
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	994
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	995 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	996 jab_send(jc, x);
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	997 xmlnode_free(x);
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	998 }
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	999
213 4fcdbfdf7c20 [/trunk] Changeset 225 by mikael mikael parents: 208 diff changeset	1000 // Note: the caller should check the jid is correct
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1001 void jb_addbuddy(const char bjid, const char name, const char *group)
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1002 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1003 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1004 eviqs *iqn;
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	1005 char *cleanjid;
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1006
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1007 if (!online) return;
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1008
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1009 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	1010
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1011 // We don't check if the jabber user already exists in the roster,
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1012 // because it allows to re-ask for notification.
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1013
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1014 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	1015 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	1016
454399f026fa Fix a bug in jb_addbuddy() Mikael Berthe <mikael@lilotux.net> parents: 625 diff changeset	1017 xmlnode_put_attrib(y, "jid", cleanjid);
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1018
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1019 if (name)
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1020 xmlnode_put_attrib(y, "name", name);
244 5f8b529412bd [/trunk] Changeset 257 by mikael mikael parents: 241 diff changeset	1021
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1022 if (group) {
628 454399f026fa Fix a bug in jb_addbuddy() Mikael Berthe <mikael@lilotux.net> parents: 625 diff changeset	1023 z = xmlnode_insert_tag(y, "group");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1024 xmlnode_insert_cdata(z, group, (unsigned) -1);
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1025 }
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1026
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1027 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1028 iqs_del(iqn->id); // XXX
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1029
617 d3a8b43bf9e7 Add "/authorization" command Mikael Berthe <mikael@lilotux.net> parents: 616 diff changeset	1030 jb_subscr_request_auth(cleanjid);
612 789ec6aed764 Respect RFC 3921 order advice Mikael Berthe <mikael@lilotux.net> parents: 611 diff changeset	1031
1355 9716cf8a0726 Add on_server flag Mikael Berthe <mikael@lilotux.net> parents: 1354 diff changeset	1032 roster_add_user(cleanjid, name, group, ROSTER_TYPE_USER, sub_pending, -1);
192 62bc2992216b [/trunk] Changeset 204 by mikael mikael parents: 165 diff changeset	1033 g_free(cleanjid);
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1034 buddylist_build();
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1035
244 5f8b529412bd [/trunk] Changeset 257 by mikael mikael parents: 241 diff changeset	1036 update_roster = TRUE;
124 6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1037 }
6d2122c003c4 [/trunk] Changeset 137 by mikael mikael parents: 120 diff changeset	1038
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1039 void jb_delbuddy(const char *bjid)
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1040 {
834 6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	1041 xmlnode y, z;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1042 eviqs *iqn;
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1043 char *cleanjid;
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1044
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1045 if (!online) return;
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1046
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1047 cleanjid = jidtodisp(bjid); // Stripping resource, just in case...
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1048
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1049 // If the current buddy is an agent, unsubscribe from it
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1050 if (roster_gettype(cleanjid) == ROSTER_TYPE_AGENT) {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	1051 scr_LogPrint(LPRINT_LOGNORM, "Unregistering from the %s agent", cleanjid);
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1052
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1053 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	1054 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	1055 y = xmlnode_get_tag(iqn->xmldata, "query");
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1056 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	1057 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1058 iqs_del(iqn->id); // XXX
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1059 }
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1060
611 ad737139a144 Improve subscription management Mikael Berthe <mikael@lilotux.net> parents: 610 diff changeset	1061 // Cancel the subscriptions
834 6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	1062 jb_subscr_cancel_auth(cleanjid); // Cancel "from"
6f913f4fbb2a Use jb_subscr_ in jb_delbuddy() Mikael Berthe <mikael@lilotux.net> parents: 823 diff changeset	1063 jb_subscr_request_cancel(cleanjid); // Cancel "to"
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1064
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1065 // 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	1066 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	1067 y = xmlnode_get_tag(iqn->xmldata, "query");
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1068 z = xmlnode_insert_tag(y, "item");
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1069 xmlnode_put_attrib(z, "jid", cleanjid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1070 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	1071 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1072 iqs_del(iqn->id); // XXX
205 e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1073
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1074 roster_del_user(cleanjid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1075 g_free(cleanjid);
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1076 buddylist_build();
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1077
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1078 update_roster = TRUE;
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1079 }
e01bf6d9b4b8 [/trunk] Changeset 217 by mikael mikael parents: 194 diff changeset	1080
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1081 void jb_updatebuddy(const char bjid, const char name, const char *group)
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1082 {
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1083 xmlnode y;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1084 eviqs *iqn;
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1085 char *cleanjid;
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1086
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1087 if (!online) return;
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1088
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1089 // XXX We should check name's and group's correctness
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1090
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1091 cleanjid = jidtodisp(bjid); // Stripping resource, just in case...
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1092
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1093 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	1094 y = xmlnode_insert_tag(xmlnode_get_tag(iqn->xmldata, "query"), "item");
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1095 xmlnode_put_attrib(y, "jid", cleanjid);
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1096 xmlnode_put_attrib(y, "name", name);
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1097
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1098 if (group) {
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1099 y = xmlnode_insert_tag(y, "group");
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 756 diff changeset	1100 xmlnode_insert_cdata(y, group, (unsigned) -1);
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1101 }
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1102
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1103 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 678 diff changeset	1104 iqs_del(iqn->id); // XXX
208 8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1105 g_free(cleanjid);
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1106 }
8b08f34922c5 [/trunk] Changeset 220 by mikael mikael parents: 205 diff changeset	1107
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1108 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	1109 {
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1071 diff changeset	1110 GSList resources, p_res;
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1111 GSList *roster_elt;
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1112 void (request_fn)(const char );
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1113 const char *strreqtype;
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1114
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1115 if (reqtype == iqreq_version) {
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1116 request_fn = &request_version;
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1117 strreqtype = "version";
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1118 } else if (reqtype == iqreq_time) {
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1119 request_fn = &request_time;
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1120 strreqtype = "time";
1015 579299b1c9b2 Add /request last Mikael Berthe <mikael@lilotux.net> parents: 1014 diff changeset	1121 } else if (reqtype == iqreq_last) {
579299b1c9b2 Add /request last Mikael Berthe <mikael@lilotux.net> parents: 1014 diff changeset	1122 request_fn = &request_last;
579299b1c9b2 Add /request last Mikael Berthe <mikael@lilotux.net> parents: 1014 diff changeset	1123 strreqtype = "last";
1003 c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1124 } else if (reqtype == iqreq_vcard) {
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1125 // Special case
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1126 } else
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1127 return;
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1128
1003 c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1129 // vCard request
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1130 if (reqtype == iqreq_vcard) {
1310 a5336c44d4e2 Allow vcard requests to a full jid Mikael Berthe <mikael@lilotux.net> parents: 1306 diff changeset	1131 request_vcard(fjid);
a5336c44d4e2 Allow vcard requests to a full jid Mikael Berthe <mikael@lilotux.net> parents: 1306 diff changeset	1132 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	1133 return;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1134 }
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1001 diff changeset	1135
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1136 if (strchr(fjid, JID_RESOURCE_SEPARATOR)) {
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1137 // This is a full JID
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1138 (*request_fn)(fjid);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1139 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	1140 return;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1141 }
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1142
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1143 // The resource has not been specified
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1144 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	1145 if (!roster_elt) {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1146 scr_LogPrint(LPRINT_NORMAL, "No known resource for <%s>...", fjid);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1147 (*request_fn)(fjid); // Let's send a request anyway...
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1148 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	1149 return;
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1150 }
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1151
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1152 // Send a request to each resource
e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1153 resources = buddy_getresources(roster_elt->data);
793 898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1154 if (!resources) {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1155 scr_LogPrint(LPRINT_NORMAL, "No known resource for <%s>...", fjid);
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1156 (*request_fn)(fjid); // Let's send a request anyway...
c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1055 diff changeset	1157 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	1158 }
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1071 diff changeset	1159 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	1160 gchar *fulljid;
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1071 diff changeset	1161 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	1162 (*request_fn)(fulljid);
898dd706cc5c Fix up /request command Mikael Berthe <mikael@lilotux.net> parents: 774 diff changeset	1163 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	1164 g_free(fulljid);
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1071 diff changeset	1165 g_free(p_res->data);
693 e98abd3ce28c Add /request command Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	1166 }

Mercurial > ~mikael > mcabber > hg

annotate mcabber/src/jabglue.c @ 1378:61fc9eddf763