Mercurial > ~mikael > mcabber > hg
annotate mcabber/libjabber/jconn.c @ 403:17aa60c6dc63
Allow a different server name than the jid domain name
Sync libjabber with upstream (centericq). The libjabber patch is from
Ian Johannesen.
This allows connecting to Google Talk, for example.
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Sat, 27 Aug 2005 11:21:27 +0200 |
| parents | bd5638c21834 |
| children | ec86d759ed54 |
| 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; | |
| 135 | |
| 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)) { | |
| 154 STATE_EVT(JCONN_STATE_OFF); | |
| 155 return; | |
| 156 } | |
| 157 } | |
| 158 if (j->cw_state & CW_CONNECT_WANT_SOMETHING){ /* check if it finished negociation */ | |
| 159 j->state = JCONN_STATE_CONNECTING; | |
| 160 STATE_EVT(JCONN_STATE_CONNECTING); | |
| 161 return; | |
| 162 } | |
| 163 change_socket_to_blocking(j->fd); | |
| 164 | |
| 165 j->state = JCONN_STATE_CONNECTED; | |
| 166 STATE_EVT(JCONN_STATE_CONNECTED) | |
| 167 | |
| 168 /* start stream */ | |
| 169 x = jutil_header(NS_CLIENT, j->user->server); | |
| 170 t = xmlnode2str(x); | |
| 171 /* this is ugly, we can create the string here instead of jutil_header */ | |
| 172 /* what do you think about it? -madcat */ | |
| 173 t2 = strstr(t,"/>"); | |
| 174 *t2++ = '>'; | |
| 175 *t2 = '\0'; | |
| 176 jab_send_raw(j,"<?xml version='1.0'?>"); | |
| 177 jab_send_raw(j,t); | |
| 178 xmlnode_free(x); | |
| 179 | |
| 180 j->state = JCONN_STATE_ON; | |
| 181 STATE_EVT(JCONN_STATE_ON) | |
| 182 | |
| 183 } | |
| 184 | |
| 185 /* | |
| 186 * jab_stop -- stop connection | |
| 187 * | |
| 188 * parameters | |
| 189 * j -- connection | |
| 190 */ | |
| 191 void jab_stop(jconn j) | |
| 192 { | |
| 193 if(!j || j->state == JCONN_STATE_OFF) return; | |
| 194 | |
| 195 j->state = JCONN_STATE_OFF; | |
| 196 cw_close(j->fd); | |
| 197 j->fd = -1; | |
| 198 XML_ParserFree(j->parser); | |
| 199 } | |
| 200 | |
| 201 /* | |
| 202 * jab_getfd -- get file descriptor of connection socket | |
| 203 * | |
| 204 * parameters | |
| 205 * j -- connection | |
| 206 * | |
| 207 * returns | |
| 208 * fd of the socket or -1 if socket was not connected | |
| 209 */ | |
| 210 int jab_getfd(jconn j) | |
| 211 { | |
| 212 if(j) | |
| 213 return j->fd; | |
| 214 else | |
| 215 return -1; | |
| 216 } | |
| 217 | |
| 218 /* | |
| 219 * jab_getjid -- get jid structure of user | |
| 220 * | |
| 221 * parameters | |
| 222 * j -- connection | |
| 223 */ | |
| 224 jid jab_getjid(jconn j) | |
| 225 { | |
| 226 if(j) | |
| 227 return(j->user); | |
| 228 else | |
| 229 return NULL; | |
| 230 } | |
| 231 | |
| 232 /* jab_getsid -- get stream id | |
| 233 * This is the id of server's <stream:stream> tag and used for | |
| 234 * digest authorization. | |
| 235 * | |
| 236 * parameters | |
| 237 * j -- connection | |
| 238 */ | |
| 239 char *jab_getsid(jconn j) | |
| 240 { | |
| 241 if(j) | |
| 242 return(j->sid); | |
| 243 else | |
| 244 return NULL; | |
| 245 } | |
| 246 | |
| 247 /* | |
| 248 * jab_getid -- get a unique id | |
| 249 * | |
| 250 * parameters | |
| 251 * j -- connection | |
| 252 */ | |
| 253 char *jab_getid(jconn j) | |
| 254 { | |
| 255 snprintf(j->idbuf, 8, "%d", j->id++); | |
| 256 return &j->idbuf[0]; | |
| 257 } | |
| 258 | |
| 259 /* | |
| 260 * jab_send -- send xml data | |
| 261 * | |
| 262 * parameters | |
| 263 * j -- connection | |
| 264 * x -- xmlnode structure | |
| 265 */ | |
| 266 void jab_send(jconn j, xmlnode x) | |
| 267 { | |
| 268 if (j && j->state != JCONN_STATE_OFF) | |
| 269 { | |
| 270 char *buf = xmlnode2str(x); | |
| 271 if (buf) { | |
| 272 cw_write(j->fd, buf, strlen(buf), j->ssl); | |
| 273 if (j->logger) | |
| 274 (j->logger)(j, 0, buf); | |
| 275 } | |
| 276 | |
| 277 #ifdef JDEBUG | |
| 278 printf ("out: %s\n", buf); | |
| 279 #endif | |
| 280 } | |
| 281 } | |
| 282 | |
| 283 /* | |
| 284 * jab_send_raw -- send a string | |
| 285 * | |
| 286 * parameters | |
| 287 * j -- connection | |
| 288 * str -- xml string | |
| 289 */ | |
| 290 void jab_send_raw(jconn j, const char *str) | |
| 291 { | |
| 292 if (j && j->state != JCONN_STATE_OFF) { | |
| 293 cw_write(j->fd, str, strlen(str), j->ssl); | |
| 294 | |
| 295 if (j->logger) | |
| 296 (j->logger)(j, 0, str); | |
| 297 } | |
| 298 | |
| 299 #ifdef JDEBUG | |
| 300 printf ("out: %s\n", str); | |
| 301 #endif | |
| 302 } | |
| 303 | |
| 304 /* | |
| 305 * jab_recv -- read and parse incoming data | |
| 306 * | |
| 307 * parameters | |
| 308 * j -- connection | |
| 309 */ | |
| 310 void jab_recv(jconn j) | |
| 311 { | |
| 312 static char buf[32768]; | |
| 313 int len; | |
| 314 | |
| 315 if(!j || j->state == JCONN_STATE_OFF) | |
| 316 return; | |
| 317 | |
| 318 len = cw_read(j->fd, buf, sizeof(buf)-1, j->ssl); | |
| 319 if(len>0) | |
| 320 { | |
| 321 buf[len] = '\0'; | |
| 322 | |
| 323 if (j->logger) | |
| 324 (j->logger)(j, 1, buf); | |
| 325 | |
| 326 #ifdef JDEBUG | |
| 327 printf (" in: %s\n", buf); | |
| 328 #endif | |
| 329 XML_Parse(j->parser, buf, len, 0); | |
| 330 } | |
| 331 else if(len<=0) | |
| 332 { | |
| 333 STATE_EVT(JCONN_STATE_OFF); | |
| 334 jab_stop(j); | |
| 335 } | |
| 336 } | |
| 337 | |
| 338 /* | |
| 339 * jab_poll -- check socket for incoming data | |
| 340 * | |
| 341 * parameters | |
| 342 * j -- connection | |
| 343 * timeout -- poll timeout | |
| 344 */ | |
| 345 void jab_poll(jconn j, int timeout) | |
| 346 { | |
| 347 fd_set fds; | |
| 348 struct timeval tv; | |
| 349 int r; | |
| 350 | |
| 351 if (!j || j->state == JCONN_STATE_OFF) | |
| 352 return; | |
| 353 | |
| 354 FD_ZERO(&fds); | |
| 355 FD_SET(j->fd, &fds); | |
| 356 | |
| 357 if(timeout <= 0) { | |
| 358 r = select(j->fd + 1, &fds, NULL, NULL, NULL); | |
| 359 | |
| 360 } else { | |
| 361 tv.tv_sec = 0; | |
| 362 tv.tv_usec = timeout; | |
| 363 r = select(j->fd + 1, &fds, NULL, NULL, &tv); | |
| 364 | |
| 365 } | |
| 366 | |
| 367 if(r > 0) { | |
| 368 jab_recv(j); | |
| 369 | |
| 370 } else if(r) { | |
| 172 | 371 /* Don't disconnect for interrupted system call */ |
| 372 if(errno == EINTR) return; | |
| 171 | 373 |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
176
diff
changeset
|
374 scr_LogPrint(LPRINT_LOGNORM, "jab_poll: select returned errno=%d", |
|
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
176
diff
changeset
|
375 errno); |
| 25 | 376 STATE_EVT(JCONN_STATE_OFF); |
| 377 jab_stop(j); | |
| 378 | |
| 379 } | |
| 380 } | |
| 381 | |
| 382 /* | |
| 383 * jab_auth -- authorize user | |
| 384 * | |
| 385 * parameters | |
| 386 * j -- connection | |
| 387 * | |
| 388 * returns | |
| 389 * id of the iq packet | |
| 390 */ | |
| 391 char *jab_auth(jconn j) | |
| 392 { | |
| 393 xmlnode x,y,z; | |
| 394 char *hash, *user, *id; | |
| 395 | |
| 396 if(!j) return(NULL); | |
| 397 | |
| 398 x = jutil_iqnew(JPACKET__SET, NS_AUTH); | |
| 399 id = jab_getid(j); | |
| 400 xmlnode_put_attrib(x, "id", id); | |
| 401 y = xmlnode_get_tag(x,"query"); | |
| 402 | |
| 403 user = j->user->user; | |
| 404 | |
| 405 if (user) | |
| 406 { | |
| 407 z = xmlnode_insert_tag(y, "username"); | |
| 408 xmlnode_insert_cdata(z, user, -1); | |
| 409 } | |
| 410 | |
| 411 z = xmlnode_insert_tag(y, "resource"); | |
| 412 xmlnode_insert_cdata(z, j->user->resource, -1); | |
| 413 | |
| 414 if (j->sid) | |
| 415 { | |
| 416 z = xmlnode_insert_tag(y, "digest"); | |
| 417 hash = pmalloc(x->p, strlen(j->sid)+strlen(j->pass)+1); | |
| 418 strcpy(hash, j->sid); | |
| 419 strcat(hash, j->pass); | |
| 420 hash = shahash(hash); | |
| 421 xmlnode_insert_cdata(z, hash, 40); | |
| 422 } | |
| 423 else | |
| 424 { | |
| 425 z = xmlnode_insert_tag(y, "password"); | |
| 426 xmlnode_insert_cdata(z, j->pass, -1); | |
| 427 } | |
| 428 | |
| 429 jab_send(j, x); | |
| 430 xmlnode_free(x); | |
| 431 return id; | |
| 432 } | |
| 433 | |
| 434 /* | |
| 435 * jab_reg -- register user | |
| 436 * | |
| 437 * parameters | |
| 438 * j -- connection | |
| 439 * | |
| 440 * returns | |
| 441 * id of the iq packet | |
| 442 */ | |
| 443 char *jab_reg(jconn j) | |
| 444 { | |
| 445 xmlnode x,y,z; | |
| 176 | 446 char *user, *id; |
| 25 | 447 |
| 448 if (!j) return(NULL); | |
| 449 | |
| 450 x = jutil_iqnew(JPACKET__SET, NS_REGISTER); | |
| 451 id = jab_getid(j); | |
| 452 xmlnode_put_attrib(x, "id", id); | |
| 453 y = xmlnode_get_tag(x,"query"); | |
| 454 | |
| 455 user = j->user->user; | |
| 456 | |
| 457 if (user) | |
| 458 { | |
| 459 z = xmlnode_insert_tag(y, "username"); | |
| 460 xmlnode_insert_cdata(z, user, -1); | |
| 461 } | |
| 462 | |
| 463 z = xmlnode_insert_tag(y, "resource"); | |
| 464 xmlnode_insert_cdata(z, j->user->resource, -1); | |
| 465 | |
| 466 if (j->pass) | |
| 467 { | |
| 468 z = xmlnode_insert_tag(y, "password"); | |
| 469 xmlnode_insert_cdata(z, j->pass, -1); | |
| 470 } | |
| 471 | |
| 472 jab_send(j, x); | |
| 473 xmlnode_free(x); | |
| 474 j->state = JCONN_STATE_ON; | |
| 475 STATE_EVT(JCONN_STATE_ON) | |
| 476 return id; | |
| 477 } | |
| 478 | |
| 479 | |
| 480 /* local functions */ | |
| 481 | |
| 482 static void startElement(void *userdata, const char *name, const char **attribs) | |
| 483 { | |
| 484 xmlnode x; | |
| 485 jconn j = (jconn)userdata; | |
| 486 | |
| 487 if(j->current) | |
| 488 { | |
| 489 /* Append the node to the current one */ | |
| 490 x = xmlnode_insert_tag(j->current, name); | |
| 491 xmlnode_put_expat_attribs(x, attribs); | |
| 492 | |
| 493 j->current = x; | |
| 494 } | |
| 495 else | |
| 496 { | |
| 497 x = xmlnode_new_tag(name); | |
| 498 xmlnode_put_expat_attribs(x, attribs); | |
| 499 if(strcmp(name, "stream:stream") == 0) { | |
| 500 /* special case: name == stream:stream */ | |
| 501 /* id attrib of stream is stored for digest auth */ | |
| 502 j->sid = xmlnode_get_attrib(x, "id"); | |
| 503 /* STATE_EVT(JCONN_STATE_AUTH) */ | |
| 504 } else { | |
| 505 j->current = x; | |
| 506 } | |
| 507 } | |
| 508 } | |
| 509 | |
| 510 static void endElement(void *userdata, const char *name) | |
| 511 { | |
| 512 jconn j = (jconn)userdata; | |
| 513 xmlnode x; | |
| 514 jpacket p; | |
| 515 | |
| 516 if(j->current == NULL) { | |
| 517 /* we got </stream:stream> */ | |
| 518 STATE_EVT(JCONN_STATE_OFF) | |
| 519 return; | |
| 520 } | |
| 521 | |
| 522 x = xmlnode_get_parent(j->current); | |
| 523 | |
| 524 if(x == NULL) | |
| 525 { | |
| 526 /* it is time to fire the event */ | |
| 527 p = jpacket_new(j->current); | |
| 528 | |
| 529 if(j->on_packet) | |
| 530 (j->on_packet)(j, p); | |
| 531 else | |
| 532 xmlnode_free(j->current); | |
| 533 } | |
| 534 | |
| 535 j->current = x; | |
| 536 } | |
| 537 | |
| 538 static void charData(void *userdata, const char *s, int slen) | |
| 539 { | |
| 540 jconn j = (jconn)userdata; | |
| 541 | |
| 542 if (j->current) | |
| 543 xmlnode_insert_cdata(j->current, s, slen); | |
| 544 } |