Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/jabber.c @ 25553:7f8cf35fc99b
propagate from branch 'im.pidgin.pidgin' (head c323420a0b3b17b1eba64763c01038ddf05ff0c2)
to branch 'im.pidgin.pidgin.yaz' (head 3dc04de4d17fdd9333be36950cfe86115e1b48a5)
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Tue, 28 Aug 2007 09:20:27 +0000 |
parents | 411b5a604a17 d470d42d2cb1 |
children | 26f55eb6ab59 |
comparison
equal
deleted
inserted
replaced
25543:5e76304ebcc8 | 25553:7f8cf35fc99b |
---|---|
493 return; | 493 return; |
494 | 494 |
495 js = gc->proto_data; | 495 js = gc->proto_data; |
496 js->gsc = NULL; | 496 js->gsc = NULL; |
497 | 497 |
498 switch(error) { | 498 purple_connection_error(gc, purple_ssl_strerror(error)); |
499 case PURPLE_SSL_CONNECT_FAILED: | |
500 purple_connection_error(gc, _("Connection Failed")); | |
501 break; | |
502 case PURPLE_SSL_HANDSHAKE_FAILED: | |
503 purple_connection_error(gc, _("SSL Handshake Failed")); | |
504 break; | |
505 } | |
506 } | 499 } |
507 | 500 |
508 static void tls_init(JabberStream *js) | 501 static void tls_init(JabberStream *js) |
509 { | 502 { |
510 purple_input_remove(js->gc->inpa); | 503 purple_input_remove(js->gc->inpa); |
511 js->gc->inpa = 0; | 504 js->gc->inpa = 0; |
512 js->gsc = purple_ssl_connect_fd(js->gc->account, js->fd, | 505 js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd, |
513 jabber_login_callback_ssl, jabber_ssl_connect_failure, js->gc); | 506 jabber_login_callback_ssl, jabber_ssl_connect_failure, js->serverFQDN, js->gc); |
514 } | 507 } |
515 | 508 |
516 static void jabber_login_connect(JabberStream *js, const char *fqdn, const char *host, int port) | 509 static void jabber_login_connect(JabberStream *js, const char *fqdn, const char *host, int port) |
517 { | 510 { |
518 #ifdef HAVE_CYRUS_SASL | |
519 js->serverFQDN = g_strdup(fqdn); | 511 js->serverFQDN = g_strdup(fqdn); |
520 #endif | |
521 | 512 |
522 if (purple_proxy_connect(js->gc, js->gc->account, host, | 513 if (purple_proxy_connect(js->gc, js->gc->account, host, |
523 port, jabber_login_callback, js->gc) == NULL) | 514 port, jabber_login_callback, js->gc) == NULL) |
524 purple_connection_error(js->gc, _("Unable to create socket")); | 515 purple_connection_error(js->gc, _("Unable to create socket")); |
525 } | 516 } |
1024 sasl_dispose(&js->sasl); | 1015 sasl_dispose(&js->sasl); |
1025 if(js->sasl_mechs) | 1016 if(js->sasl_mechs) |
1026 g_string_free(js->sasl_mechs, TRUE); | 1017 g_string_free(js->sasl_mechs, TRUE); |
1027 if(js->sasl_cb) | 1018 if(js->sasl_cb) |
1028 g_free(js->sasl_cb); | 1019 g_free(js->sasl_cb); |
1020 #endif | |
1029 if(js->serverFQDN) | 1021 if(js->serverFQDN) |
1030 g_free(js->serverFQDN); | 1022 g_free(js->serverFQDN); |
1031 #endif | |
1032 g_free(js->server_name); | 1023 g_free(js->server_name); |
1033 g_free(js->gmail_last_time); | 1024 g_free(js->gmail_last_time); |
1034 g_free(js->gmail_last_tid); | 1025 g_free(js->gmail_last_tid); |
1035 g_free(js); | 1026 g_free(js); |
1036 | 1027 |