getsockopt/setsockopt

Author: WinterMute

gc/network.h

@@ -175,7 +175,7 @@ s32 net_recvfrom(s32 s,void *mem,s32 len,u32 flags,struct sockaddr *from,socklen
 s32 net_read(s32 s,void *mem,s32 len);
 s32 net_close(s32 s);
 s32 net_select(s32 maxfdp1,fd_set *readset,fd_set *writeset,fd_set *exceptset,struct timeval *timeout);
-s32 net_getsockopt(s32 s,u32 level,u32 optname,const void *optval,socklen_t optlen);
+s32 net_getsockopt(s32 s,u32 level,u32 optname,const void *optval,socklen_t *optlen);
 s32 net_setsockopt(s32 s,u32 level,u32 optname,const void *optval,socklen_t optlen);
 s32 net_getsockname(s32 s, struct sockaddr *addr, socklen_t *addrlen);
 s32 net_ioctl(s32 s, u32 cmd, void *argp);

libogc/CMakeLists.txt

@@ -20,6 +20,8 @@ add_library(ogc STATIC
 	ogc_sockets/soc_poll.c
 	ogc_sockets/soc_getsockname.c
 	ogc_sockets/soc_fcntl.c
+	ogc_sockets/soc_getsockopt.c
+	ogc_sockets/soc_setsockopt.c
 
 	console.c
 	lwp_queue.c

libogc/network_wii.c

@@ -1032,6 +1032,12 @@ s32 net_select(s32 maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset
     return ret;
 }
 
+s32 net_getsockopt(s32 s, u32 level, u32 optname, const void *optval, socklen_t *optlen)
+{
+	// not yet implemented
+	return -EINVAL;
+}
+
 s32 net_setsockopt(s32 s, u32 level, u32 optname, const void *optval, socklen_t optlen)
 {
 	s32 ret;

libogc/ogc_sockets/soc_getsockopt.c

@@ -0,0 +1,21 @@
+#include "soc_common.h"
+#include <errno.h>
+#include <sys/socket.h>
+
+int getsockopt(int sockfd, int level, int optname, void *optval, socklen_t *optlen)
+{
+	sockfd = soc_get_fd(sockfd);
+	if(sockfd < 0) {
+		errno = -sockfd;
+		return -1;
+	}
+
+
+	int ret = net_getsockopt(sockfd, level, optname, optval, optlen);
+
+	if (ret<0) {
+		errno = -ret;
+		return -1;
+	}
+	return 0;
+}

libogc/ogc_sockets/soc_setsockopt.c

@@ -0,0 +1,21 @@
+#include "soc_common.h"
+#include <errno.h>
+#include <sys/socket.h>
+
+int setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t optlen)
+{
+	sockfd = soc_get_fd(sockfd);
+	if(sockfd < 0) {
+		errno = -sockfd;
+		return -1;
+	}
+
+
+	int ret = net_setsockopt(sockfd, level, optname, optval, optlen);
+
+	if (ret<0) {
+		errno = -ret;
+		return -1;
+	}
+	return 0;
+}

lwip/network.c

@@ -2102,10 +2102,12 @@ s32 net_select(s32 maxfdp1,fd_set *readset,fd_set *writeset,fd_set *exceptset,st
 	return nready;
 }
 
-s32 net_getsockopt(s32 s,u32 level,u32 optname,const void *optval,socklen_t optlen)
+s32 net_getsockopt(s32 s,u32 level,u32 optname,const void *optval,socklen_t *optlen)
 {
 	s32 err = 0;
 	struct netsocket *sock;
+	socklen_t optval_len=0;
+	if(optlen) optval_len = *optlen;
 
 	sock = get_socket(s);
 	if(sock==NULL) return -ENOTSOCK;
@@ -2120,7 +2122,7 @@ s32 net_getsockopt(s32 s,u32 level,u32 optname,const void *optval,socklen_t optl
 				case SO_KEEPALIVE:
 				case SO_REUSEADDR:
 				case SO_REUSEPORT:
-					if(optlen<sizeof(u32)) err = EINVAL;
+					if(optval_len<sizeof(u32)) err = EINVAL;
 					break;
 				default:
 					LWIP_DEBUGF(SOCKETS_DEBUG, ("net_getsockopt(%d, SOL_SOCKET, UNIMPL: optname=0x%x, ..)\n", s, optname));
@@ -2134,7 +2136,7 @@ s32 net_getsockopt(s32 s,u32 level,u32 optname,const void *optval,socklen_t optl
 			switch(optname) {
 				case IP_TTL:
 				case IP_TOS:
-					if(optlen<sizeof(u32)) err = EINVAL;
+					if(optval_len<sizeof(u32)) err = EINVAL;
 					break;
 				default:
 					LWIP_DEBUGF(SOCKETS_DEBUG, ("net_getsockopt(%d, IPPROTO_IP, UNIMPL: optname=0x%x, ..)\n", s, optname));
@@ -2145,7 +2147,7 @@ s32 net_getsockopt(s32 s,u32 level,u32 optname,const void *optval,socklen_t optl
 
 		case  IPPROTO_TCP:
 		{
-			if(optlen<sizeof(u32)) {
+			if(optval_len<sizeof(u32)) {
 				err = EINVAL;
 				break;
 			}