feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

remove memset for setcokopt uninit

Browse Source
This commit is contained in:
toddouska
2012-10-31 15:43:08 -07:00
parent d732a2ef07
commit a4220120ba
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/io.c
View File

@@ -123,6 +123,16 @@
#endif #endif
#ifdef CYASSL_DTLS
/* sizeof(struct timeval) will pass uninit bytes to setsockopt if padded */
#ifdef USE_WINDOWS_API
#define TIMEVAL_BYTES sizeof(timeout)
#else
#define TIMEVAL_BYTES sizeof(timeout.tv_sec) + sizeof(timeout.tv_usec)
#endif
#endif
static INLINE int LastError(void) static INLINE int LastError(void)
{ {
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
@@ -152,12 +162,10 @@ int EmbedReceive(CYASSL *ssl, char *buf, int sz, void *ctx)
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
DWORD timeout = dtls_timeout * 1000; DWORD timeout = dtls_timeout * 1000;
#else #else
struct timeval timeout; struct timeval timeout = {dtls_timeout, 0};
XMEMSET(&timeout, 0, sizeof(struct timeval));
timeout.tv_sec = dtls_timeout;
#endif #endif
setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO,
(char*)&timeout, sizeof(timeout)); (char*)&timeout, TIMEVAL_BYTES);
} }
} }
#endif #endif
@@ -277,12 +285,10 @@ int EmbedReceiveFrom(CYASSL *ssl, char *buf, int sz, void *ctx)
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
DWORD timeout = dtls_timeout * 1000; DWORD timeout = dtls_timeout * 1000;
#else #else
struct timeval timeout; struct timeval timeout = { dtls_timeout, 0 };
XMEMSET(&timeout, 0, sizeof(struct timeval));
timeout.tv_sec = dtls_timeout;
#endif #endif
setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO,
(char*)&timeout, sizeof(timeout)); (char*)&timeout, TIMEVAL_BYTES);
} }
recvd = (int)RECVFROM_FUNCTION(sd, buf, sz, ssl->rflags, recvd = (int)RECVFROM_FUNCTION(sd, buf, sz, ssl->rflags,