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

getsockopt needs to take in an int

Browse Source 
This caused an issue on big endian platforms

From the getsockopt man page:
       Most socket-level options utilize an int argument for optval.  For setsockopt(), the argument should be non‐
       zero to enable a boolean option, or zero if the option is to be disabled.
This commit is contained in:
Juliusz Sosinowicz
2023-07-06 10:38:51 +02:00
parent 652c5491fe
commit 0b4e4287c9
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wolfio.c
View File

@ -418,12 +418,12 @@ static int PeerIsIpv6(const SOCKADDR_S *peer, XSOCKLENT len)
static int isDGramSock(int sfd) static int isDGramSock(int sfd)
{ {
char type = 0; int type = 0;
/* optvalue 'type' is of size int */ /* optvalue 'type' is of size int */
XSOCKLENT length = (XSOCKLENT)sizeof(char); XSOCKLENT length = (XSOCKLENT)sizeof(type);
if (getsockopt(sfd, SOL_SOCKET, SO_TYPE, &type, &length) == 0 && if (getsockopt(sfd, SOL_SOCKET, SO_TYPE, (XSOCKOPT_TYPE_OPTVAL_TYPE)&type,
type != SOCK_DGRAM) { &length) == 0 && type != SOCK_DGRAM) {
return 0; return 0;
} }
else { else {

7
wolfssl/wolfio.h
View File

@ -381,6 +381,13 @@
#define XSOCKLENT socklen_t #define XSOCKLENT socklen_t
#endif #endif
#endif #endif
#ifndef XSOCKOPT_TYPE_OPTVAL_TYPE
#ifdef USE_WINDOWS_API
#define XSOCKOPT_TYPE_OPTVAL_TYPE void*
#else
#define XSOCKOPT_TYPE_OPTVAL_TYPE char*
#endif
#endif
/* Socket Addr Support */ /* Socket Addr Support */
#ifdef HAVE_SOCKADDR #ifdef HAVE_SOCKADDR