Fixed receiving TTL info OOB in ICMP sockets

Author: danielinux

src/port/posix/bsd_socket.c

@@ -236,14 +236,16 @@ static void wolfip_fill_ttl_control(struct wolfIP *ipstack, int sockfd, struct m
     int ttl;
     int ttl_status;
     struct cmsghdr *cmsg;
+    socklen_t ctrl_len;
 
     if (!msg)
         return;
+    ctrl_len = msg->msg_controllen;
     msg->msg_controllen = 0;
     ttl_status = wolfIP_sock_get_recv_ttl(ipstack, sockfd, &ttl);
     if (ttl_status <= 0)
         return;
-    if (!msg->msg_control || msg->msg_controllen < (socklen_t)CMSG_SPACE(sizeof(int)))
+    if (!msg->msg_control || ctrl_len < (socklen_t)CMSG_SPACE(sizeof(int)))
         return;
     cmsg = (struct cmsghdr *)msg->msg_control;
     cmsg->cmsg_level = SOL_IP;

src/wolfip.c

@@ -22,12 +22,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <stddef.h>
-#include <unistd.h>
-#ifdef WOLF_POSIX
-#include <poll.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
 #include "wolfip.h"
 #include "config.h"
 
@@ -2364,21 +2358,18 @@ int wolfIP_sock_setsockopt(struct wolfIP *s, int sockfd, int level, int optname,
     struct tsocket *ts = wolfIP_socket_from_fd(s, sockfd);
     if (!ts)
         return -WOLFIP_EINVAL;
-#ifdef WOLF_POSIX
-    if (level == SOL_IP && optname == IP_RECVTTL) {
+    if (level == WOLFIP_SOL_IP && optname == WOLFIP_IP_RECVTTL) {
         int enable;
         if (!optval || optlen < (socklen_t)sizeof(int))
             return -WOLFIP_EINVAL;
         memcpy(&enable, optval, sizeof(int));
         ts->recv_ttl = enable ? 1 : 0;
         return 0;
     }
-#else
     (void)level;
     (void)optname;
     (void)optval;
     (void)optlen;
-#endif
     return 0;
 }
 
@@ -2399,22 +2390,19 @@ int wolfIP_sock_getsockopt(struct wolfIP *s, int sockfd, int level, int optname,
     struct tsocket *ts = wolfIP_socket_from_fd(s, sockfd);
     if (!ts)
         return -WOLFIP_EINVAL;
-#ifdef WOLF_POSIX
-    if (level == SOL_IP && optname == IP_RECVTTL) {
+    if (level == WOLFIP_SOL_IP && optname == WOLFIP_IP_RECVTTL) {
         int value;
         if (!optval || !optlen || *optlen < (socklen_t)sizeof(int))
             return -WOLFIP_EINVAL;
-        value = ts->recv_ttl ? 1 : 0;
+        value = ts->recv_ttl ? ts->last_pkt_ttl : 0;
         memcpy(optval, &value, sizeof(int));
         *optlen = sizeof(int);
         return 0;
     }
-#else
     (void)level;
     (void)optname;
     (void)optval;
     (void)optlen;
-#endif
     return 0;
 }
 int wolfIP_sock_close(struct wolfIP *s, int sockfd)

wolfip.h

@@ -24,6 +24,22 @@ typedef unsigned long size_t;
 #  define __size_t_defined
 #endif
 
+#ifndef WOLFIP_SOL_IP
+#  ifdef SOL_IP
+#    define WOLFIP_SOL_IP SOL_IP
+#  else
+#    define WOLFIP_SOL_IP 0
+#  endif
+#endif
+
+#ifndef WOLFIP_IP_RECVTTL
+#  ifdef IP_RECVTTL
+#    define WOLFIP_IP_RECVTTL IP_RECVTTL
+#  else
+#    define WOLFIP_IP_RECVTTL 12
+#  endif
+#endif
+
 /* Types */
 struct wolfIP;
 typedef uint32_t ip4;