mcabber: mcabber/src/jab

annotate mcabber/src/jab_iq.c @ 613:a6b8b373e4de

Try to guess if a roster item is an agent For now we look if the jid contains a '@'...

author	Mikael Berthe <mikael@lilotux.net>
date	Thu, 15 Dec 2005 23:29:56 +0100
parents	cf722bff6579
children	44ddf9bec3a5

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 *
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	4 * Copyright (C) 2005 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>
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	7 *
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	8 * This program is free software; you can redistribute it and/or modify
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	9 * it under the terms of the GNU General Public License as published by
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	10 * the Free Software Foundation; either version 2 of the License, or (at
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	11 * your option) any later version.
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	12 *
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	13 * This program is distributed in the hope that it will be useful, but
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	16 * General Public License for more details.
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	17 *
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	18 * You should have received a copy of the GNU General Public License
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	19 * along with this program; if not, write to the Free Software
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	21 * USA
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	22 */
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	23
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	24 #include <glib.h>
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	25
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	26 #include "jabglue.h"
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	27 #include "jab_priv.h"
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 52 diff changeset	28 #include "roster.h"
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	29 #include "utils.h"
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	30 #include "screen.h"
164 faf534be8ff0 [/trunk] Changeset 176 by mikael mikael parents: 159 diff changeset	31
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	32 int s_id; // XXX
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	33
606 0b4ed231ebc2 Code cleanup + remove deprecated Agents list IQ request Mikael Berthe <mikael@lilotux.net> parents: 605 diff changeset	34 static void request_roster(void)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	35 {
606 0b4ed231ebc2 Code cleanup + remove deprecated Agents list IQ request Mikael Berthe <mikael@lilotux.net> parents: 605 diff changeset	36 xmlnode x = jutil_iqnew(JPACKET__GET, NS_ROSTER);
0b4ed231ebc2 Code cleanup + remove deprecated Agents list IQ request Mikael Berthe <mikael@lilotux.net> parents: 605 diff changeset	37 xmlnode_put_attrib(x, "id", "Roster1"); // XXX
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	38 jab_send(jc, x);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	39 xmlnode_free(x);
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	40 }
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	41
606 0b4ed231ebc2 Code cleanup + remove deprecated Agents list IQ request Mikael Berthe <mikael@lilotux.net> parents: 605 diff changeset	42 static void handle_iq_roster(xmlnode x)
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	43 {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	44 xmlnode y;
605 2a4fefb98511 Set the subscription pending flag Mikael Berthe <mikael@lilotux.net> parents: 603 diff changeset	45 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	46 char *buddyname;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	47 char *cleanalias;
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	48 enum subscr esub;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	49 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	50 guint roster_type;
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	51
86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	52 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	53 gchar *name_noutf8 = NULL;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	54 gchar *group_noutf8 = NULL;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	55
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	56 jid = xmlnode_get_attrib(y, "jid");
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	57 name = xmlnode_get_attrib(y, "name");
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	58 sub = xmlnode_get_attrib(y, "subscription");
605 2a4fefb98511 Set the subscription pending flag Mikael Berthe <mikael@lilotux.net> parents: 603 diff changeset	59 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	60
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	61 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	62
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	63 if (!jid)
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	64 continue;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	65
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	66 buddyname = cleanalias = jidtodisp(jid);
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	67
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	68 esub = sub_none;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	69 if (sub) {
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	70 if (!strcmp(sub, "to")) esub = sub_to;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	71 else if (!strcmp(sub, "from")) esub = sub_from;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	72 else if (!strcmp(sub, "both")) esub = sub_both;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	73 else if (!strcmp(sub, "remove")) esub = sub_remove;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	74 }
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	75
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	76 if (esub == sub_remove) {
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	77 roster_del_user(cleanalias);
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	78 scr_LogPrint(LPRINT_LOGNORM, "Buddy <%s> has been removed "
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	79 "from the roster", cleanalias);
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	80 g_free(cleanalias);
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	81 need_refresh = TRUE;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	82 continue;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	83 }
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	84
605 2a4fefb98511 Set the subscription pending flag Mikael Berthe <mikael@lilotux.net> parents: 603 diff changeset	85 if (ask && !strcmp(ask, "subscribe"))
2a4fefb98511 Set the subscription pending flag Mikael Berthe <mikael@lilotux.net> parents: 603 diff changeset	86 esub \|= sub_pending;
2a4fefb98511 Set the subscription pending flag Mikael Berthe <mikael@lilotux.net> parents: 603 diff changeset	87
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	88 if (name) {
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	89 name_noutf8 = from_utf8(name);
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	90 if (name_noutf8)
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	91 buddyname = name_noutf8;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	92 else
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	93 scr_LogPrint(LPRINT_LOG, "Decoding of buddy alias has failed: %s",
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	94 name);
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	95 }
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	96
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	97 if (group) {
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	98 group_noutf8 = from_utf8(group);
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	99 if (!group_noutf8)
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	100 scr_LogPrint(LPRINT_LOG, "Decoding of buddy group has failed: %s",
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	101 group);
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	102 }
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	103
613 a6b8b373e4de Try to guess if a roster item is an agent Mikael Berthe <mikael@lilotux.net> parents: 607 diff changeset	104 // Tricky... :-\ My guess is that if there is no '@', this is an agent
a6b8b373e4de Try to guess if a roster item is an agent Mikael Berthe <mikael@lilotux.net> parents: 607 diff changeset	105 if (strchr(cleanalias, '@'))
a6b8b373e4de Try to guess if a roster item is an agent Mikael Berthe <mikael@lilotux.net> parents: 607 diff changeset	106 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	107 else
a6b8b373e4de Try to guess if a roster item is an agent Mikael Berthe <mikael@lilotux.net> parents: 607 diff changeset	108 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	109
a6b8b373e4de Try to guess if a roster item is an agent Mikael Berthe <mikael@lilotux.net> parents: 607 diff changeset	110 roster_add_user(cleanalias, buddyname, group_noutf8, roster_type, esub);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	111
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	112 if (name_noutf8) g_free(name_noutf8);
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	113 if (group_noutf8) g_free(group_noutf8);
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	114 g_free(cleanalias);
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	115 }
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	116
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	117 buddylist_build();
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	118 update_roster = TRUE;
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	119 if (need_refresh)
9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	120 scr_ShowBuddyWindow();
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	121 }
29 86837ff0554c [/trunk] Changeset 45 by mikael mikael parents: diff changeset	122
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	123 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	124 {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	125 xmlnode x;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	126 char *p;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	127 char *ns;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	128
596 6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	129 p = xmlnode_get_attrib(xmldata, "id");
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	130 if (!p) {
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	131 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	132 return;
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	133 }
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	134
597 96831b222903 Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 596 diff changeset	135 if (atoi(p) == s_id) { // Authentication XXX
596 6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	136 if (jstate == STATE_GETAUTH) {
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	137 if ((x = xmlnode_get_tag(xmldata, "query")) != NULL)
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	138 if (!xmlnode_get_tag(x, "digest")) {
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	139 jc->sid = 0;
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	140 }
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	141
596 6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	142 s_id = atoi(jab_auth(jc));
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	143 jstate = STATE_SENDAUTH;
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	144 } else if (jstate == STATE_SENDAUTH) {
606 0b4ed231ebc2 Code cleanup + remove deprecated Agents list IQ request Mikael Berthe <mikael@lilotux.net> parents: 605 diff changeset	145 request_roster();
596 6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	146 jstate = STATE_LOGGED;
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	147 }
596 6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	148 return;
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	149 }
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	150
606 0b4ed231ebc2 Code cleanup + remove deprecated Agents list IQ request Mikael Berthe <mikael@lilotux.net> parents: 605 diff changeset	151 /*
596 6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	152 if (!strcmp(p, "VCARDreq")) {
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	153 x = xmlnode_get_firstchild(xmldata);
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	154 if (!x) x = xmldata;
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	155
596 6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	156 scr_LogPrint(LPRINT_LOGNORM, "Got VCARD"); // TODO
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	157 return;
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	158 } else if (!strcmp(p, "versionreq")) {
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	159 scr_LogPrint(LPRINT_LOGNORM, "Got version"); // TODO
6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	160 return;
430 d03663d2e7d9 Display error messages as specified in RFC3920 (9.3) Mikael Berthe <mikael@lilotux.net> parents: 426 diff changeset	161 }
606 0b4ed231ebc2 Code cleanup + remove deprecated Agents list IQ request Mikael Berthe <mikael@lilotux.net> parents: 605 diff changeset	162 */
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	163
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	164 x = xmlnode_get_tag(xmldata, "query");
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	165 if (!x) return;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	166
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	167 ns = xmlnode_get_attrib(x, "xmlns");
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	168 if (!ns) return;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	169
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	170 if (!strcmp(ns, NS_ROSTER)) {
606 0b4ed231ebc2 Code cleanup + remove deprecated Agents list IQ request Mikael Berthe <mikael@lilotux.net> parents: 605 diff changeset	171 handle_iq_roster(x);
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	172
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	173 // Post-login stuff
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	174 // Usually we request the roster only at connection time
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	175 // so we should be there only once. (That's ugly, however)
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 597 diff changeset	176 jb_setstatus(available, NULL, NULL);
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	177 }
426 2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	178 }
2706ef3e25a7 Better handling of server error codes/messages Mikael Berthe <mikael@lilotux.net> parents: 421 diff changeset	179
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	180 static void handle_iq_get(jconn conn, char *from, xmlnode xmldata)
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	181 {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	182 char *id;
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	183 xmlnode x, y, z;
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	184
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	185 id = xmlnode_get_attrib(xmldata, "id");
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	186 if (!id) {
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	187 scr_LogPrint(LPRINT_LOG, "IQ get stanza with no ID, ignored.");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	188 return;
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	189 }
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	190
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	191 // Nothing implemented yet.
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	192 x = xmlnode_dup(xmldata);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	193 xmlnode_put_attrib(x, "to", xmlnode_get_attrib(xmldata, "from"));
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	194 xmlnode_hide_attrib(x, "from");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	195
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	196 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	197 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	198 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	199 xmlnode_put_attrib(y, "type", "cancel");
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	200 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	201 xmlnode_put_attrib(z, "xmlns", NS_XMPP_STANZAS);
596 6c7fd289648f Clean up handle_iq_result() Mikael Berthe <mikael@lilotux.net> parents: 595 diff changeset	202
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	203 jab_send(conn, x);
5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	204 xmlnode_free(x);
31 0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	205 }
0f0fbd0c4a7f [/trunk] Changeset 47 by mikael mikael parents: 29 diff changeset	206
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	207 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	208 {
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	209 char id, ns;
595 0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	210 xmlnode x, y, z;
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	211 guint iq_error = FALSE;
595 0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	212
0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	213 id = xmlnode_get_attrib(xmldata, "id");
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	214 if (!id)
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	215 scr_LogPrint(LPRINT_LOG, "IQ set stanza with no ID...");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	216
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	217 x = xmlnode_get_tag(xmldata, "query");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	218 ns = xmlnode_get_attrib(x, "xmlns");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	219 if (ns && !strcmp(ns, NS_ROSTER)) {
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	220 handle_iq_roster(x);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	221 } else {
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	222 iq_error = TRUE;
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	223 }
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	224
595 0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	225 if (!id) return;
0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	226
607 cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	227 if (!iq_error) {
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	228 x = xmlnode_new_tag("iq");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	229 xmlnode_put_attrib(x, "to", xmlnode_get_attrib(xmldata, "from"));
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	230 xmlnode_put_attrib(x, "type", "result");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	231 xmlnode_put_attrib(x, "id", id);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	232 } else {
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	233 /* Not implemented yet: send an error stanza */
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	234 x = xmlnode_dup(xmldata);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	235 xmlnode_put_attrib(x, "to", xmlnode_get_attrib(xmldata, "from"));
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	236 xmlnode_hide_attrib(x, "from");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	237 xmlnode_put_attrib(x, "type", "result");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	238 xmlnode_put_attrib(x, "type", TMSG_ERROR);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	239 y = xmlnode_insert_tag(x, TMSG_ERROR);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	240 xmlnode_put_attrib(y, "code", "501");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	241 xmlnode_put_attrib(y, "type", "cancel");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	242 z = xmlnode_insert_tag(y, "feature-not-implemented");
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	243 xmlnode_put_attrib(z, "xmlns", NS_XMPP_STANZAS);
cf722bff6579 Improve IQ management Mikael Berthe <mikael@lilotux.net> parents: 606 diff changeset	244 }
595 0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	245
0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	246 jab_send(conn, x);
0c1d37300862 IQ: send feature-not-implemented error stanzas Mikael Berthe <mikael@lilotux.net> parents: 582 diff changeset	247 xmlnode_free(x);
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	248 }
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	249
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	250 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	251 {
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	252 if (!type)
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	253 return;
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	254
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	255 if (!strcmp(type, "result")) {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	256 handle_iq_result(conn, from, xmldata);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	257 } else if (!strcmp(type, "get")) {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	258 handle_iq_get(conn, from, xmldata);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	259 } else if (!strcmp(type, "set")) {
577 5c6d364130ee Move IQ Jabber stuff to a separate file Mikael Berthe <mikael@lilotux.net> parents: 576 diff changeset	260 handle_iq_set(conn, from, xmldata);
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	261 } 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	262 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	263 if (x)
547 1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	264 display_server_error(x);
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	265 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	266 }
1df26ff0ed8c Break packethandler() out Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	267
580 fed6d1e4d7a9 Fix modelines Mikael Berthe <mikael@lilotux.net> parents: 578 diff changeset	268 /* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */

Mercurial > ~mikael > mcabber > hg

annotate mcabber/src/jab_iq.c @ 613:a6b8b373e4de