retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-5325

This commit is contained in:
Anthony Minessale 2013-05-10 12:55:26 -05:00
parent cb7a6bd34b
commit 5761624f5a
1 changed files with 112 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
libs/iksemel/src/stream.c
View File

@ -60,40 +60,78 @@ struct stream_data {
#endif
};
#define WANT_READ 1
#define WANT_WRITE 0
#ifdef HAVE_SSL
#ifdef WIN32
static int sock_read_ready(struct stream_data *data, uint32_t ms)
static int sock_ready(struct stream_data *data, int ms, int w_read)
{
int r = 0;
fd_set fds;
int r = 0, e = 0;
fd_set rfds, wfds, efds, *fds;
struct timeval tv;
FD_ZERO(&fds);
FD_ZERO(&rfds);
FD_ZERO(&wfds);
FD_ZERO(&efds);
if (w_read) {
fds = &rfds;
} else {
fds = &wfds;
}
#ifdef WIN32
#pragma warning( push )
#pragma warning( disable : 4127 )
FD_SET(SSL_get_fd(data->ssl), &fds);
FD_SET(SSL_get_fd(data->ssl), fds);
#pragma warning( pop )
#else
FD_SET(SSL_get_fd(data->ssl), &fds);
FD_SET(SSL_get_fd(data->ssl), fds);
#endif
tv.tv_sec = ms / 1000;
tv.tv_usec = (ms % 1000) * ms;
r = select (SSL_get_fd(data->ssl) + 1, &fds, NULL, NULL, &tv);
r = select (SSL_get_fd(data->ssl) + 1, w_read ? &rfds : NULL, w_read ? NULL : &wfds, &efds, &tv);
if (r > 0) {
#ifdef WIN32
#pragma warning( push )
#pragma warning( disable : 4127 )
e = FD_ISSET(SSL_get_fd(data->ssl), &efds);
#pragma warning( pop )
#else
e = FD_ISSET(SSL_get_fd(data->ssl), &efds);
#endif
if (e) {
r = -1;
} else {
#ifdef WIN32
#pragma warning( push )
#pragma warning( disable : 4127 )
r = FD_ISSET(SSL_get_fd(data->ssl), fds);
#pragma warning( pop )
#else
r = FD_ISSET(SSL_get_fd(data->ssl), fds);
#endif
}
}
return r;
}
#else
static int sock_read_ready(struct stream_data *data, int ms)
static int sock_ready(struct stream_data *data, int ms, int w_read)
{
struct pollfd pfds[2] = { { 0 } };
int s = 0, r = 0;
int s = 0, r = 0, w = w_read ? POLLIN : POLLOUT;
pfds[0].fd = SSL_get_fd(data->ssl);
pfds[0].events = POLLIN | POLLHUP | POLLERR;
pfds[0].events = w | POLLHUP | POLLERR;
s = poll(pfds, 1, ms);
@ -101,7 +139,7 @@ static int sock_read_ready(struct stream_data *data, int ms)
if (s < 0) {
r = s;
} else if (s > 0) {
if ((pfds[0].revents & POLLIN)) {
if ((pfds[0].revents & w)) {
r = 1;
} else if ((pfds[0].revents & POLLHUP) || (pfds[0].revents & POLLERR)) {
r = -1;
@ -201,26 +239,68 @@ static int wait_for_data(struct stream_data *data, int ret, int timeout)
switch(err)
{
case SSL_ERROR_WANT_READ:
ret = sock_ready(data, timeout*1000, WANT_READ);
break;
case SSL_ERROR_WANT_WRITE:
ret = sock_read_ready(data, timeout*1000);
if (ret == -1) {
retval = IKS_NET_TLSFAIL;
}
ret = sock_ready(data, timeout*1000, WANT_WRITE);
break;
default:
if(data->logHook)
if (data->logHook) {
data->logHook(data->user_data, ERR_error_string(err, NULL), strlen(ERR_error_string(err, NULL)), 1);
retval = IKS_NET_TLSFAIL;
}
ret = -1;
break;
}
if (ret == -1) {
retval = IKS_NET_TLSFAIL;
}
ERR_clear_error();
return retval;
}
#ifndef WIN32
#include <fcntl.h>
#endif
int iks_set_blocking(void *fd, int blocking)
{
if (!fd) {
return -1;
}
#ifdef WIN32
ULONG mode = !blocking;
if (ioctlsocket((SOCKET)(intptr_t) fd, FIONBIO, &mode)) {
return -1;
}
#else
int flags;
int mfd = (int)(intptr_t)fd;
if ((flags = fcntl(mfd, F_GETFL, 0)) < 0) {
return -1;
}
if (fcntl(mfd, F_SETFL, flags | (!blocking ? O_NONBLOCK : ~O_NONBLOCK)) < 0) {
return -1;
}
#endif
return 0;
}
static int
handshake (struct stream_data *data)
{
@ -236,6 +316,8 @@ handshake (struct stream_data *data)
data->ssl = SSL_new(data->ssl_ctx);
if(!data->ssl) return IKS_NOMEM;
iks_set_blocking(data->sock, 0);
if( SSL_set_fd(data->ssl, (int)(intptr_t)data->sock) != 1 ) return IKS_NOMEM;
/* Set both the read and write BIO's to non-blocking mode */
@ -681,7 +763,7 @@ iks_recv (iksparser *prs, int timeout)
} else
#elif HAVE_SSL
if (data->flags & SF_SECURE) {
ret = sock_read_ready(data, timeout*1000);
ret = sock_ready(data, timeout*1000, WANT_READ);
if (ret == -1) {
return IKS_NET_TLSFAIL;
@ -765,7 +847,16 @@ iks_send_raw (iksparser *prs, const char *xmlstr)
} else
#elif HAVE_SSL
if (data->flags & SF_SECURE) {
if (SSL_write(data->ssl, xmlstr, strlen (xmlstr)) < 0) return IKS_NET_RWERR;
int r, err;
do {
r = SSL_write(data->ssl, xmlstr, strlen (xmlstr));
} while (r == -1 && (err = SSL_get_error(data->ssl, r)) == SSL_ERROR_WANT_WRITE);
if (r < 0) {
return IKS_NET_RWERR;
}
} else
#endif
{