generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR: 1990

Browse Source 
Update from 0.9.8-stable.
This commit is contained in:
Dr. Stephen Henson 2009-07-24 13:07:08 +00:00
parent f1ad8fb627
commit d069a4d15d
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crypto/bio/bss_dgram.c
View File

@ -250,17 +250,22 @@ static void dgram_reset_rcv_timeout(BIO *b)
{ {
#if defined(SO_RCVTIMEO) #if defined(SO_RCVTIMEO)
bio_dgram_data *data = (bio_dgram_data *)b->ptr; bio_dgram_data *data = (bio_dgram_data *)b->ptr;
/* Is a timer active? */
if (data->next_timeout.tv_sec > 0 || data->next_timeout.tv_usec > 0)
{
#ifdef OPENSSL_SYS_WINDOWS #ifdef OPENSSL_SYS_WINDOWS
int timeout = data->socket_timeout.tv_sec * 1000 + int timeout = data->socket_timeout.tv_sec * 1000 +
data->socket_timeout.tv_usec / 1000; data->socket_timeout.tv_usec / 1000;
if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
(void*)&timeout, sizeof(timeout)) < 0) (void*)&timeout, sizeof(timeout)) < 0)
{ perror("setsockopt"); } { perror("setsockopt"); }
#else #else
if ( setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &(data->socket_timeout), if ( setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &(data->socket_timeout),
sizeof(struct timeval)) < 0) sizeof(struct timeval)) < 0)
{ perror("setsockopt"); } { perror("setsockopt"); }
#endif #endif
}
#endif #endif
} }