Mercurial > ~mikael > mcabber > hg
annotate mcabber/libjabber/jconn.c @ 1124:3fcb7c8af2ba
Fix a memory leak in libjabber
Memory must be freed every time, since we lose the pointer on it once we
say j->current = NULL
| author | misc@mandriva.org |
|---|---|
| date | Sat, 13 Jan 2007 11:27:48 +0100 |
| parents | b33ca4e1c37d |
| children | 2ac9bec53c37 |
| rev | line source |
|---|---|
| 25 | 1 /* |
| 2 * This program is free software; you can redistribute it and/or modify | |
| 3 * it under the terms of the GNU General Public License as published by | |
| 4 * the Free Software Foundation; either version 2 of the License, or | |
| 5 * (at your option) any later version. | |
| 6 * | |
| 7 * This program is distributed in the hope that it will be useful, | |
| 8 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 9 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 10 * GNU General Public License for more details. | |
| 11 * | |
| 12 * You should have received a copy of the GNU General Public License | |
| 13 * along with this program; if not, write to the Free Software | |
| 14 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |
| 15 * | |
| 16 * Jabber | |
| 17 * Copyright (C) 1998-1999 The Jabber Team http://jabber.org/ | |
| 18 */ | |
| 19 | |
| 20 #include "jabber.h" | |
| 21 #include "connwrap.h" | |
| 22 | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
176
diff
changeset
|
23 #include "../src/logprint.h" /* For logging */ |
| 176 | 24 |
| 25 | 25 /* local macros for launching event handlers */ |
| 26 #define STATE_EVT(arg) if(j->on_state) { (j->on_state)(j, (arg) ); } | |
| 27 | |
| 28 /* prototypes of the local functions */ | |
| 29 static void startElement(void *userdata, const char *name, const char **attribs); | |
| 30 static void endElement(void *userdata, const char *name); | |
| 31 static void charData(void *userdata, const char *s, int slen); | |
| 32 | |
| 33 /* | |
| 34 * jab_new -- initialize a new jabber connection | |
| 35 * | |
| 36 * parameters | |
| 37 * user -- jabber id of the user | |
| 38 * pass -- password of the user | |
| 39 * | |
| 40 * results | |
| 41 * a pointer to the connection structure | |
| 42 * or NULL if allocations failed | |
| 43 */ | |
|
403
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
44 jconn jab_new(char *user, char *pass, char *server, int port, int ssl) |
| 25 | 45 { |
| 46 pool p; | |
| 47 jconn j; | |
| 48 | |
| 49 if(!user) return(NULL); | |
| 50 | |
| 51 p = pool_new(); | |
| 52 if(!p) return(NULL); | |
| 53 j = pmalloc_x(p, sizeof(jconn_struct), 0); | |
| 54 if(!j) return(NULL); | |
| 55 j->p = p; | |
| 56 | |
| 57 j->user = jid_new(p, user); | |
| 58 j->pass = pstrdup(p, pass); | |
| 59 j->port = port; | |
|
403
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
60 j->server = server; |
| 25 | 61 |
| 62 j->state = JCONN_STATE_OFF; | |
| 63 j->cw_state = 0; | |
| 64 j->id = 1; | |
| 65 j->fd = -1; | |
| 66 j->ssl = ssl; | |
| 67 | |
| 68 return j; | |
| 69 } | |
| 70 | |
| 71 /* | |
| 72 * jab_delete -- free a jabber connection | |
| 73 * | |
| 74 * parameters | |
| 75 * j -- connection | |
| 76 * | |
| 77 */ | |
| 78 void jab_delete(jconn j) | |
| 79 { | |
| 80 if(!j) return; | |
| 81 | |
| 82 jab_stop(j); | |
| 83 pool_free(j->p); | |
| 84 } | |
| 85 | |
| 86 /* | |
| 87 * jab_state_handler -- set callback handler for state change | |
| 88 * | |
| 89 * parameters | |
| 90 * j -- connection | |
| 91 * h -- name of the handler function | |
| 92 */ | |
| 93 void jab_state_handler(jconn j, jconn_state_h h) | |
| 94 { | |
| 95 if(!j) return; | |
| 96 | |
| 97 j->on_state = h; | |
| 98 } | |
| 99 | |
| 100 /* | |
| 101 * jab_packet_handler -- set callback handler for incoming packets | |
| 102 * | |
| 103 * parameters | |
| 104 * j -- connection | |
| 105 * h -- name of the handler function | |
| 106 */ | |
| 107 void jab_packet_handler(jconn j, jconn_packet_h h) | |
| 108 { | |
| 109 if(!j) return; | |
| 110 | |
| 111 j->on_packet = h; | |
| 112 } | |
| 113 | |
| 114 void jab_logger(jconn j, jconn_logger h) | |
| 115 { | |
| 116 if(!j) return; | |
| 117 | |
| 118 j->logger = h; | |
| 119 } | |
| 120 | |
| 121 | |
| 122 /* | |
| 123 * jab_start -- start connection | |
| 124 * | |
| 125 * parameters | |
| 126 * j -- connection | |
| 127 * | |
| 128 */ | |
| 129 void jab_start(jconn j) | |
| 130 { | |
| 131 xmlnode x; | |
| 132 char *t,*t2; | |
| 133 | |
| 134 if(!j || (j->state != JCONN_STATE_OFF && j->state != JCONN_STATE_CONNECTING) ) return; | |
|
414
ec86d759ed54
Trailing whitespace cleanup
Mikael Berthe <mikael@lilotux.net>
parents:
403
diff
changeset
|
135 |
| 25 | 136 if (!(j->cw_state & CW_CONNECT_WANT_SOMETHING)) { /* same as state != JCONN_STATE_CONNECTING */ |
| 137 j->parser = XML_ParserCreate(NULL); | |
| 138 XML_SetUserData(j->parser, (void *)j); | |
| 139 XML_SetElementHandler(j->parser, startElement, endElement); | |
| 140 XML_SetCharacterDataHandler(j->parser, charData); | |
| 141 | |
| 142 if (j->cw_state & CW_CONNECT_BLOCKING) | |
|
403
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
143 j->fd = make_netsocket(j->port, j->server, NETSOCKET_CLIENT, j->ssl); |
| 25 | 144 else |
|
403
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
145 j->fd = make_nb_netsocket(j->port, j->server, NETSOCKET_CLIENT, j->ssl, &j->cw_state); |
|
17aa60c6dc63
Allow a different server name than the jid domain name
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
146 |
| 25 | 147 if(j->fd < 0) { |
| 148 STATE_EVT(JCONN_STATE_OFF); | |
| 149 return; | |
| 150 } | |
| 151 } | |
| 152 else { /* subsequent calls to cw_nb_connect until it finishes negociation */ | |
| 153 if (cw_nb_connect(j->fd, 0, 0, j->ssl, &j->cw_state)) { | |
|
938
40175f3dcef7
SSL server certificate verification
Jefferson Ogata <ogata@antibozo.net>
parents:
686
diff
changeset
|
154 if (cw_get_ssl_error()) |
|
40175f3dcef7
SSL server certificate verification
Jefferson Ogata <ogata@antibozo.net>
parents:
686
diff
changeset
|
155 scr_LogPrint(LPRINT_LOGNORM, "jab_start: SSL negotiation failed: %s", cw_get_ssl_error()); |
| 25 | 156 STATE_EVT(JCONN_STATE_OFF); |
| 157 return; | |
| 158 } | |
| 159 } | |
| 160 if (j->cw_state & CW_CONNECT_WANT_SOMETHING){ /* check if it finished negociation */ | |
| 161 j->state = JCONN_STATE_CONNECTING; | |
| 162 STATE_EVT(JCONN_STATE_CONNECTING); | |
| 163 return; | |
| 164 } | |
| 165 change_socket_to_blocking(j->fd); | |
|
414
ec86d759ed54
Trailing whitespace cleanup
Mikael Berthe <mikael@lilotux.net>
parents:
403
diff
changeset
|
166 |
| 25 | 167 j->state = JCONN_STATE_CONNECTED; |
| 168 STATE_EVT(JCONN_STATE_CONNECTED) | |
| 169 | |
| 170 /* start stream */ | |
| 171 x = jutil_header(NS_CLIENT, j->user->server); | |
| 172 t = xmlnode2str(x); | |
| 173 /* this is ugly, we can create the string here instead of jutil_header */ | |
| 174 /* what do you think about it? -madcat */ | |
| 175 t2 = strstr(t,"/>"); | |
| 176 *t2++ = '>'; | |
| 177 *t2 = '\0'; | |
| 178 jab_send_raw(j,"<?xml version='1.0'?>"); | |
| 179 jab_send_raw(j,t); | |
| 180 xmlnode_free(x); | |
| 181 | |
| 182 j->state = JCONN_STATE_ON; | |
| 183 STATE_EVT(JCONN_STATE_ON) | |
| 184 | |
| 185 } | |
| 186 | |
| 187 /* | |
| 188 * jab_stop -- stop connection | |
| 189 * | |
| 190 * parameters | |
| 191 * j -- connection | |
| 192 */ | |
| 193 void jab_stop(jconn j) | |
| 194 { | |
| 195 if(!j || j->state == JCONN_STATE_OFF) return; | |
| 196 | |
| 197 j->state = JCONN_STATE_OFF; | |
| 198 cw_close(j->fd); | |
| 199 j->fd = -1; | |
| 200 XML_ParserFree(j->parser); | |
| 201 } | |
| 202 | |
| 203 /* | |
| 204 * jab_getfd -- get file descriptor of connection socket | |
| 205 * | |
| 206 * parameters | |
| 207 * j -- connection | |
| 208 * | |
| 209 * returns | |
| 210 * fd of the socket or -1 if socket was not connected | |
| 211 */ | |
| 212 int jab_getfd(jconn j) | |
| 213 { | |
| 214 if(j) | |
| 215 return j->fd; | |
| 216 else | |
| 217 return -1; | |
| 218 } | |
| 219 | |
| 220 /* | |
| 221 * jab_getjid -- get jid structure of user | |
| 222 * | |
| 223 * parameters | |
| 224 * j -- connection | |
| 225 */ | |
| 226 jid jab_getjid(jconn j) | |
| 227 { | |
| 228 if(j) | |
| 229 return(j->user); | |
| 230 else | |
| 231 return NULL; | |
| 232 } | |
| 233 | |
| 234 /* jab_getsid -- get stream id | |
| 235 * This is the id of server's <stream:stream> tag and used for | |
| 236 * digest authorization. | |
| 237 * | |
| 238 * parameters | |
| 239 * j -- connection | |
| 240 */ | |
| 241 char *jab_getsid(jconn j) | |
| 242 { | |
| 243 if(j) | |
| 244 return(j->sid); | |
| 245 else | |
| 246 return NULL; | |
| 247 } | |
| 248 | |
| 249 /* | |
| 250 * jab_getid -- get a unique id | |
| 251 * | |
| 252 * parameters | |
| 253 * j -- connection | |
| 254 */ | |
| 255 char *jab_getid(jconn j) | |
| 256 { | |
| 257 snprintf(j->idbuf, 8, "%d", j->id++); | |
| 258 return &j->idbuf[0]; | |
| 259 } | |
| 260 | |
| 261 /* | |
| 262 * jab_send -- send xml data | |
| 263 * | |
| 264 * parameters | |
| 265 * j -- connection | |
| 266 * x -- xmlnode structure | |
| 267 */ | |
| 268 void jab_send(jconn j, xmlnode x) | |
| 269 { | |
| 270 if (j && j->state != JCONN_STATE_OFF) | |
| 271 { | |
| 272 char *buf = xmlnode2str(x); | |
| 273 if (buf) { | |
| 274 cw_write(j->fd, buf, strlen(buf), j->ssl); | |
| 275 if (j->logger) | |
| 276 (j->logger)(j, 0, buf); | |
| 277 } | |
| 278 | |
| 279 #ifdef JDEBUG | |
| 280 printf ("out: %s\n", buf); | |
| 281 #endif | |
| 282 } | |
| 283 } | |
| 284 | |
| 285 /* | |
| 286 * jab_send_raw -- send a string | |
| 287 * | |
| 288 * parameters | |
| 289 * j -- connection | |
| 290 * str -- xml string | |
| 291 */ | |
| 292 void jab_send_raw(jconn j, const char *str) | |
| 293 { | |
| 294 if (j && j->state != JCONN_STATE_OFF) { | |
| 295 cw_write(j->fd, str, strlen(str), j->ssl); | |
| 296 | |
| 297 if (j->logger) | |
| 298 (j->logger)(j, 0, str); | |
| 299 } | |
| 300 | |
| 301 #ifdef JDEBUG | |
| 302 printf ("out: %s\n", str); | |
| 303 #endif | |
| 304 } | |
| 305 | |
| 306 /* | |
| 307 * jab_recv -- read and parse incoming data | |
| 308 * | |
| 309 * parameters | |
| 310 * j -- connection | |
| 311 */ | |
| 312 void jab_recv(jconn j) | |
| 313 { | |
| 314 static char buf[32768]; | |
| 315 int len; | |
| 316 | |
| 317 if(!j || j->state == JCONN_STATE_OFF) | |
| 318 return; | |
| 319 | |
| 320 len = cw_read(j->fd, buf, sizeof(buf)-1, j->ssl); | |
| 321 if(len>0) | |
| 322 { | |
| 323 buf[len] = '\0'; | |
| 324 | |
| 325 if (j->logger) | |
| 326 (j->logger)(j, 1, buf); | |
| 327 | |
| 328 #ifdef JDEBUG | |
| 329 printf (" in: %s\n", buf); | |
| 330 #endif | |
| 331 XML_Parse(j->parser, buf, len, 0); | |
| 332 } | |
| 333 else if(len<=0) | |
| 334 { | |
| 335 STATE_EVT(JCONN_STATE_OFF); | |
| 336 jab_stop(j); | |
| 337 } | |
| 338 } | |
| 339 | |
| 340 /* | |
| 341 * jab_poll -- check socket for incoming data | |
| 342 * | |
| 343 * parameters | |
| 344 * j -- connection | |
| 345 * timeout -- poll timeout | |
| 346 */ | |
| 347 void jab_poll(jconn j, int timeout) | |
| 348 { | |
| 349 fd_set fds; | |
| 350 struct timeval tv; | |
| 351 int r; | |
| 352 | |
| 353 if (!j || j->state == JCONN_STATE_OFF) | |
| 354 return; | |
| 355 | |
|
985
b33ca4e1c37d
Fix potential libjabber issue
Mikael Berthe <mikael@lilotux.net>
parents:
938
diff
changeset
|
356 if (j->fd == -1) { |
|
b33ca4e1c37d
Fix potential libjabber issue
Mikael Berthe <mikael@lilotux.net>
parents:
938
diff
changeset
|
357 STATE_EVT(JCONN_STATE_OFF); |
|
b33ca4e1c37d
Fix potential libjabber issue
Mikael Berthe <mikael@lilotux.net>
parents:
938
diff
changeset
|
358 return; |
|
b33ca4e1c37d
Fix potential libjabber issue
Mikael Berthe <mikael@lilotux.net>
parents:
938
diff
changeset
|
359 } |
|
b33ca4e1c37d
Fix potential libjabber issue
Mikael Berthe <mikael@lilotux.net>
parents:
938
diff
changeset
|
360 |
| 25 | 361 FD_ZERO(&fds); |
| 362 FD_SET(j->fd, &fds); | |
| 363 | |
| 364 if(timeout <= 0) { | |
| 365 r = select(j->fd + 1, &fds, NULL, NULL, NULL); | |
| 366 | |
| 367 } else { | |
| 368 tv.tv_sec = 0; | |
| 369 tv.tv_usec = timeout; | |
| 370 r = select(j->fd + 1, &fds, NULL, NULL, &tv); | |
| 371 | |
| 372 } | |
| 373 | |
| 374 if(r > 0) { | |
| 375 jab_recv(j); | |
| 376 | |
| 377 } else if(r) { | |
| 172 | 378 /* Don't disconnect for interrupted system call */ |
| 379 if(errno == EINTR) return; | |
| 171 | 380 |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
176
diff
changeset
|
381 scr_LogPrint(LPRINT_LOGNORM, "jab_poll: select returned errno=%d", |
|
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
176
diff
changeset
|
382 errno); |
| 25 | 383 STATE_EVT(JCONN_STATE_OFF); |
| 384 jab_stop(j); | |
| 385 | |
| 386 } | |
| 387 } | |
| 388 | |
| 389 /* | |
| 390 * jab_auth -- authorize user | |
| 391 * | |
| 392 * parameters | |
| 393 * j -- connection | |
| 394 * | |
| 395 * returns | |
| 396 * id of the iq packet | |
| 397 */ | |
| 398 char *jab_auth(jconn j) | |
| 399 { | |
| 400 xmlnode x,y,z; | |
| 401 char *hash, *user, *id; | |
| 402 | |
| 403 if(!j) return(NULL); | |
| 404 | |
| 405 x = jutil_iqnew(JPACKET__SET, NS_AUTH); | |
| 406 id = jab_getid(j); | |
| 407 xmlnode_put_attrib(x, "id", id); | |
| 408 y = xmlnode_get_tag(x,"query"); | |
| 409 | |
| 410 user = j->user->user; | |
| 411 | |
| 412 if (user) | |
| 413 { | |
| 414 z = xmlnode_insert_tag(y, "username"); | |
| 415 xmlnode_insert_cdata(z, user, -1); | |
| 416 } | |
| 417 | |
| 418 z = xmlnode_insert_tag(y, "resource"); | |
| 419 xmlnode_insert_cdata(z, j->user->resource, -1); | |
| 420 | |
| 421 if (j->sid) | |
| 422 { | |
| 423 z = xmlnode_insert_tag(y, "digest"); | |
| 424 hash = pmalloc(x->p, strlen(j->sid)+strlen(j->pass)+1); | |
| 425 strcpy(hash, j->sid); | |
| 426 strcat(hash, j->pass); | |
| 427 hash = shahash(hash); | |
| 428 xmlnode_insert_cdata(z, hash, 40); | |
| 429 } | |
| 430 else | |
| 431 { | |
| 432 z = xmlnode_insert_tag(y, "password"); | |
| 433 xmlnode_insert_cdata(z, j->pass, -1); | |
| 434 } | |
| 435 | |
| 436 jab_send(j, x); | |
| 437 xmlnode_free(x); | |
| 438 return id; | |
| 439 } | |
| 440 | |
| 441 /* | |
|
686
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
442 * jab_auth_mcabber -- authorize user |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
443 * |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
444 * parameters |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
445 * j -- connection |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
446 * x -- xmlnode iq packet |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
447 * |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
448 * returns |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
449 * non-zero in case of failure |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
450 */ |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
451 int jab_auth_mcabber(jconn j, xmlnode x) |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
452 { |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
453 xmlnode y,z; |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
454 char *hash, *user; |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
455 |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
456 if(!j) return -1; |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
457 |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
458 y = xmlnode_get_tag(x, "query"); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
459 |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
460 user = j->user->user; |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
461 |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
462 if (user) |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
463 { |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
464 z = xmlnode_insert_tag(y, "username"); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
465 xmlnode_insert_cdata(z, user, -1); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
466 } |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
467 |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
468 z = xmlnode_insert_tag(y, "resource"); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
469 xmlnode_insert_cdata(z, j->user->resource, -1); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
470 |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
471 if (j->sid) |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
472 { |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
473 z = xmlnode_insert_tag(y, "digest"); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
474 hash = pmalloc(x->p, strlen(j->sid)+strlen(j->pass)+1); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
475 strcpy(hash, j->sid); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
476 strcat(hash, j->pass); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
477 hash = shahash(hash); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
478 xmlnode_insert_cdata(z, hash, 40); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
479 } |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
480 else |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
481 { |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
482 z = xmlnode_insert_tag(y, "password"); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
483 xmlnode_insert_cdata(z, j->pass, -1); |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
484 } |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
485 return 0; |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
486 } |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
487 |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
414
diff
changeset
|
488 /* |
| 25 | 489 * jab_reg -- register user |
| 490 * | |
| 491 * parameters | |
| 492 * j -- connection | |
| 493 * | |
| 494 * returns | |
| 495 * id of the iq packet | |
| 496 */ | |
| 497 char *jab_reg(jconn j) | |
| 498 { | |
| 499 xmlnode x,y,z; | |
| 176 | 500 char *user, *id; |
| 25 | 501 |
| 502 if (!j) return(NULL); | |
| 503 | |
| 504 x = jutil_iqnew(JPACKET__SET, NS_REGISTER); | |
| 505 id = jab_getid(j); | |
| 506 xmlnode_put_attrib(x, "id", id); | |
| 507 y = xmlnode_get_tag(x,"query"); | |
| 508 | |
| 509 user = j->user->user; | |
| 510 | |
| 511 if (user) | |
| 512 { | |
| 513 z = xmlnode_insert_tag(y, "username"); | |
| 514 xmlnode_insert_cdata(z, user, -1); | |
| 515 } | |
| 516 | |
| 517 z = xmlnode_insert_tag(y, "resource"); | |
| 518 xmlnode_insert_cdata(z, j->user->resource, -1); | |
| 519 | |
| 520 if (j->pass) | |
| 521 { | |
| 522 z = xmlnode_insert_tag(y, "password"); | |
| 523 xmlnode_insert_cdata(z, j->pass, -1); | |
| 524 } | |
| 525 | |
| 526 jab_send(j, x); | |
| 527 xmlnode_free(x); | |
| 528 j->state = JCONN_STATE_ON; | |
| 529 STATE_EVT(JCONN_STATE_ON) | |
| 530 return id; | |
| 531 } | |
| 532 | |
| 533 | |
| 534 /* local functions */ | |
| 535 | |
| 536 static void startElement(void *userdata, const char *name, const char **attribs) | |
| 537 { | |
| 538 xmlnode x; | |
| 539 jconn j = (jconn)userdata; | |
| 540 | |
| 541 if(j->current) | |
| 542 { | |
| 543 /* Append the node to the current one */ | |
| 544 x = xmlnode_insert_tag(j->current, name); | |
| 545 xmlnode_put_expat_attribs(x, attribs); | |
| 546 | |
| 547 j->current = x; | |
| 548 } | |
| 549 else | |
| 550 { | |
| 551 x = xmlnode_new_tag(name); | |
| 552 xmlnode_put_expat_attribs(x, attribs); | |
| 553 if(strcmp(name, "stream:stream") == 0) { | |
| 554 /* special case: name == stream:stream */ | |
| 555 /* id attrib of stream is stored for digest auth */ | |
| 556 j->sid = xmlnode_get_attrib(x, "id"); | |
| 557 /* STATE_EVT(JCONN_STATE_AUTH) */ | |
| 558 } else { | |
| 559 j->current = x; | |
| 560 } | |
| 561 } | |
| 562 } | |
| 563 | |
| 564 static void endElement(void *userdata, const char *name) | |
| 565 { | |
| 566 jconn j = (jconn)userdata; | |
| 567 xmlnode x; | |
| 568 jpacket p; | |
| 569 | |
| 570 if(j->current == NULL) { | |
| 571 /* we got </stream:stream> */ | |
| 572 STATE_EVT(JCONN_STATE_OFF) | |
| 573 return; | |
| 574 } | |
| 575 | |
| 576 x = xmlnode_get_parent(j->current); | |
| 577 | |
| 578 if(x == NULL) | |
| 579 { | |
| 580 /* it is time to fire the event */ | |
| 581 p = jpacket_new(j->current); | |
| 582 | |
| 583 if(j->on_packet) | |
| 584 (j->on_packet)(j, p); | |
| 1124 | 585 xmlnode_free(j->current); |
| 25 | 586 } |
| 587 | |
| 588 j->current = x; | |
| 589 } | |
| 590 | |
| 591 static void charData(void *userdata, const char *s, int slen) | |
| 592 { | |
| 593 jconn j = (jconn)userdata; | |
| 594 | |
| 595 if (j->current) | |
| 596 xmlnode_insert_cdata(j->current, s, slen); | |
| 597 } |