Changeset 15443 in vbox

Timestamp:

Dec 13, 2008 1:57:35 PM (16 years ago)

Author:

vboxsync

Message:

slirp:icmp: Fix of ttl setting on Darwin

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_icmp.c (modified) (2 diffs)
• udp.c (modified) (2 diffs)

trunk/src/VBox/Devices/Network/slirp/ip_icmp.c

@@ -278 +278 @@
     int status;
     uint32_t dst;
+    int ttl;
 
     /* int code; */
@@ -408 +409 @@
                 /* Send the packet */
 # ifndef RT_OS_WINDOWS
-                LogRel(("NAT/ICMP: try to set TTL(%d)\n", ip->ip_ttl));
-                status = setsockopt(pData->icmp_socket.s, IPPROTO_IP, IP_TTL, (void *)&ip->ip_ttl, sizeof(ip->ip_ttl));
+                ttl = ip->ip_ttl;
+                LogRel(("NAT/ICMP: try to set TTL(%d)\n", ttl));
+                status = setsockopt(pData->icmp_socket.s, IPPROTO_IP, IP_TTL, (void *)&ttl, sizeof(ttl));
                 if (status < 0)
                 {

trunk/src/VBox/Devices/Network/slirp/udp.c

@@ -73 +73 @@
     struct socket *so;
 #ifdef VBOX_WITH_SLIRP_ICMP
-        int ret;
+    int ret;
+    int ttl;
 #endif
 
@@ -245 +246 @@
 
 #ifdef VBOX_WITH_SLIRP_ICMP
-    ip->ip_ttl = save_ip.ip_ttl;
-    ret = setsockopt(so->s, IPPROTO_IP, IP_TTL, (void *)&ip->ip_ttl, sizeof(ip->ip_ttl));
+    ttl = ip->ip_ttl = save_ip.ip_ttl;
+    ret = setsockopt(so->s, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl));
     if (ret < 0) {
         LogRel(("NAT: Error (%s) occurred while setting TTL(%d) attribute of IP packet to socket %R[natsock]\n", strerror(errno), ip->ip_ttl, so));