Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/jabber.c @ 28889:fa7f3426ed13
jabber: Convert to purple_debug_* convenience functions.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 06 Nov 2009 08:39:49 +0000 |
parents | 562fd22dbe89 |
children | 4fd0baa32a9e |
comparison
equal
deleted
inserted
replaced
28888:562fd22dbe89 | 28889:fa7f3426ed13 |
---|---|
292 if (js->state == JABBER_STREAM_INITIALIZING_ENCRYPTION && !js->gsc) | 292 if (js->state == JABBER_STREAM_INITIALIZING_ENCRYPTION && !js->gsc) |
293 tls_init(js); | 293 tls_init(js); |
294 else | 294 else |
295 purple_debug_warning("jabber", "Ignoring spurious <proceed/>\n"); | 295 purple_debug_warning("jabber", "Ignoring spurious <proceed/>\n"); |
296 } else { | 296 } else { |
297 purple_debug(PURPLE_DEBUG_WARNING, "jabber", "Unknown packet: %s\n", | 297 purple_debug_warning("jabber", "Unknown packet: %s\n", (*packet)->name); |
298 (*packet)->name); | |
299 } | 298 } |
300 } | 299 } |
301 | 300 |
302 static int jabber_do_send(JabberStream *js, const char *data, int len) | 301 static int jabber_do_send(JabberStream *js, const char *data, int len) |
303 { | 302 { |
529 } | 528 } |
530 | 529 |
531 while((len = purple_ssl_read(gsc, buf, sizeof(buf) - 1)) > 0) { | 530 while((len = purple_ssl_read(gsc, buf, sizeof(buf) - 1)) > 0) { |
532 gc->last_received = time(NULL); | 531 gc->last_received = time(NULL); |
533 buf[len] = '\0'; | 532 buf[len] = '\0'; |
534 purple_debug(PURPLE_DEBUG_INFO, "jabber", "Recv (ssl)(%d): %s\n", len, buf); | 533 purple_debug_info("jabber", "Recv (ssl)(%d): %s\n", len, buf); |
535 jabber_parser_process(js, buf, len); | 534 jabber_parser_process(js, buf, len); |
536 if(js->reinit) | 535 if(js->reinit) |
537 jabber_stream_init(js); | 536 jabber_stream_init(js); |
538 } | 537 } |
539 | 538 |
569 if (js->sasl_maxbuf>0) { | 568 if (js->sasl_maxbuf>0) { |
570 const char *out; | 569 const char *out; |
571 unsigned int olen; | 570 unsigned int olen; |
572 sasl_decode(js->sasl, buf, len, &out, &olen); | 571 sasl_decode(js->sasl, buf, len, &out, &olen); |
573 if (olen>0) { | 572 if (olen>0) { |
574 purple_debug(PURPLE_DEBUG_INFO, "jabber", "RecvSASL (%u): %s\n", olen, out); | 573 purple_debug_info("jabber", "RecvSASL (%u): %s\n", olen, out); |
575 jabber_parser_process(js,out,olen); | 574 jabber_parser_process(js,out,olen); |
576 if(js->reinit) | 575 if(js->reinit) |
577 jabber_stream_init(js); | 576 jabber_stream_init(js); |
578 } | 577 } |
579 return; | 578 return; |
580 } | 579 } |
581 #endif | 580 #endif |
582 buf[len] = '\0'; | 581 buf[len] = '\0'; |
583 purple_debug(PURPLE_DEBUG_INFO, "jabber", "Recv (%d): %s\n", len, buf); | 582 purple_debug_info("jabber", "Recv (%d): %s\n", len, buf); |
584 jabber_parser_process(js, buf, len); | 583 jabber_parser_process(js, buf, len); |
585 if(js->reinit) | 584 if(js->reinit) |
586 jabber_stream_init(js); | 585 jabber_stream_init(js); |
587 } else if(len < 0 && errno == EAGAIN) { | 586 } else if(len < 0 && errno == EAGAIN) { |
588 return; | 587 return; |