annotate mcabber/libjabber/jid.c @ 211:0627546a21fe

[/trunk] Changeset 223 by mikael * pinginterval was set to 0, but should IMHO be keeped at the default value...
author mikael
date Sun, 08 May 2005 11:24:01 +0000
parents bf3d6e241714
children c3ae9251c197
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
1 /*
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
2 * This program is free software; you can redistribute it and/or modify
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
3 * it under the terms of the GNU General Public License as published by
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
4 * the Free Software Foundation; either version 2 of the License, or
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
5 * (at your option) any later version.
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
6 *
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
7 * This program is distributed in the hope that it will be useful,
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
8 * but WITHOUT ANY WARRANTY; without even the implied warranty of
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
9 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
10 * GNU General Public License for more details.
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
11 *
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
12 * You should have received a copy of the GNU General Public License
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
13 * along with this program; if not, write to the Free Software
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
14 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
15 *
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
16 * Jabber
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
17 * Copyright (C) 1998-1999 The Jabber Team http://jabber.org/
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
18 */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
19
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
20 #include "jabber.h"
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
21
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
22 jid jid_safe(jid id)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
23 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
24 char *str;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
25
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
26 if(strlen(id->server) == 0 || strlen(id->server) > 255)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
27 return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
28
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
29 /* lowercase the hostname, make sure it's valid characters */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
30 for(str = id->server; *str != '\0'; str++)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
31 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
32 *str = tolower(*str);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
33 if(!(isalnum(*str) || *str == '.' || *str == '-' || *str == '_')) return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
34 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
35
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
36 /* cut off the user */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
37 if(id->user != NULL && strlen(id->user) > 64)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
38 id->user[64] = '\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
39
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
40 /* check for low and invalid ascii characters in the username */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
41 if(id->user != NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
42 for(str = id->user; *str != '\0'; str++)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
43 if(*str <= 32 || *str == ':' || *str == '@' || *str == '<' || *str == '>' || *str == '\'' || *str == '"' || *str == '&') return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
44
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
45 return id;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
46 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
47
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
48 jid jid_new(pool p, char *idstr)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
49 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
50 char *server, *resource, *type, *str;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
51 jid id;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
52
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
53 if(p == NULL || idstr == NULL || strlen(idstr) == 0)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
54 return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
55
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
56 /* user@server/resource */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
57
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
58 str = pstrdup(p, idstr);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
59
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
60 id = pmalloc(p,sizeof(struct jid_struct));
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
61 id->full = id->server = id->user = id->resource = NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
62 id->p = p;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
63 id->next = NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
64
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
65 resource = strstr(str,"/");
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
66 if(resource != NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
67 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
68 *resource = '\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
69 ++resource;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
70 if(strlen(resource) > 0)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
71 id->resource = resource;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
72 }else{
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
73 resource = str + strlen(str); /* point to end */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
74 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
75
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
76 type = strstr(str,":");
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
77 if(type != NULL && type < resource)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
78 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
79 *type = '\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
80 ++type;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
81 str = type; /* ignore the type: prefix */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
82 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
83
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
84 server = strstr(str,"@");
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
85 if(server == NULL || server > resource)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
86 { /* if there's no @, it's just the server address */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
87 id->server = str;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
88 }else{
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
89 *server = '\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
90 ++server;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
91 id->server = server;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
92 if(strlen(str) > 0)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
93 id->user = str;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
94 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
95
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
96 return jid_safe(id);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
97 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
98
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
99 void jid_set(jid id, char *str, int item)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
100 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
101 char *old;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
102
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
103 if(id == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
104 return;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
105
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
106 /* invalidate the cached copy */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
107 id->full = NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
108
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
109 switch(item)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
110 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
111 case JID_RESOURCE:
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
112 if(str != NULL && strlen(str) != 0)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
113 id->resource = pstrdup(id->p, str);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
114 else
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
115 id->resource = NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
116 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
117 case JID_USER:
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
118 old = id->user;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
119 if(str != NULL && strlen(str) != 0)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
120 id->user = pstrdup(id->p, str);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
121 else
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
122 id->user = NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
123 if(jid_safe(id) == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
124 id->user = old; /* revert if invalid */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
125 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
126 case JID_SERVER:
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
127 old = id->server;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
128 id->server = pstrdup(id->p, str);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
129 if(jid_safe(id) == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
130 id->server = old; /* revert if invalid */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
131 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
132 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
133
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
134 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
135
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
136 char *jid_full(jid id)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
137 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
138 spool s;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
139
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
140 if(id == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
141 return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
142
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
143 /* use cached copy */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
144 if(id->full != NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
145 return id->full;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
146
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
147 s = spool_new(id->p);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
148
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
149 if(id->user != NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
150 spooler(s, id->user,"@",s);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
151
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
152 spool_add(s, id->server);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
153
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
154 if(id->resource != NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
155 spooler(s, "/",id->resource,s);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
156
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
157 id->full = spool_print(s);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
158 return id->full;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
159 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
160
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
161 /* parses a /resource?name=value&foo=bar into an xmlnode representing <resource name="value" foo="bar"/> */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
162 xmlnode jid_xres(jid id)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
163 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
164 char *cur, *qmark, *amp, *eq;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
165 xmlnode x;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
166
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
167 if(id == NULL || id->resource == NULL) return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
168
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
169 cur = pstrdup(id->p, id->resource);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
170 qmark = strstr(cur, "?");
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
171 if(qmark == NULL) return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
172 *qmark = '\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
173 qmark++;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
174
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
175 x = _xmlnode_new(id->p, cur, NTYPE_TAG);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
176
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
177 cur = qmark;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
178 while(cur != '\0')
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
179 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
180 eq = strstr(cur, "=");
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
181 if(eq == NULL) break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
182 *eq = '\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
183 eq++;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
184
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
185 amp = strstr(eq, "&");
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
186 if(amp != NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
187 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
188 *amp = '\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
189 amp++;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
190 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
191
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
192 xmlnode_put_attrib(x,cur,eq);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
193
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
194 if(amp != NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
195 cur = amp;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
196 else
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
197 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
198 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
199
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
200 return x;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
201 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
202
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
203 /* local utils */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
204 int _jid_nullstrcmp(char *a, char *b)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
205 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
206 if(a == NULL && b == NULL) return 0;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
207 if(a == NULL || b == NULL) return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
208 return strcmp(a,b);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
209 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
210 int _jid_nullstrcasecmp(char *a, char *b)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
211 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
212 if(a == NULL && b == NULL) return 0;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
213 if(a == NULL || b == NULL) return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
214 return strcasecmp(a,b);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
215 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
216
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
217 int jid_cmp(jid a, jid b)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
218 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
219 if(a == NULL || b == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
220 return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
221
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
222 if(_jid_nullstrcmp(a->resource, b->resource) != 0) return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
223 if(_jid_nullstrcasecmp(a->user, b->user) != 0) return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
224 if(_jid_nullstrcmp(a->server, b->server) != 0) return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
225
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
226 return 0;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
227 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
228
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
229 /* suggested by Anders Qvist <quest@valdez.netg.se> */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
230 int jid_cmpx(jid a, jid b, int parts)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
231 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
232 if(a == NULL || b == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
233 return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
234
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
235 if(parts & JID_RESOURCE && _jid_nullstrcmp(a->resource, b->resource) != 0) return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
236 if(parts & JID_USER && _jid_nullstrcasecmp(a->user, b->user) != 0) return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
237 if(parts & JID_SERVER && _jid_nullstrcmp(a->server, b->server) != 0) return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
238
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
239 return 0;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
240 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
241
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
242 /* makes a copy of b in a's pool, requires a valid a first! */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
243 jid jid_append(jid a, jid b)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
244 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
245 jid next;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
246
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
247 if(a == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
248 return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
249
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
250 if(b == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
251 return a;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
252
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
253 next = a;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
254 while(next != NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
255 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
256 /* check for dups */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
257 if(jid_cmp(next,b) == 0)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
258 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
259 if(next->next == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
260 next->next = jid_new(a->p,jid_full(b));
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
261 next = next->next;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
262 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
263 return a;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
264 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
265
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
266 xmlnode jid_nodescan(jid id, xmlnode x)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
267 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
268 xmlnode cur;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
269 pool p;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
270 jid tmp;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
271
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
272 if(id == NULL || xmlnode_get_firstchild(x) == NULL) return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
273
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
274 p = pool_new();
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
275 for(cur = xmlnode_get_firstchild(x); cur != NULL; cur = xmlnode_get_nextsibling(cur))
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
276 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
277 if(xmlnode_get_type(cur) != NTYPE_TAG) continue;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
278
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
279 tmp = jid_new(p,xmlnode_get_attrib(cur,"jid"));
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
280 if(tmp == NULL) continue;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
281
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
282 if(jid_cmp(tmp,id) == 0) break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
283 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
284 pool_free(p);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
285
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
286 return cur;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
287 }