mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-24 15:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

sockets.c: Don't rely on #defines in socket.h to be in sync with ip.h

Browse Source 
Map SO_* to SOF_* #defines
This commit is contained in:
Dirk Ziegelmeier 2017-11-08 09:03:26 +01:00
parent da01bc4d15
commit b0344518e8
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/api/sockets.c
View File

@ -2776,6 +2776,26 @@ lwip_getsockopt_callback(void *arg)
}
#endif /* LWIP_TCPIP_CORE_LOCKING */
static int
lwip_sockopt_to_ipopt(int optname)
{
/* Map SO_* values to our internal SOF_* values
* We should not rely on #defines in socket.h
* being in sync with ip.h.
*/
switch (optname) {
case SO_BROADCAST:
return SOF_BROADCAST;
case SO_KEEPALIVE:
return SOF_KEEPALIVE;
case SO_REUSEADDR:
return SOF_REUSEADDR;
default:
LWIP_ASSERT("Unknown socket option", 0);
return 0;
}
}
/** lwip_getsockopt_impl: the actual implementation of getsockopt:
* same argument as lwip_getsockopt, either called directly or through callback
*/
@ -2820,6 +2840,9 @@ lwip_getsockopt_impl(int s, int level, int optname, void *optval, socklen_t *opt
done_socket(sock);
return ENOPROTOOPT;
}
optname = lwip_sockopt_to_ipopt(optname);
LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, *optlen, int);
*(int *)optval = ip_get_option(sock->conn->pcb.ip, optname);
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, SOL_SOCKET, optname=0x%x, ..) = %s\n",
@ -3219,6 +3242,9 @@ lwip_setsockopt_impl(int s, int level, int optname, const void *optval, socklen_
done_socket(sock);
return ENOPROTOOPT;
}
optname = lwip_sockopt_to_ipopt(optname);
LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, optlen, int);
if (*(const int *)optval) {
ip_set_option(sock->conn->pcb.ip, optname);