Refactored sockopts

Author: cimacmillan

core/iwasm/libraries/lib-socket/src/wasi/wasi_socket_ext.c

@@ -487,62 +487,74 @@ timeval_to_time_us(struct timeval tv)
 }
 
 int
-getsockopt(int sockfd, int level, int optname, void *__restrict optval,
-           socklen_t *__restrict optlen)
+get_sol_socket_option(int sockfd, int optname, void *__restrict optval,
+                      socklen_t *__restrict optlen)
 {
     __wasi_errno_t error;
     uint64_t timeout_us;
 
+    switch (optname) {
+        case SO_RCVTIMEO:
+            assert(*optlen == sizeof(struct timeval));
+            error = __wasi_sock_get_recv_timeout(sockfd, &timeout_us);
+            HANDLE_ERROR(error);
+            *(struct timeval *)optval = time_us_to_timeval(timeout_us);
+            return error;
+        case SO_SNDTIMEO:
+            assert(*optlen == sizeof(struct timeval));
+            error = __wasi_sock_get_send_timeout(sockfd, &timeout_us);
+            HANDLE_ERROR(error);
+            *(struct timeval *)optval = time_us_to_timeval(timeout_us);
+            return error;
+    }
+
+    HANDLE_ERROR(__WASI_ERRNO_NOTSUP);
+}
+
+int
+getsockopt(int sockfd, int level, int optname, void *__restrict optval,
+           socklen_t *__restrict optlen)
+{
     switch (level) {
         case SOL_SOCKET:
-            switch (optname) {
-                case SO_RCVTIMEO:
-                    assert(*optlen == sizeof(struct timeval));
-                    error = __wasi_sock_get_recv_timeout(sockfd, &timeout_us);
-                    HANDLE_ERROR(error);
-                    *(struct timeval *)optval = time_us_to_timeval(timeout_us);
-                    return error;
-                    break;
-                case SO_SNDTIMEO:
-                    assert(*optlen == sizeof(struct timeval));
-                    error = __wasi_sock_get_send_timeout(sockfd, &timeout_us);
-                    HANDLE_ERROR(error);
-                    *(struct timeval *)optval = time_us_to_timeval(timeout_us);
-                    return error;
-                    break;
-            }
-            break;
+            return get_sol_socket_option(sockfd, optname, optval, optlen);
     }
 
     HANDLE_ERROR(__WASI_ERRNO_NOTSUP);
 }
 
 int
-setsockopt(int sockfd, int level, int optname, const void *optval,
-           socklen_t optlen)
+set_sol_socket_option(int sockfd, int optname, const void *optval,
+                      socklen_t optlen)
 {
     __wasi_errno_t error;
     uint64_t timeout_us;
 
+    switch (optname) {
+        case SO_RCVTIMEO:
+            assert(optlen == sizeof(struct timeval));
+            timeout_us = timeval_to_time_us(*(struct timeval *)optval);
+            error = __wasi_sock_set_recv_timeout(sockfd, timeout_us);
+            HANDLE_ERROR(error);
+            return error;
+        case SO_SNDTIMEO:
+            assert(optlen == sizeof(struct timeval));
+            timeout_us = timeval_to_time_us(*(struct timeval *)optval);
+            error = __wasi_sock_set_send_timeout(sockfd, timeout_us);
+            HANDLE_ERROR(error);
+            return error;
+    }
+
+    HANDLE_ERROR(__WASI_ERRNO_NOTSUP);
+}
+
+int
+setsockopt(int sockfd, int level, int optname, const void *optval,
+           socklen_t optlen)
+{
     switch (level) {
         case SOL_SOCKET:
-            switch (optname) {
-                case SO_RCVTIMEO:
-                    assert(optlen == sizeof(struct timeval));
-                    timeout_us = timeval_to_time_us(*(struct timeval *)optval);
-                    error = __wasi_sock_set_recv_timeout(sockfd, timeout_us);
-                    HANDLE_ERROR(error);
-                    return error;
-                    break;
-                case SO_SNDTIMEO:
-                    assert(optlen == sizeof(struct timeval));
-                    timeout_us = timeval_to_time_us(*(struct timeval *)optval);
-                    error = __wasi_sock_set_send_timeout(sockfd, timeout_us);
-                    HANDLE_ERROR(error);
-                    return error;
-                    break;
-            }
-            break;
+            return set_sol_socket_option(sockfd, optname, optval, optlen);
     }
 
     HANDLE_ERROR(__WASI_ERRNO_NOTSUP);