mcabber: mcabber/libjabber/jutil.c annotate

annotate mcabber/libjabber/jutil.c @ 1424:bb1cc8902d0e

Allow "/buffer list" when debugging mode is disabled

author	Mikael Berthe <mikael@lilotux.net>
date	Sun, 17 Feb 2008 21:19:48 +0100
parents	f791f5f0cfce
children

rev	line source
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	1 /*
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	2 * This program is free software; you can redistribute it and/or modify
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	3 * it under the terms of the GNU General Public License as published by
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	4 * the Free Software Foundation; either version 2 of the License, or
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	5 * (at your option) any later version.
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	6 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	7 * This program is distributed in the hope that it will be useful,
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	8 * but WITHOUT ANY WARRANTY; without even the implied warranty of
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	9 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	10 * GNU General Public License for more details.
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	11 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	12 * You should have received a copy of the GNU General Public License
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	13 * along with this program; if not, write to the Free Software
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	14 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	15 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	16 * Copyrights
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	17 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	18 * Portions created by or assigned to Jabber.com, Inc. are
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	19 * Copyright (c) 1999-2002 Jabber.com, Inc. All Rights Reserved. Contact
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	20 * information for Jabber.com, Inc. is available at http://www.jabber.com/.
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	21 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	22 * Portions Copyright (c) 1998-1999 Jeremie Miller.
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	23 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	24 * Acknowledgements
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	25 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	26 * Special thanks to the Jabber Open Source Contributors for their
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	27 * suggestions and support of Jabber.
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	28 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	29 */
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	30
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	31 /**
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	32 * @file jutil.c
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	33 * @brief various utilities mainly for handling xmlnodes containing stanzas
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	34 */
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	35
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	36 #include "jabber.h"
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	37
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	38 /**
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	39 * utility for making presence stanzas
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	40 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	41 * @param type the type of the presence (one of the JPACKET__* contants)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	42 * @param to to whom the presence should be sent, NULL for a broadcast presence
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	43 * @param status optional status (CDATA for the <status/> element, NULL for now <status/> element)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	44 * @return the xmlnode containing the created presence stanza
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	45 */
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	46 xmlnode jutil_presnew(int type, char to, char status)
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	47 {
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	48 xmlnode pres;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	49
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	50 pres = xmlnode_new_tag("presence");
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	51 switch(type)
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	52 {
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	53 case JPACKET__SUBSCRIBE:
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	54 xmlnode_put_attrib(pres,"type","subscribe");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	55 break;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	56 case JPACKET__UNSUBSCRIBE:
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	57 xmlnode_put_attrib(pres,"type","unsubscribe");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	58 break;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	59 case JPACKET__SUBSCRIBED:
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	60 xmlnode_put_attrib(pres,"type","subscribed");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	61 break;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	62 case JPACKET__UNSUBSCRIBED:
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	63 xmlnode_put_attrib(pres,"type","unsubscribed");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	64 break;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	65 case JPACKET__PROBE:
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	66 xmlnode_put_attrib(pres,"type","probe");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	67 break;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	68 case JPACKET__UNAVAILABLE:
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	69 xmlnode_put_attrib(pres,"type","unavailable");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	70 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	71 case JPACKET__INVISIBLE:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	72 xmlnode_put_attrib(pres,"type","invisible");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	73 break;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	74 }
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	75 if(to != NULL)
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	76 xmlnode_put_attrib(pres,"to",to);
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	77 if(status != NULL)
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	78 xmlnode_insert_cdata(xmlnode_insert_tag(pres,"status"),status,strlen(status));
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	79
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	80 return pres;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	81 }
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	82
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	83 /**
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	84 * utility for making IQ stanzas, that contain a <query/> element in a different namespace
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	85 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	86 * @note In traditional Jabber protocols the element inside an iq element has the name "query".
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	87 * This util is not able to create IQ stanzas that contain a query which a element that does
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	88 * not have the name "query"
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	89 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	90 * @param type the type of the iq stanza (one of JPACKET__GET, JPACKET__SET, JPACKET__RESULT, JPACKET__ERROR)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	91 * @param ns the namespace of the <query/> element
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	92 * @return the created xmlnode
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	93 */
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	94 xmlnode jutil_iqnew(int type, char *ns)
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	95 {
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	96 xmlnode iq;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	97
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	98 iq = xmlnode_new_tag("iq");
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	99 switch(type)
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	100 {
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	101 case JPACKET__GET:
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	102 xmlnode_put_attrib(iq,"type","get");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	103 break;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	104 case JPACKET__SET:
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	105 xmlnode_put_attrib(iq,"type","set");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	106 break;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	107 case JPACKET__RESULT:
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	108 xmlnode_put_attrib(iq,"type","result");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	109 break;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	110 case JPACKET__ERROR:
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	111 xmlnode_put_attrib(iq,"type","error");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	112 break;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	113 }
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	114 xmlnode_put_attrib(xmlnode_insert_tag(iq,"query"),"xmlns",ns);
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	115
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	116 return iq;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	117 }
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	118
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	119 /**
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	120 * utility for making message stanzas
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	121 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	122 * @param type the type of the message (as a string!)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	123 * @param to the recipient of the message
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	124 * @param subj the subject of the message (NULL for no subject element)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	125 * @param body the body of the message
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	126 * @return the xmlnode containing the new message stanza
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	127 */
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	128 xmlnode jutil_msgnew(char type, char to, char subj, char body)
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	129 {
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	130 xmlnode msg;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	131
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	132 msg = xmlnode_new_tag("message");
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	133
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	134 if (type != NULL) {
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	135 xmlnode_put_attrib (msg, "type", type);
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	136 }
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	137
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	138 if (to != NULL) {
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	139 xmlnode_put_attrib (msg, "to", to);
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	140 }
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	141
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	142 if (subj != NULL) {
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	143 xmlnode_insert_cdata(xmlnode_insert_tag(msg, "subject"), subj, strlen(subj));
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	144 }
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	145
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	146 if (body != NULL) {
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	147 xmlnode_insert_cdata(xmlnode_insert_tag(msg, "body"), body, strlen(body));
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	148 }
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	149
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	150 return msg;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	151 }
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	152
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	153 /**
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	154 * utility for making stream packets (containing the stream header element)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	155 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	156 * @param xmlns the default namespace of the stream (e.g. jabber:client or jabber:server)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	157 * @param server the domain of the server
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	158 * @return the xmlnode containing the root element of the stream
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	159 */
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	160 xmlnode jutil_header(char* xmlns, char* server)
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	161 {
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	162 xmlnode result;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	163 if ((xmlns == NULL)\|\|(server == NULL))
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	164 return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	165 result = xmlnode_new_tag("stream:stream");
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	166 xmlnode_put_attrib(result, "xmlns:stream", "http://etherx.jabber.org/streams");
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	167 xmlnode_put_attrib(result, "xmlns", xmlns);
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	168 xmlnode_put_attrib(result, "to", server);
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	169
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	170 return result;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	171 }
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	172
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	173 /**
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	174 * returns the priority on an available presence packet
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	175 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	176 * @param xmlnode the xmlnode containing the presence packet
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	177 * @return the presence priority, -129 for unavailable presences and errors
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	178 */
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	179 int jutil_priority(xmlnode x)
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	180 {
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	181 char *str;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	182 int p;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	183
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	184 if(x == NULL)
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	185 return -129;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	186
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	187 if(xmlnode_get_attrib(x,"type") != NULL)
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	188 return -129;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	189
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	190 x = xmlnode_get_tag(x,"priority");
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	191 if(x == NULL)
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	192 return 0;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	193
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	194 str = xmlnode_get_data((x));
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	195 if(str == NULL)
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	196 return 0;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	197
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	198 p = atoi(str);
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	199 /* xmpp-im section 2.2.2.3 */
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	200 return p<-128 ? -128 : p>127 ? 127 : p;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	201 }
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	202
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	203 /**
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	204 * reverse sender and destination of a packet
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	205 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	206 * @param x the xmlnode where sender and receiver should be exchanged
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	207 */
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	208 void jutil_tofrom(xmlnode x)
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	209 {
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	210 char to, from;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	211
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	212 to = xmlnode_get_attrib(x,"to");
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	213 from = xmlnode_get_attrib(x,"from");
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	214 xmlnode_put_attrib(x,"from",to);
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	215 xmlnode_put_attrib(x,"to",from);
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	216 }
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	217
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	218 /**
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	219 * change and xmlnode to be the result xmlnode for the original iq query
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	220 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	221 * @param x the xmlnode that should become the result for itself
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	222 * @return the result xmlnode (same as given as parameter x)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	223 */
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	224 xmlnode jutil_iqresult(xmlnode x)
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	225 {
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	226 xmlnode cur;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	227
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	228 jutil_tofrom(x);
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	229
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	230 xmlnode_put_attrib(x,"type","result");
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	231
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	232 /* hide all children of the iq, they go back empty */
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	233 for(cur = xmlnode_get_firstchild(x); cur != NULL; cur = xmlnode_get_nextsibling(cur))
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	234 xmlnode_hide(cur);
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	235
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	236 return x;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	237 }
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	238
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	239 /**
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	240 * get the present time as a textual timestamp in the format YYYYMMDDTHH:MM:SS
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	241 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	242 * @note this function is not thread safe
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	243 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	244 * @return pointer to a static (!) buffer containing the timestamp (or NULL on failure)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	245 */
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	246 char *jutil_timestamp(void)
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	247 {
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	248 time_t t;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	249 struct tm *new_time;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	250 static char timestamp[18];
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	251 int ret;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	252
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	253 t = time(NULL);
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	254
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	255 if(t == (time_t)-1)
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	256 return NULL;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	257 new_time = gmtime(&t);
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	258
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	259 ret = snprintf(timestamp, 18, "%d%02d%02dT%02d:%02d:%02d", 1900+new_time->tm_year,
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	260 new_time->tm_mon+1, new_time->tm_mday, new_time->tm_hour,
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	261 new_time->tm_min, new_time->tm_sec);
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	262
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	263 if(ret == -1)
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	264 return NULL;
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	265
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	266 return timestamp;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	267 }
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	268
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	269 /**
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	270 * map a terror structure to a xterror structure
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	271 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	272 * terror structures have been used in jabberd14 up to version 1.4.3 but
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	273 * are not able to hold XMPP compliant stanza errors. The xterror
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	274 * structure has been introduced to be XMPP compliant. This function
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	275 * is to ease writting wrappers that accept terror structures and call
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	276 * the real functions that require now xterror structures
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	277 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	278 * @param old the terror struct that should be converted
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	279 * @param mapped pointer to the xterror struct that should be filled with the converted error
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	280 */
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	281 void jutil_error_map(terror old, xterror *mapped)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	282 {
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	283 mapped->code = old.code;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	284 if (old.msg == NULL)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	285 mapped->msg[0] = 0;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	286 else
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	287 strncpy(mapped->msg, old.msg, sizeof(mapped->msg));
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	288
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	289 switch (old.code)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	290 {
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	291 case 302:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	292 strcpy(mapped->type, "modify");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	293 strcpy(mapped->condition, "redirect");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	294 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	295 case 400:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	296 strcpy(mapped->type, "modify");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	297 strcpy(mapped->condition, "bad-request");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	298 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	299 case 401:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	300 strcpy(mapped->type, "auth");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	301 strcpy(mapped->condition, "not-authorized");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	302 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	303 case 402:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	304 strcpy(mapped->type, "auth");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	305 strcpy(mapped->condition, "payment-required");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	306 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	307 case 403:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	308 strcpy(mapped->type, "auth");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	309 strcpy(mapped->condition, "forbidden");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	310 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	311 case 404:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	312 strcpy(mapped->type, "cancel");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	313 strcpy(mapped->condition, "item-not-found");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	314 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	315 case 405:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	316 strcpy(mapped->type, "cancel");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	317 strcpy(mapped->condition, "not-allowed");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	318 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	319 case 406:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	320 strcpy(mapped->type, "modify");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	321 strcpy(mapped->condition, "not-acceptable");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	322 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	323 case 407:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	324 strcpy(mapped->type, "auth");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	325 strcpy(mapped->condition, "registration-requited");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	326 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	327 case 408:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	328 strcpy(mapped->type, "wait");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	329 strcpy(mapped->condition, "remote-server-timeout");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	330 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	331 case 409:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	332 strcpy(mapped->type, "cancel");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	333 strcpy(mapped->condition, "conflict");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	334 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	335 case 500:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	336 strcpy(mapped->type, "wait");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	337 strcpy(mapped->condition, "internal-server-error");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	338 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	339 case 501:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	340 strcpy(mapped->type, "cancel");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	341 strcpy(mapped->condition, "feature-not-implemented");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	342 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	343 case 502:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	344 strcpy(mapped->type, "wait");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	345 strcpy(mapped->condition, "service-unavailable");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	346 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	347 case 503:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	348 strcpy(mapped->type, "cancel");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	349 strcpy(mapped->condition, "service-unavailable");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	350 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	351 case 504:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	352 strcpy(mapped->type, "wait");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	353 strcpy(mapped->condition, "remote-server-timeout");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	354 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	355 case 510:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	356 strcpy(mapped->type, "cancel");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	357 strcpy(mapped->condition, "service-unavailable");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	358 break;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	359 default:
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	360 strcpy(mapped->type, "wait");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	361 strcpy(mapped->condition, "undefined-condition");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	362 }
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	363 }
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	364
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	365 /**
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	366 * update an xmlnode to be the error stanza for itself
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	367 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	368 * @param x the xmlnode that should become an stanza error message
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	369 * @param E the structure that holds the error information
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	370 */
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	371 void jutil_error_xmpp(xmlnode x, xterror E)
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	372 {
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	373 xmlnode err;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	374 char code[4];
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	375
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	376 xmlnode_put_attrib(x, "type", "error");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	377 err = xmlnode_insert_tag(x, "error");
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	378
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	379 snprintf(code, sizeof(code), "%d", E.code);
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	380 xmlnode_put_attrib(err, "code", code);
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	381 if (E.type != NULL)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	382 xmlnode_put_attrib(err, "type", E.type);
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	383 if (E.condition != NULL)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	384 xmlnode_put_attrib(xmlnode_insert_tag(err, E.condition), "xmlns", NS_XMPP_STANZAS);
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	385 if (E.msg != NULL)
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	386 {
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	387 xmlnode text;
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	388 text = xmlnode_insert_tag(err, "text");
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	389 xmlnode_put_attrib(text, "xmlns", NS_XMPP_STANZAS);
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	390 xmlnode_insert_cdata(text, E.msg, strlen(E.msg));
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	391 }
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	392
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	393 jutil_tofrom(x);
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	394 }
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	395
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	396 /**
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	397 * add a delayed delivery (JEP-0091) element to a message using the
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	398 * present timestamp.
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	399 * If a reason is given, this reason will be added as CDATA to the
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	400 * inserted element
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	401 *
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	402 * @param msg the message where the element should be added
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	403 * @param reason plain text information why the delayed delivery information has been added
c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	404 */
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	405 void jutil_delay(xmlnode msg, char *reason)
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	406 {
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	407 xmlnode delay;
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	408
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	409 delay = xmlnode_insert_tag(msg,"x");
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	410 xmlnode_put_attrib(delay,"xmlns",NS_DELAY);
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	411 xmlnode_put_attrib(delay,"from",xmlnode_get_attrib(msg,"to"));
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	412 xmlnode_put_attrib(delay,"stamp",jutil_timestamp());
bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	413 if(reason != NULL)
417 c3ae9251c197 Sync libjabber with upstream Mikael Berthe <mikael@lilotux.net> parents: 25 diff changeset	414 xmlnode_insert_cdata(delay,reason,strlen(reason));
25 bf3d6e241714 [/trunk] Changeset 41 by mikael mikael parents: diff changeset	415 }

Mercurial > ~mikael > mcabber > hg

annotate mcabber/libjabber/jutil.c @ 1424:bb1cc8902d0e