Changeset 107818 in vbox for trunk

Timestamp:

Jan 16, 2025 2:41:10 PM (4 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

166984

Message:

libslirp/socket.c: Don't apply disable_host_loopback to broadcast forwarding and don't apply broadcast forwarding to vhost_addr addresses. bugref:10268

File:

• trunk/src/libs/libslirp-4.8.0/src/socket.c (modified) (2 diffs)

trunk/src/libs/libslirp-4.8.0/src/socket.c

@@ -976 +976 @@
     }
 
+#ifdef VBOX
+    if (   s->fForwardBroadcast
+        && (   so->so_faddr.s_addr == 0xffffffff
+            || so->so_faddr.s_addr == (s->vnetwork_addr.s_addr | ~s->vnetwork_mask.s_addr)))
+        sin->sin_addr.s_addr = 0xffffffff;
+    else
+#endif
     if (so->so_faddr.s_addr == s->vhost_addr.s_addr ||
-#ifdef VBOX
-        so->so_faddr.s_addr == 0xffffffff ||
-        so->so_faddr.s_addr ==
-            (s->vnetwork_addr.s_addr|~s->vnetwork_mask.s_addr)) {
-#else
-        so->so_faddr.s_addr == 0xffffffff {
-#endif
+        so->so_faddr.s_addr == 0xffffffff) {
 
         if (s->disable_host_loopback) {
@@ -989 +990 @@
         }
 
-#ifdef VBOX
-        if (s->fForwardBroadcast)
-            sin->sin_addr.s_addr = 0xffffffff;
-        else
-#endif
-            sin->sin_addr = loopback_addr;
+        sin->sin_addr = loopback_addr;
     }