mcabber: mcabber/src/jab

annotate mcabber/src/jab_iq.c @ 1014:99c5278bf6b8

Keep the status and status messages when we're disconnected Improve the automatic reconnection after a network failure. - AutoConnection is only set to false when the user disconnects explicitly (i.e. in do_disconnect()). - AutoConnection is set to TRUE after the 1st successful connection. - In jb_setstatus(), update the status message and the "wanted status" even in offline mode. It helps with auto-away.

author	Mikael Berthe <mikael@lilotux.net>
date	Sun, 12 Nov 2006 22:25:14 +0100
parents	bbf53cd43fbb
children	579299b1c9b2

rev	line source
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	1 /*
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	2 * jab_iq.c -- Jabber protocol IQ-related fonctions
393 f8f3c7493457 Whitespace cleanup Mikael Berthe <mikael@lilotux.net> parents: 387 diff changeset	3 *
699 ee03b56b93ee Update Copyright (2006) Mikael Berthe <mikael@lilotux.net> parents: 698 diff changeset	4 * Copyright (C) 2005, 2006 Mikael Berthe <bmikael@lists.lilotux.net>
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	5 * Some parts initially came from the centericq project:
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	6 * Copyright (C) 2002-2005 by Konstantin Klyagin <konst@konst.org.ua>
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	7 * Some small parts come from the Gaim project <http://gaim.sourceforge.net/>
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	8 *
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	9 * This program is free software; you can redistribute it and/or modify
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	10 * it under the terms of the GNU General Public License as published by
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	11 * the Free Software Foundation; either version 2 of the License, or (at
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	12 * your option) any later version.
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	13 *
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	14 * This program is distributed in the hope that it will be useful, but
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	15 * WITHOUT ANY WARRANTY; without even the implied warranty of
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	17 * General Public License for more details.
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	18 *
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	19 * You should have received a copy of the GNU General Public License
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	20 * along with this program; if not, write to the Free Software
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	22 * USA
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	23 */
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	24
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	25 #include <sys/utsname.h>
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	26 #include <glib.h>
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	27
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	28 #include "jabglue.h"
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	29 #include "jab_priv.h"
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 52 diff changeset	30 #include "roster.h"
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	31 #include "utils.h"
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	32 #include "screen.h"
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	33 #include "settings.h"
704 4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	34 #include "hbuf.h"
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	35
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	36
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	37 // Bookmarks for IQ:private storage
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	38 xmlnode bookmarks;
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	39
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	40 static GSList *iqs_list;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	41
1006 f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	42 // Enum for vCard attributes
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	43 enum vcard_attr {
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	44 vcard_home = 1<<0,
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	45 vcard_work = 1<<1,
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	46 vcard_postal = 1<<2,
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	47 vcard_voice = 1<<3,
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	48 vcard_fax = 1<<4,
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	49 vcard_cell = 1<<5,
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	50 vcard_inet = 1<<6,
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	51 vcard_pref = 1<<7,
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	52 };
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	53
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	54 // iqs_new(type, namespace, prefix, timeout)
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	55 // Create a query (GET, SET) IQ structure. This function should not be used
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	56 // for RESULT packets.
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	57 eviqs iqs_new(guint8 type, const char ns, const char *prefix, time_t timeout)
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	58 {
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	59 static guint iqs_idn;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	60 eviqs *new_iqs;
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	61 time_t now_t;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	62
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	63 iqs_idn++;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	64
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	65 new_iqs = g_new0(eviqs, 1);
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	66 time(&now_t);
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	67 new_iqs->ts_create = now_t;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	68 if (timeout)
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	69 new_iqs->ts_expire = now_t + timeout;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	70 new_iqs->type = type;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	71 new_iqs->xmldata = jutil_iqnew(type, (char*)ns);
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	72 if (prefix)
687 426145046b93 Minor format change in IQ id string Mikael Berthe <mikael@lilotux.net> parents: 686 diff changeset	73 new_iqs->id = g_strdup_printf("%s_%d", prefix, iqs_idn);
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	74 else
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	75 new_iqs->id = g_strdup_printf("%d", iqs_idn);
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	76 xmlnode_put_attrib(new_iqs->xmldata, "id", new_iqs->id);
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	77
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	78 iqs_list = g_slist_append(iqs_list, new_iqs);
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	79 return new_iqs;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	80 }
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	81
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	82 int iqs_del(const char *iqid)
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	83 {
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	84 GSList *p;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	85 eviqs *i;
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	86
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	87 if (!iqid) return 1;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	88
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	89 for (p = iqs_list; p; p = g_slist_next(p)) {
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	90 i = p->data;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	91 if (!strcmp(iqid, i->id))
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	92 break;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	93 }
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	94 if (p) {
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	95 g_free(i->id);
774 46304b773a44 Remove useless checks before g_free() calls Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	96 xmlnode_free(i->xmldata);
46304b773a44 Remove useless checks before g_free() calls Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	97 g_free(i->data);
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	98 g_free(i);
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	99 iqs_list = g_slist_remove(iqs_list, p->data);
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	100 return 0; // Ok, deleted
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	101 }
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	102 return -1; // Not found
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	103 }
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	104
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	105 static eviqs iqs_find(const char iqid)
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	106 {
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	107 GSList *p;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	108 eviqs *i;
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	109
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	110 if (!iqid) return NULL;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	111
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	112 for (p = iqs_list; p; p = g_slist_next(p)) {
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	113 i = p->data;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	114 if (!strcmp(iqid, i->id))
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	115 return i;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	116 }
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	117 return NULL;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	118 }
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	119
698 60522cf6d325 Propagate context to IQ callback functions Mikael Berthe <mikael@lilotux.net> parents: 692 diff changeset	120 // iqs_callback(iqid, xml_result, iqcontext)
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	121 // Callback processing for the iqid message.
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	122 // If we've received an answer, xml_result should point to the xmldata packet.
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	123 // If this is a timeout, xml_result should be NULL.
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	124 // Return 0 in case of success, -1 if the iqid hasn't been found.
698 60522cf6d325 Propagate context to IQ callback functions Mikael Berthe <mikael@lilotux.net> parents: 692 diff changeset	125 int iqs_callback(const char *iqid, xmlnode xml_result, guint iqcontext)
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	126 {
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	127 eviqs *i;
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	128
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	129 i = iqs_find(iqid);
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	130 if (!i) return -1;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	131
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	132 // IQ processing
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	133 // Note: If xml_result is NULL, this is a timeout
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	134 if (i->callback)
698 60522cf6d325 Propagate context to IQ callback functions Mikael Berthe <mikael@lilotux.net> parents: 692 diff changeset	135 (*i->callback)(i, xml_result, iqcontext);
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	136
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	137 iqs_del(iqid);
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	138 return 0;
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	139 }
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	140
705 603b43e4f56a Fix a bug in iqs_check_timeout() Mikael Berthe <mikael@lilotux.net> parents: 704 diff changeset	141 void iqs_check_timeout(time_t now_t)
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	142 {
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	143 GSList *p;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	144 eviqs *i;
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	145
705 603b43e4f56a Fix a bug in iqs_check_timeout() Mikael Berthe <mikael@lilotux.net> parents: 704 diff changeset	146 p = iqs_list;
603b43e4f56a Fix a bug in iqs_check_timeout() Mikael Berthe <mikael@lilotux.net> parents: 704 diff changeset	147 while (p) {
603b43e4f56a Fix a bug in iqs_check_timeout() Mikael Berthe <mikael@lilotux.net> parents: 704 diff changeset	148 i = p->data;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	149 // We must get next IQ eviqs element now because the current one
705 603b43e4f56a Fix a bug in iqs_check_timeout() Mikael Berthe <mikael@lilotux.net> parents: 704 diff changeset	150 // could be freed.
603b43e4f56a Fix a bug in iqs_check_timeout() Mikael Berthe <mikael@lilotux.net> parents: 704 diff changeset	151 p = g_slist_next(p);
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	152
965 1bdf0f1b16c0 Use U suffix for unsigned defines Mikael Berthe <mikael@lilotux.net> parents: 959 diff changeset	153 if ((!i->ts_expire && now_t > i->ts_create + (time_t)IQS_MAX_TIMEOUT) \|\|
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	154 (i->ts_expire && now_t > i->ts_expire)) {
698 60522cf6d325 Propagate context to IQ callback functions Mikael Berthe <mikael@lilotux.net> parents: 692 diff changeset	155 iqs_callback(i->id, NULL, IQS_CONTEXT_TIMEOUT);
683 c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	156 }
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	157 }
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	158 }
c5e0d8c3f00c Introduce new IQ system Mikael Berthe <mikael@lilotux.net> parents: 619 diff changeset	159
689 281aab5aef50 Introduce jb_iqs_display_list() helper function for debugging Mikael Berthe <mikael@lilotux.net> parents: 688 diff changeset	160 void jb_iqs_display_list(void)
281aab5aef50 Introduce jb_iqs_display_list() helper function for debugging Mikael Berthe <mikael@lilotux.net> parents: 688 diff changeset	161 {
281aab5aef50 Introduce jb_iqs_display_list() helper function for debugging Mikael Berthe <mikael@lilotux.net> parents: 688 diff changeset	162 GSList *p;
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	163 eviqs *i;
689 281aab5aef50 Introduce jb_iqs_display_list() helper function for debugging Mikael Berthe <mikael@lilotux.net> parents: 688 diff changeset	164
281aab5aef50 Introduce jb_iqs_display_list() helper function for debugging Mikael Berthe <mikael@lilotux.net> parents: 688 diff changeset	165 scr_LogPrint(LPRINT_LOGNORM, "IQ list:");
281aab5aef50 Introduce jb_iqs_display_list() helper function for debugging Mikael Berthe <mikael@lilotux.net> parents: 688 diff changeset	166 for (p = iqs_list; p; p = g_slist_next(p)) {
281aab5aef50 Introduce jb_iqs_display_list() helper function for debugging Mikael Berthe <mikael@lilotux.net> parents: 688 diff changeset	167 i = p->data;
281aab5aef50 Introduce jb_iqs_display_list() helper function for debugging Mikael Berthe <mikael@lilotux.net> parents: 688 diff changeset	168 scr_LogPrint(LPRINT_LOGNORM, "Id [%s]", i->id);
281aab5aef50 Introduce jb_iqs_display_list() helper function for debugging Mikael Berthe <mikael@lilotux.net> parents: 688 diff changeset	169 }
281aab5aef50 Introduce jb_iqs_display_list() helper function for debugging Mikael Berthe <mikael@lilotux.net> parents: 688 diff changeset	170 scr_LogPrint(LPRINT_LOGNORM, "End of IQ list.");
281aab5aef50 Introduce jb_iqs_display_list() helper function for debugging Mikael Berthe <mikael@lilotux.net> parents: 688 diff changeset	171 }
281aab5aef50 Introduce jb_iqs_display_list() helper function for debugging Mikael Berthe <mikael@lilotux.net> parents: 688 diff changeset	172
606 0b4ed231ebc2 Code cleanup + remove deprecated Agents list IQ request Mikael Berthe <mikael@lilotux.net> parents: 605 diff changeset	173 static void request_roster(void)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	174 {
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	175 eviqs *iqn = iqs_new(JPACKET__GET, NS_ROSTER, "Roster", IQS_DEFAULT_TIMEOUT);
684 3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 683 diff changeset	176 jab_send(jc, iqn->xmldata);
3282276e7413 Switch IQ packet creation to the new IQ system Mikael Berthe <mikael@lilotux.net> parents: 683 diff changeset	177 iqs_del(iqn->id); // XXX
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	178 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	179
606 0b4ed231ebc2 Code cleanup + remove deprecated Agents list IQ request Mikael Berthe <mikael@lilotux.net> parents: 605 diff changeset	180 static void handle_iq_roster(xmlnode x)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	181 {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	182 xmlnode y;
605 2a4fefb98511 Set the subscription pending flag Mikael Berthe <mikael@lilotux.net> parents: 603 diff changeset	183 const char jid, name, group, sub, *ask;
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	184 char *cleanalias;
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	185 enum subscr esub;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	186 int need_refresh = FALSE;
613 a6b8b373e4de Try to guess if a roster item is an agent Mikael Berthe <mikael@lilotux.net> parents: 607 diff changeset	187 guint roster_type;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	188
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	189 for (y = xmlnode_get_tag(x, "item"); y; y = xmlnode_get_nextsibling(y)) {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	190
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	191 jid = xmlnode_get_attrib(y, "jid");
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	192 name = xmlnode_get_attrib(y, "name");
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	193 sub = xmlnode_get_attrib(y, "subscription");
605 2a4fefb98511 Set the subscription pending flag Mikael Berthe <mikael@lilotux.net> parents: 603 diff changeset	194 ask = xmlnode_get_attrib(y, "ask");
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	195
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	196 group = xmlnode_get_tag_data(y, "group");
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	197
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	198 if (!jid)
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	199 continue;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	200
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 746 diff changeset	201 cleanalias = jidtodisp(jid);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	202
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	203 esub = sub_none;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	204 if (sub) {
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	205 if (!strcmp(sub, "to")) esub = sub_to;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	206 else if (!strcmp(sub, "from")) esub = sub_from;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	207 else if (!strcmp(sub, "both")) esub = sub_both;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	208 else if (!strcmp(sub, "remove")) esub = sub_remove;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	209 }
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	210
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	211 if (esub == sub_remove) {
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	212 roster_del_user(cleanalias);
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	213 scr_LogPrint(LPRINT_LOGNORM, "Buddy <%s> has been removed "
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	214 "from the roster", cleanalias);
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	215 g_free(cleanalias);
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	216 need_refresh = TRUE;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	217 continue;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	218 }
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	219
605 2a4fefb98511 Set the subscription pending flag Mikael Berthe <mikael@lilotux.net> parents: 603 diff changeset	220 if (ask && !strcmp(ask, "subscribe"))
2a4fefb98511 Set the subscription pending flag Mikael Berthe <mikael@lilotux.net> parents: 603 diff changeset	221 esub \|= sub_pending;
2a4fefb98511 Set the subscription pending flag Mikael Berthe <mikael@lilotux.net> parents: 603 diff changeset	222
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 746 diff changeset	223 if (!name)
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 746 diff changeset	224 name = cleanalias;
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	225
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 965 diff changeset	226 // Tricky... :-\ My guess is that if there is no JID_DOMAIN_SEPARATOR,
5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 965 diff changeset	227 // this is an agent.
5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 965 diff changeset	228 if (strchr(cleanalias, JID_DOMAIN_SEPARATOR))
613 a6b8b373e4de Try to guess if a roster item is an agent Mikael Berthe <mikael@lilotux.net> parents: 607 diff changeset	229 roster_type = ROSTER_TYPE_USER;
a6b8b373e4de Try to guess if a roster item is an agent Mikael Berthe <mikael@lilotux.net> parents: 607 diff changeset	230 else
a6b8b373e4de Try to guess if a roster item is an agent Mikael Berthe <mikael@lilotux.net> parents: 607 diff changeset	231 roster_type = ROSTER_TYPE_AGENT;
a6b8b373e4de Try to guess if a roster item is an agent Mikael Berthe <mikael@lilotux.net> parents: 607 diff changeset	232
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 746 diff changeset	233 roster_add_user(cleanalias, name, group, roster_type, esub);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	234
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	235 g_free(cleanalias);
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	236 }
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	237
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	238 buddylist_build();
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	239 update_roster = TRUE;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	240 if (need_refresh)
959 8bf36cef8aa6 Do not enter chat mode after command "/del" Mikael Berthe <mikael@lilotux.net> parents: 871 diff changeset	241 scr_UpdateBuddyWindow();
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	242 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	243
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 746 diff changeset	244 static void iqscallback_version(eviqs *iqp, xmlnode xml_result, guint iqcontext)
690 3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	245 {
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	246 xmlnode ansqry;
1002 dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	247 char *p;
704 4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	248 char *bjid;
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	249 char *buf;
690 3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	250
698 60522cf6d325 Propagate context to IQ callback functions Mikael Berthe <mikael@lilotux.net> parents: 692 diff changeset	251 // Leave now if we cannot process xml_result
60522cf6d325 Propagate context to IQ callback functions Mikael Berthe <mikael@lilotux.net> parents: 692 diff changeset	252 if (!xml_result \|\| iqcontext) return;
690 3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	253
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	254 ansqry = xmlnode_get_tag(xml_result, "query");
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	255 if (!ansqry) {
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	256 scr_LogPrint(LPRINT_LOGNORM, "Invalid IQ:version result!");
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	257 return;
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	258 }
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	259 // Display IQ result sender...
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	260 p = xmlnode_get_attrib(xml_result, "from");
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	261 if (!p) {
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	262 scr_LogPrint(LPRINT_LOGNORM, "Invalid IQ:version result (no sender name).");
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	263 return;
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	264 }
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 746 diff changeset	265 bjid = p;
704 4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	266
782 19121d9f4aa2 Nicer message when receiving IQ result packet Mikael Berthe <mikael@lilotux.net> parents: 776 diff changeset	267 buf = g_strdup_printf("Received IQ:version result from <%s>", bjid);
704 4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	268 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	269
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	270 // bjid should now really be the "bare JID", let's strip the resource
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 965 diff changeset	271 p = strchr(bjid, JID_RESOURCE_SEPARATOR);
704 4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	272 if (p) *p = '\0';
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	273
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	274 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO);
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	275 g_free(buf);
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	276
690 3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	277 // Get result data...
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	278 p = xmlnode_get_tag_data(ansqry, "name");
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	279 if (p) {
1002 dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	280 buf = g_strdup_printf("Name: %s", p);
dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	281 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_NONE);
dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	282 g_free(buf);
690 3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	283 }
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	284 p = xmlnode_get_tag_data(ansqry, "version");
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	285 if (p) {
1002 dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	286 buf = g_strdup_printf("Version: %s", p);
dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	287 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_NONE);
dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	288 g_free(buf);
690 3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	289 }
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	290 p = xmlnode_get_tag_data(ansqry, "os");
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	291 if (p) {
1002 dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	292 buf = g_strdup_printf("OS: %s", p);
dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	293 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_NONE);
dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	294 g_free(buf);
690 3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	295 }
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	296 }
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	297
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	298 void request_version(const char *fulljid)
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	299 {
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	300 eviqs *iqn;
690 3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	301
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	302 iqn = iqs_new(JPACKET__GET, NS_VERSION, "version", IQS_DEFAULT_TIMEOUT);
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 746 diff changeset	303 xmlnode_put_attrib(iqn->xmldata, "to", fulljid);
690 3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	304 iqn->callback = &iqscallback_version;
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	305 jab_send(jc, iqn->xmldata);
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	306 }
3e965a1186c7 Implement IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 689 diff changeset	307
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 746 diff changeset	308 static void iqscallback_time(eviqs *iqp, xmlnode xml_result, guint iqcontext)
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	309 {
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	310 xmlnode ansqry;
1002 dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	311 char *p;
704 4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	312 char *bjid;
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	313 char *buf;
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	314
698 60522cf6d325 Propagate context to IQ callback functions Mikael Berthe <mikael@lilotux.net> parents: 692 diff changeset	315 // Leave now if we cannot process xml_result
60522cf6d325 Propagate context to IQ callback functions Mikael Berthe <mikael@lilotux.net> parents: 692 diff changeset	316 if (!xml_result \|\| iqcontext) return;
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	317
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	318 ansqry = xmlnode_get_tag(xml_result, "query");
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	319 if (!ansqry) {
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	320 scr_LogPrint(LPRINT_LOGNORM, "Invalid IQ:time result!");
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	321 return;
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	322 }
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	323 // Display IQ result sender...
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	324 p = xmlnode_get_attrib(xml_result, "from");
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	325 if (!p) {
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	326 scr_LogPrint(LPRINT_LOGNORM, "Invalid IQ:time result (no sender name).");
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	327 return;
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	328 }
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 746 diff changeset	329 bjid = p;
704 4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	330
782 19121d9f4aa2 Nicer message when receiving IQ result packet Mikael Berthe <mikael@lilotux.net> parents: 776 diff changeset	331 buf = g_strdup_printf("Received IQ:time result from <%s>", bjid);
704 4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	332 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	333
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	334 // bjid should now really be the "bare JID", let's strip the resource
977 5b01de4ac5e1 Cosmetic changes Alexis Hildebrandt <afh [at] 2drop [dot] net> parents: 965 diff changeset	335 p = strchr(bjid, JID_RESOURCE_SEPARATOR);
704 4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	336 if (p) *p = '\0';
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	337
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	338 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO);
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	339 g_free(buf);
4118a66f2c02 Display IQ results (time, version) in the chat window Mikael Berthe <mikael@lilotux.net> parents: 703 diff changeset	340
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	341 // Get result data...
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	342 p = xmlnode_get_tag_data(ansqry, "utc");
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	343 if (p) {
1002 dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	344 buf = g_strdup_printf("UTC: %s", p);
dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	345 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_NONE);
dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	346 g_free(buf);
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	347 }
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	348 p = xmlnode_get_tag_data(ansqry, "tz");
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	349 if (p) {
1002 dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	350 buf = g_strdup_printf("TZ: %s", p);
dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	351 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_NONE);
dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	352 g_free(buf);
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	353 }
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	354 p = xmlnode_get_tag_data(ansqry, "display");
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	355 if (p) {
1002 dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	356 buf = g_strdup_printf("Time: %s", p);
dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	357 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_NONE);
dd9e7eb5f8a8 Remove old UTF-8 conversions Mikael Berthe <mikael@lilotux.net> parents: 995 diff changeset	358 g_free(buf);
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	359 }
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	360 }
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	361
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	362 void request_time(const char *fulljid)
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	363 {
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	364 eviqs *iqn;
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	365
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	366 iqn = iqs_new(JPACKET__GET, NS_TIME, "time", IQS_DEFAULT_TIMEOUT);
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 746 diff changeset	367 xmlnode_put_attrib(iqn->xmldata, "to", fulljid);
691 3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	368 iqn->callback = &iqscallback_time;
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	369 jab_send(jc, iqn->xmldata);
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	370 }
3c0a0a993de8 Implement IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 690 diff changeset	371
1006 f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	372 static void display_vcard_item(const char bjid, const char label,
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	373 enum vcard_attr vcard_attrib, const char *text)
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	374 {
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	375 char *buf;
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	376
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	377 if (!text \|\| !bjid \|\| !label)
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	378 return;
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	379
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	380 buf = g_strdup_printf("%s: %s%s%s%s%s%s%s%s%s%s", label,
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	381 (vcard_attrib & vcard_home ? "[home]" : ""),
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	382 (vcard_attrib & vcard_work ? "[work]" : ""),
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	383 (vcard_attrib & vcard_postal ? "[postal]" : ""),
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	384 (vcard_attrib & vcard_voice ? "[voice]" : ""),
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	385 (vcard_attrib & vcard_fax ? "[fax]" : ""),
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	386 (vcard_attrib & vcard_cell ? "[cell]" : ""),
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	387 (vcard_attrib & vcard_inet ? "[inet]" : ""),
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	388 (vcard_attrib & vcard_pref ? "[pref]" : ""),
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	389 (vcard_attrib ? " " : ""),
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	390 text);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	391 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_NONE);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	392 g_free(buf);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	393 }
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	394
1003 c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	395 static void handle_vcard_node(const char *barejid, xmlnode vcardnode)
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	396 {
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	397 xmlnode x;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	398 const char *p;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	399
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	400 x = xmlnode_get_firstchild(vcardnode);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	401 for ( ; x; x = xmlnode_get_nextsibling(x)) {
1006 f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	402 const char *data;
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	403 enum vcard_attr vcard_attrib = 0;
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	404
1003 c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	405 p = xmlnode_get_name(x);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	406 data = xmlnode_get_data(x);
1006 f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	407 if (!p \|\| !data)
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	408 continue;
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	409
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	410 if (!strcmp(p, "FN"))
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	411 display_vcard_item(barejid, "Name", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	412 else if (!strcmp(p, "NICKNAME"))
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	413 display_vcard_item(barejid, "Nickname", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	414 else if (!strcmp(p, "URL"))
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	415 display_vcard_item(barejid, "URL", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	416 else if (!strcmp(p, "BDAY"))
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	417 display_vcard_item(barejid, "Birthday", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	418 else if (!strcmp(p, "TZ"))
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	419 display_vcard_item(barejid, "Timezone", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	420 else if (!strcmp(p, "TITLE"))
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	421 display_vcard_item(barejid, "Title", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	422 else if (!strcmp(p, "ROLE"))
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	423 display_vcard_item(barejid, "Role", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	424 else if (!strcmp(p, "DESC"))
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	425 display_vcard_item(barejid, "Comment", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	426 else if (!strcmp(p, "N")) {
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	427 data = xmlnode_get_tag_data(x, "FAMILY");
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	428 display_vcard_item(barejid, "Family Name", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	429 data = xmlnode_get_tag_data(x, "GIVEN");
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	430 display_vcard_item(barejid, "Given Name", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	431 data = xmlnode_get_tag_data(x, "MIDDLE");
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	432 display_vcard_item(barejid, "Middle Name", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	433 } else if (!strcmp(p, "ORG")) {
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	434 data = xmlnode_get_tag_data(x, "ORGNAME");
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	435 display_vcard_item(barejid, "Organisation name", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	436 data = xmlnode_get_tag_data(x, "ORGUNIT");
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	437 display_vcard_item(barejid, "Organisation unit", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	438 } else {
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	439 // The HOME, WORK and PREF attributes are common to the remaining fields
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	440 // (ADR, TEL & EMAIL)
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	441 if (xmlnode_get_tag(x, "HOME"))
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	442 vcard_attrib \|= vcard_home;
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	443 if (xmlnode_get_tag(x, "WORK"))
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	444 vcard_attrib \|= vcard_work;
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	445 if (xmlnode_get_tag(x, "PREF"))
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	446 vcard_attrib \|= vcard_pref;
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	447 if (!strcmp(p, "ADR")) { // Address
1005 e5c10cc29660 Improve vcard support Mikael Berthe <mikael@lilotux.net> parents: 1004 diff changeset	448 if (xmlnode_get_tag(x, "POSTAL"))
1006 f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	449 vcard_attrib \|= vcard_postal;
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	450 data = xmlnode_get_tag_data(x, "EXTADD");
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	451 display_vcard_item(barejid, "Addr (ext)", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	452 data = xmlnode_get_tag_data(x, "STREET");
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	453 display_vcard_item(barejid, "Street", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	454 data = xmlnode_get_tag_data(x, "LOCALITY");
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	455 display_vcard_item(barejid, "Locality", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	456 data = xmlnode_get_tag_data(x, "REGION");
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	457 display_vcard_item(barejid, "Region", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	458 data = xmlnode_get_tag_data(x, "PCODE");
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	459 display_vcard_item(barejid, "Postal code", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	460 data = xmlnode_get_tag_data(x, "CTRY");
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	461 display_vcard_item(barejid, "Country", vcard_attrib, data);
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	462 } else if (!strcmp(p, "TEL")) { // Telephone
1005 e5c10cc29660 Improve vcard support Mikael Berthe <mikael@lilotux.net> parents: 1004 diff changeset	463 data = xmlnode_get_tag_data(x, "NUMBER");
e5c10cc29660 Improve vcard support Mikael Berthe <mikael@lilotux.net> parents: 1004 diff changeset	464 if (data) {
e5c10cc29660 Improve vcard support Mikael Berthe <mikael@lilotux.net> parents: 1004 diff changeset	465 if (xmlnode_get_tag(x, "VOICE"))
1006 f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	466 vcard_attrib \|= vcard_voice;
1005 e5c10cc29660 Improve vcard support Mikael Berthe <mikael@lilotux.net> parents: 1004 diff changeset	467 if (xmlnode_get_tag(x, "FAX"))
1006 f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	468 vcard_attrib \|= vcard_fax;
1005 e5c10cc29660 Improve vcard support Mikael Berthe <mikael@lilotux.net> parents: 1004 diff changeset	469 if (xmlnode_get_tag(x, "CELL"))
1006 f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	470 vcard_attrib \|= vcard_cell;
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	471 display_vcard_item(barejid, "Phone", vcard_attrib, data);
1005 e5c10cc29660 Improve vcard support Mikael Berthe <mikael@lilotux.net> parents: 1004 diff changeset	472 }
1006 f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	473 } else if (!strcmp(p, "EMAIL")) { // Email
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	474 if (xmlnode_get_tag(x, "INTERNET"))
f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	475 vcard_attrib \|= vcard_inet;
1003 c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	476 data = xmlnode_get_tag_data(x, "USERID");
1006 f61131cd86a0 Clean up vcard code Mikael Berthe <mikael@lilotux.net> parents: 1005 diff changeset	477 display_vcard_item(barejid, "Email", vcard_attrib, data);
1003 c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	478 }
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	479 }
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	480 }
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	481 }
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	482
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	483 static void iqscallback_vcard(eviqs *iqp, xmlnode xml_result, guint iqcontext)
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	484 {
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	485 xmlnode ansqry;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	486 char *p;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	487 char *bjid;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	488 char *buf;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	489
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	490 // Leave now if we cannot process xml_result
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	491 if (!xml_result \|\| iqcontext) return;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	492
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	493 // Display IQ result sender...
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	494 p = xmlnode_get_attrib(xml_result, "from");
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	495 if (!p) {
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	496 scr_LogPrint(LPRINT_LOGNORM, "Invalid IQ:vCard result (no sender name).");
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	497 return;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	498 }
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	499 bjid = p;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	500
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	501 buf = g_strdup_printf("Received IQ:vCard result from <%s>", bjid);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	502 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	503
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	504 // Get the vCard node
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	505 ansqry = xmlnode_get_tag(xml_result, "vCard");
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	506 if (!ansqry) {
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	507 scr_LogPrint(LPRINT_LOGNORM, "Empty IQ:vCard result!");
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	508 return;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	509 }
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	510
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	511 // bjid should really be the "bare JID", let's strip the resource
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	512 p = strchr(bjid, JID_RESOURCE_SEPARATOR);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	513 if (p) *p = '\0';
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	514
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	515 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	516 g_free(buf);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	517
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	518 // Get result data...
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	519 handle_vcard_node(bjid, ansqry);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	520 }
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	521
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	522 void request_vcard(const char *jid)
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	523 {
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	524 eviqs *iqn;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	525 char *barejid;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	526
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	527 barejid = jidtodisp(jid);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	528
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	529 // Create a new IQ structure. We use NULL for the namespace because
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	530 // we'll have to use a special tag, not the usual "query" one.
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	531 iqn = iqs_new(JPACKET__GET, NULL, "vcard", IQS_DEFAULT_TIMEOUT);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	532 xmlnode_put_attrib(iqn->xmldata, "to", barejid);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	533 // Remove the useless <query/> tag, and insert a vCard one.
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	534 xmlnode_hide(xmlnode_get_tag(iqn->xmldata, "query"));
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	535 xmlnode_put_attrib(xmlnode_insert_tag(iqn->xmldata, "vCard"),
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	536 "xmlns", NS_VCARD);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	537 iqn->callback = &iqscallback_vcard;
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	538 jab_send(jc, iqn->xmldata);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	539
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	540 g_free(barejid);
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	541 }
c8b1a52b2fd6 Initial VCard retrieval support Mikael Berthe <mikael@lilotux.net> parents: 1002 diff changeset	542
1004 b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	543 static void storage_bookmarks_parse_conference(xmlnode xmldata)
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	544 {
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	545 const char jid, name, *autojoin;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	546 char *bjid;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	547 GSList *room_elt;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	548
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	549 jid = xmlnode_get_attrib(xmldata, "jid");
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	550 if (!jid)
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	551 return;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	552 name = xmlnode_get_attrib(xmldata, "name");
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	553 autojoin = xmlnode_get_attrib(xmldata, "autojoin");
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	554
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	555 bjid = jidtodisp(jid); // Bare jid
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	556
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	557 // Make sure this is a room (it can be a conversion user->room)
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	558 room_elt = roster_find(bjid, jidsearch, 0);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	559 if (!room_elt) {
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	560 room_elt = roster_add_user(bjid, name, NULL, ROSTER_TYPE_ROOM, sub_none);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	561 } else {
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	562 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	563 /*
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	564 // If the name is available, should we use it?
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	565 // I don't think so, it would be confusing because this item is already
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	566 // in the roster.
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	567 if (name)
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	568 buddy_setname(room_elt->data, name);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	569 */
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	570 }
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	571
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	572 // Is autojoin set?
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	573 // If it is, we'll look up for more information (nick? password?) and
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	574 // try to join the room.
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	575 if (autojoin && !strcmp(autojoin, "1")) {
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	576 char nick, passwd;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	577 char *tmpnick = NULL;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	578 nick = xmlnode_get_tag_data(xmldata, "nick");
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	579 passwd = xmlnode_get_tag_data(xmldata, "password");
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	580 if (!nick \|\| !*nick)
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	581 nick = tmpnick = default_muc_nickname();
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	582 // Let's join now
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	583 scr_LogPrint(LPRINT_LOGNORM, "Auto-join bookmark <%s>", bjid);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	584 jb_room_join(bjid, nick, passwd);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	585 g_free(tmpnick);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	586 }
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	587 g_free(bjid);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	588 }
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	589
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	590 static void iqscallback_storage_bookmarks(eviqs *iqp, xmlnode xml_result,
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	591 guint iqcontext)
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	592 {
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	593 xmlnode x, ansqry;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	594 char *p;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	595
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	596 // Leave now if we cannot process xml_result
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	597 if (!xml_result \|\| iqcontext) return;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	598
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	599 ansqry = xmlnode_get_tag(xml_result, "query");
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	600 ansqry = xmlnode_get_tag(ansqry, "storage");
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	601 if (!ansqry) {
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	602 scr_LogPrint(LPRINT_LOG, "Invalid IQ:private result! (storage:bookmarks)");
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	603 return;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	604 }
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	605
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	606 // Walk through the storage tags
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	607 x = xmlnode_get_firstchild(ansqry);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	608 for ( ; x; x = xmlnode_get_nextsibling(x)) {
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	609 p = xmlnode_get_name(x);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	610 // If the current node is a conference item, parse it and update the roster
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	611 if (p && !strcmp(p, "conference"))
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	612 storage_bookmarks_parse_conference(x);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	613 }
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	614 xmlnode_free(bookmarks);
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	615 bookmarks = xmlnode_dup(ansqry);
1004 b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	616 }
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	617
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	618 static void request_storage_bookmarks(void)
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	619 {
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	620 eviqs *iqn;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	621 xmlnode x;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	622
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	623 iqn = iqs_new(JPACKET__GET, NS_PRIVATE, "storage", IQS_DEFAULT_TIMEOUT);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	624
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	625 x = xmlnode_insert_tag(xmlnode_get_tag(iqn->xmldata, "query"), "storage");
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	626 xmlnode_put_attrib(x, "xmlns", "storage:bookmarks");
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	627
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	628 iqn->callback = &iqscallback_storage_bookmarks;
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	629 jab_send(jc, iqn->xmldata);
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	630 }
b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	631
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	632 void iqscallback_auth(eviqs *iqp, xmlnode xml_result)
686 98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	633 {
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	634 if (jstate == STATE_GETAUTH) {
745 413e95f3051a Introduce user "events" list Mikael Berthe <mikael@lilotux.net> parents: 705 diff changeset	635 eviqs *iqn;
686 98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	636
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	637 if (xml_result) {
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	638 xmlnode x = xmlnode_get_tag(xml_result, "query");
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	639 if (x && !xmlnode_get_tag(x, "digest"))
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	640 jc->sid = 0;
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	641 }
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	642
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	643 iqn = iqs_new(JPACKET__SET, NS_AUTH, "auth", IQS_DEFAULT_TIMEOUT);
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	644 iqn->callback = &iqscallback_auth;
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	645 jab_auth_mcabber(jc, iqn->xmldata);
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	646 jab_send(jc, iqn->xmldata);
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	647 jstate = STATE_SENDAUTH;
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	648 } else if (jstate == STATE_SENDAUTH) {
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	649 request_roster();
1004 b57a01ffeed6 Use existing conference bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1003 diff changeset	650 request_storage_bookmarks();
686 98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	651 jstate = STATE_LOGGED;
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	652 }
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	653 }
98de2d166a11 Use the new IQ system for authentication Mikael Berthe <mikael@lilotux.net> parents: 685 diff changeset	654
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	655 static void handle_iq_result(jconn conn, char *from, xmlnode xmldata)
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	656 {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	657 xmlnode x;
685 f033345d1315 Call IQ callback function when receiving a RESULT packet Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	658 char *id;
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	659 char *ns;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	660
685 f033345d1315 Call IQ callback function when receiving a RESULT packet Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	661 id = xmlnode_get_attrib(xmldata, "id");
f033345d1315 Call IQ callback function when receiving a RESULT packet Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	662 if (!id) {
596 6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	663 scr_LogPrint(LPRINT_LOG, "IQ result stanza with no ID, ignored.");
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	664 return;
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	665 }
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	666
698 60522cf6d325 Propagate context to IQ callback functions Mikael Berthe <mikael@lilotux.net> parents: 692 diff changeset	667 if (!iqs_callback(id, xmldata, IQS_CONTEXT_RESULT))
685 f033345d1315 Call IQ callback function when receiving a RESULT packet Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	668 return;
f033345d1315 Call IQ callback function when receiving a RESULT packet Mikael Berthe <mikael@lilotux.net> parents: 684 diff changeset	669
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	670 x = xmlnode_get_tag(xmldata, "query");
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	671 if (!x) return;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	672
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	673 ns = xmlnode_get_attrib(x, "xmlns");
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	674 if (!ns) return;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	675
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	676 if (!strcmp(ns, NS_ROSTER)) {
606 0b4ed231ebc2 Code cleanup + remove deprecated Agents list IQ request Mikael Berthe <mikael@lilotux.net> parents: 605 diff changeset	677 handle_iq_roster(x);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	678
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	679 // Post-login stuff
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	680 // Usually we request the roster only at connection time
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	681 // so we should be there only once. (That's ugly, however)
1014 99c5278bf6b8 Keep the status and status messages when we're disconnected Mikael Berthe <mikael@lilotux.net> parents: 1008 diff changeset	682 jb_setprevstatus();
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	683 }
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	684 }
2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	685
995 c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	686 static void handle_iq_disco_info(jconn conn, char from, const char id,
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	687 xmlnode xmldata)
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	688 {
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	689 xmlnode x, y;
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	690 xmlnode myquery;
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	691
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	692 x = jutil_iqnew(JPACKET__RESULT, NS_DISCO_INFO);
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	693 xmlnode_put_attrib(x, "id", id);
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	694 xmlnode_put_attrib(x, "to", xmlnode_get_attrib(xmldata, "from"));
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	695 myquery = xmlnode_get_tag(x, "query");
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	696
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	697 y = xmlnode_insert_tag(myquery, "identity");
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	698 xmlnode_put_attrib(y, "category", "client");
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	699 xmlnode_put_attrib(y, "type", "pc");
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	700 xmlnode_put_attrib(y, "name", PACKAGE_NAME);
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	701
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	702 xmlnode_put_attrib(xmlnode_insert_tag(myquery, "feature"),
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	703 "var", NS_DISCO_INFO);
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	704 xmlnode_put_attrib(xmlnode_insert_tag(myquery, "feature"),
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	705 "var", NS_MUC);
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	706 xmlnode_put_attrib(xmlnode_insert_tag(myquery, "feature"),
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	707 "var", NS_CHATSTATES);
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	708 xmlnode_put_attrib(xmlnode_insert_tag(myquery, "feature"),
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	709 "var", NS_TIME);
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	710 xmlnode_put_attrib(xmlnode_insert_tag(myquery, "feature"),
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	711 "var", NS_VERSION);
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	712
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	713 jab_send(jc, x);
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	714 xmlnode_free(x);
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	715 }
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	716
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	717 static void handle_iq_version(jconn conn, char from, const char id,
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	718 xmlnode xmldata)
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	719 {
995 c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	720 xmlnode x;
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	721 xmlnode myquery;
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	722 char *os = NULL;
814 109dcf5fc111 Use hgcset (if available) when answering to IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 782 diff changeset	723 char *ver = mcabber_version();
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	724
692 d3511f846d47 Cosmetics (line wrapping) Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	725 scr_LogPrint(LPRINT_LOGNORM, "Received an IQ version request from <%s>",
d3511f846d47 Cosmetics (line wrapping) Mikael Berthe <mikael@lilotux.net> parents: 691 diff changeset	726 from);
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	727
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	728 if (!settings_opt_get_int("iq_version_hide_os")) {
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	729 struct utsname osinfo;
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	730 uname(&osinfo);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	731 os = g_strdup_printf("%s %s %s", osinfo.sysname, osinfo.release,
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	732 osinfo.machine);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	733 }
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	734
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	735 x = jutil_iqnew(JPACKET__RESULT, NS_VERSION);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	736 xmlnode_put_attrib(x, "id", id);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	737 xmlnode_put_attrib(x, "to", xmlnode_get_attrib(xmldata, "from"));
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	738 myquery = xmlnode_get_tag(x, "query");
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	739
814 109dcf5fc111 Use hgcset (if available) when answering to IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 782 diff changeset	740 xmlnode_insert_cdata(xmlnode_insert_tag(myquery, "name"), PACKAGE_NAME, -1);
109dcf5fc111 Use hgcset (if available) when answering to IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 782 diff changeset	741 xmlnode_insert_cdata(xmlnode_insert_tag(myquery, "version"), ver, -1);
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	742 if (os) {
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	743 xmlnode_insert_cdata(xmlnode_insert_tag(myquery, "os"), os, -1);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	744 g_free(os);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	745 }
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	746
814 109dcf5fc111 Use hgcset (if available) when answering to IQ:version requests Mikael Berthe <mikael@lilotux.net> parents: 782 diff changeset	747 g_free(ver);
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	748 jab_send(jc, x);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	749 xmlnode_free(x);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	750 }
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	751
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	752 // This function borrows some code from the Gaim project
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	753 static void handle_iq_time(jconn conn, char from, const char id,
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	754 xmlnode xmldata)
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	755 {
995 c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	756 xmlnode x;
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	757 xmlnode myquery;
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	758 char buf, utf8_buf;
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	759 time_t now_t;
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	760 struct tm *now;
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	761
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	762 time(&now_t);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	763
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	764 scr_LogPrint(LPRINT_LOGNORM, "Received an IQ time request from <%s>", from);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	765
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	766 buf = g_new0(char, 512);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	767
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	768 x = jutil_iqnew(JPACKET__RESULT, NS_TIME);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	769 xmlnode_put_attrib(x, "id", id);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	770 xmlnode_put_attrib(x, "to", xmlnode_get_attrib(xmldata, "from"));
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	771 myquery = xmlnode_get_tag(x, "query");
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	772
703 8cbcbff8de7d Fix UTC time in IQ:version queries Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	773 now = gmtime(&now_t);
8cbcbff8de7d Fix UTC time in IQ:version queries Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	774
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	775 strftime(buf, 512, "%Y%m%dT%T", now);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	776 xmlnode_insert_cdata(xmlnode_insert_tag(myquery, "utc"), buf, -1);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	777
703 8cbcbff8de7d Fix UTC time in IQ:version queries Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	778 now = localtime(&now_t);
8cbcbff8de7d Fix UTC time in IQ:version queries Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	779
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	780 strftime(buf, 512, "%Z", now);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	781 if ((utf8_buf = to_utf8(buf))) {
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	782 xmlnode_insert_cdata(xmlnode_insert_tag(myquery, "tz"), utf8_buf, -1);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	783 g_free(utf8_buf);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	784 }
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	785
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	786 strftime(buf, 512, "%d %b %Y %T", now);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	787 if ((utf8_buf = to_utf8(buf))) {
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	788 xmlnode_insert_cdata(xmlnode_insert_tag(myquery, "display"), utf8_buf, -1);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	789 g_free(utf8_buf);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	790 }
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	791
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	792 jab_send(jc, x);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	793 xmlnode_free(x);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	794 g_free(buf);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	795 }
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	796
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	797 // This function borrows some code from the Gaim project
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	798 static void handle_iq_get(jconn conn, char *from, xmlnode xmldata)
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	799 {
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	800 const char id, ns;
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	801 xmlnode x, y, z;
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	802 guint iq_not_implemented = FALSE;
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	803
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	804 id = xmlnode_get_attrib(xmldata, "id");
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	805 if (!id) {
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	806 scr_LogPrint(LPRINT_LOG, "IQ get stanza with no ID, ignored.");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	807 return;
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	808 }
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	809
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	810 x = xmlnode_get_tag(xmldata, "query");
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	811 ns = xmlnode_get_attrib(x, "xmlns");
995 c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	812 if (ns && !strcmp(ns, NS_DISCO_INFO)) {
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	813 handle_iq_disco_info(conn, from, id, xmldata);
c89e7993c4d9 Answer IQ disco#info queries Mikael Berthe <mikael@lilotux.net> parents: 977 diff changeset	814 } else if (ns && !strcmp(ns, NS_VERSION)) {
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	815 handle_iq_version(conn, from, id, xmldata);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	816 } else if (ns && !strcmp(ns, NS_TIME)) {
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	817 handle_iq_time(conn, from, id, xmldata);
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	818 } else {
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	819 iq_not_implemented = TRUE;
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	820 }
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	821
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	822 if (!iq_not_implemented)
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	823 return;
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	824
44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	825 // Not implemented.
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	826 x = xmlnode_dup(xmldata);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	827 xmlnode_put_attrib(x, "to", xmlnode_get_attrib(xmldata, "from"));
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	828 xmlnode_hide_attrib(x, "from");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	829
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	830 xmlnode_put_attrib(x, "type", TMSG_ERROR);
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	831 y = xmlnode_insert_tag(x, TMSG_ERROR);
595 0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	832 xmlnode_put_attrib(y, "code", "501");
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	833 xmlnode_put_attrib(y, "type", "cancel");
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	834 z = xmlnode_insert_tag(y, "feature-not-implemented");
595 0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	835 xmlnode_put_attrib(z, "xmlns", NS_XMPP_STANZAS);
596 6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	836
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	837 jab_send(conn, x);
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	838 xmlnode_free(x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	839 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	840
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	841 static void handle_iq_set(jconn conn, char *from, xmlnode xmldata)
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	842 {
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	843 const char id, ns;
595 0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	844 xmlnode x, y, z;
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	845 guint iq_not_implemented = FALSE;
595 0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	846
0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	847 id = xmlnode_get_attrib(xmldata, "id");
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	848 if (!id)
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	849 scr_LogPrint(LPRINT_LOG, "IQ set stanza with no ID...");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	850
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	851 x = xmlnode_get_tag(xmldata, "query");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	852 ns = xmlnode_get_attrib(x, "xmlns");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	853 if (ns && !strcmp(ns, NS_ROSTER)) {
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	854 handle_iq_roster(x);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	855 } else {
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	856 iq_not_implemented = TRUE;
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	857 }
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	858
595 0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	859 if (!id) return;
0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	860
619 44ddf9bec3a5 Answer IQ:version & IQ:time requests Mikael Berthe <mikael@lilotux.net> parents: 613 diff changeset	861 if (!iq_not_implemented) {
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	862 x = xmlnode_new_tag("iq");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	863 xmlnode_put_attrib(x, "to", xmlnode_get_attrib(xmldata, "from"));
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	864 xmlnode_put_attrib(x, "type", "result");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	865 xmlnode_put_attrib(x, "id", id);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	866 } else {
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	867 /* Not implemented yet: send an error stanza */
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	868 x = xmlnode_dup(xmldata);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	869 xmlnode_put_attrib(x, "to", xmlnode_get_attrib(xmldata, "from"));
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	870 xmlnode_hide_attrib(x, "from");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	871 xmlnode_put_attrib(x, "type", "result");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	872 xmlnode_put_attrib(x, "type", TMSG_ERROR);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	873 y = xmlnode_insert_tag(x, TMSG_ERROR);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	874 xmlnode_put_attrib(y, "code", "501");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	875 xmlnode_put_attrib(y, "type", "cancel");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	876 z = xmlnode_insert_tag(y, "feature-not-implemented");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	877 xmlnode_put_attrib(z, "xmlns", NS_XMPP_STANZAS);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	878 }
595 0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	879
0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	880 jab_send(conn, x);
0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	881 xmlnode_free(x);
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	882 }
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	883
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	884 void handle_packet_iq(jconn conn, char type, char from, xmlnode xmldata)
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	885 {
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	886 if (!type)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	887 return;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	888
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	889 if (!strcmp(type, "result")) {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	890 handle_iq_result(conn, from, xmldata);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	891 } else if (!strcmp(type, "get")) {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	892 handle_iq_get(conn, from, xmldata);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	893 } else if (!strcmp(type, "set")) {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	894 handle_iq_set(conn, from, xmldata);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	895 } else if (!strcmp(type, TMSG_ERROR)) {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	896 xmlnode x = xmlnode_get_tag(xmldata, TMSG_ERROR);
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	897 if (x)
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	898 display_server_error(x);
698 60522cf6d325 Propagate context to IQ callback functions Mikael Berthe <mikael@lilotux.net> parents: 692 diff changeset	899 iqs_callback(xmlnode_get_attrib(xmldata, "id"), NULL, IQS_CONTEXT_ERROR);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	900 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	901 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	902
1008 bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	903 // send_storage_bookmarks()
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	904 // Send the current bookmarks node to update the server.
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	905 // Note: the sender should check we're online.
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	906 void send_storage_bookmarks(void)
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	907 {
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	908 eviqs *iqn;
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	909
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	910 if (!bookmarks) return;
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	911
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	912 iqn = iqs_new(JPACKET__SET, NS_PRIVATE, "storage", IQS_DEFAULT_TIMEOUT);
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	913 xmlnode_insert_node(xmlnode_get_tag(iqn->xmldata, "query"), bookmarks);
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	914
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	915 jab_send(jc, iqn->xmldata);
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	916 iqs_del(iqn->id); // XXX
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	917 }
bbf53cd43fbb Functions to update room bookmarks Mikael Berthe <mikael@lilotux.net> parents: 1006 diff changeset	918
580 fed6d1e4d7a9 Fix modelines Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	919 /* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */

Mercurial > ~mikael > mcabber > hg

annotate mcabber/src/jab_iq.c @ 1014:99c5278bf6b8