Merge branch 'master' of ssh://askele.com/libsntl
This commit is contained in:
commit
46f4090629
@ -513,7 +513,9 @@ static void __connection_destroy(conn_t *co)
|
|||||||
if(co->pctx->login) free(co->pctx->login);
|
if(co->pctx->login) free(co->pctx->login);
|
||||||
if(co->pctx->passwd) free(co->pctx->passwd);
|
if(co->pctx->passwd) free(co->pctx->passwd);
|
||||||
|
|
||||||
SSL_shutdown(co->ssl);
|
while((fd = SSL_shutdown(co->ssl)) != 1) {
|
||||||
|
if(fd < 0) break;
|
||||||
|
}
|
||||||
fd = SSL_get_fd(co->ssl);
|
fd = SSL_get_fd(co->ssl);
|
||||||
SSL_free(co->ssl);
|
SSL_free(co->ssl);
|
||||||
SSL_CTX_free(co->ctx);
|
SSL_CTX_free(co->ctx);
|
||||||
@ -1085,13 +1087,17 @@ conn_t *connection_link(conn_sys_t *ssys, const char *host,
|
|||||||
/* resolve host */
|
/* resolve host */
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
host_ = gethostbyname(host);
|
host_ = gethostbyname(host);
|
||||||
|
if(!host_) {
|
||||||
|
r = SNE_FAILED;
|
||||||
|
goto __fail;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
r = __resolvehost(host, hostbuf, 2048, &host_);
|
r = __resolvehost(host, hostbuf, 2048, &host_);
|
||||||
#endif
|
|
||||||
if(r) {
|
if(r) {
|
||||||
r = SNE_FAILED;
|
r = SNE_FAILED;
|
||||||
goto __fail;
|
goto __fail;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* create a socket */
|
/* create a socket */
|
||||||
sck = socket(PF_INET, SOCK_STREAM, 0);
|
sck = socket(PF_INET, SOCK_STREAM, 0);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user