Changeset 107548 in vbox for trunk/src/libs

Timestamp:

Jan 8, 2025 7:54:13 PM (2 months ago)

Author:

vboxsync

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

166619

Message:

Devices/Network: Fixed and added configuration for packets broadcast to NAT adapter's network. Propagated additional parameters from CFGM. Simplified port forwarding a bit and added additional release logging. bugref:10268

Location:

trunk/src/libs/libslirp-4.8.0

Files:

• include/glib.h (modified) (1 diff)
• src/libslirp.h (modified) (1 diff)
• src/slirp.c (modified) (1 diff)
• src/slirp.h (modified) (1 diff)
• src/socket.c (modified) (3 diffs)
• src/udp.c (modified) (1 diff)

trunk/src/libs/libslirp-4.8.0/include/glib.h

@@ -35 +35 @@
 
 #ifndef INCLUDED_glib_h
+#define INCLUDED_glib_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once

trunk/src/libs/libslirp-4.8.0/src/libslirp.h

@@ -210 +210 @@
      */
     uint8_t oob_eth_addr[6];
+#ifdef VBOX
+    /*
+     * Allow for network broadcasts to be sent out of internal NAT network.
+     * When true, all devices on host's network would receive broadcasts if
+     * host's network configuration allows.
+     */
+    bool fForwardBroadcast;
+
+    /*
+     * Set a maximum number of pending socket connections to be passeed to
+     * the backlog parameter of listen().
+     */
+    int iSoMaxConn;
+#endif
 } SlirpConfig;
 

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

@@ -699 +699 @@
     }
 
+#ifdef VBOX
+    slirp->fForwardBroadcast = cfg->fForwardBroadcast;
+    slirp->iSoMaxConn = cfg->iSoMaxConn;
+#endif
+
     ip6_post_init(slirp);
     return slirp;

trunk/src/libs/libslirp-4.8.0/src/slirp.h

@@ -218 +218 @@
     struct sockaddr_in6 *outbound_addr6;
     bool disable_dns; /* slirp will not redirect/serve any DNS packet */
+
+#ifdef VBOX
+    bool fForwardBroadcast;
+    int iSoMaxConn;
+#endif
 };
 

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

@@ -656 +656 @@
         DEBUG_MISC(" did recvfrom %d, errno = %d-%s", m->m_len, errno,
                    strerror(errno));
-        if (m->m_len < 0) {     
+        if (m->m_len < 0) {
             if (errno == ENOTCONN) {
                 /*
@@ -868 +868 @@
         (slirp_socket_set_fast_reuse(s) < 0) ||
         (bind(s, haddr, haddrlen) < 0) ||
+#ifdef VBOX
+        (listen(s, slirp->iSoMaxConn) < 0)) {
+#else
         (listen(s, 1) < 0)) {
+#endif
         int tmperrno = errno; /* Don't clobber the real reason we failed */
         if (s >= 0) {
@@ -973 +977 @@
 
     if (so->so_faddr.s_addr == s->vhost_addr.s_addr ||
-        so->so_faddr.s_addr == 0xffffffff) {
+#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
+
         if (s->disable_host_loopback) {
             return false;
         }
 
-        sin->sin_addr = loopback_addr;
+#ifdef VBOX
+        if (s->fForwardBroadcast)
+            sin->sin_addr.s_addr = 0xffffffff;
+        else
+#endif
+            sin->sin_addr = loopback_addr;
     }
 

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

@@ -222 +222 @@
     }
     setsockopt(so->s, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl));
+#ifdef VBOX
+    if (    slirp->fForwardBroadcast
+        && (   so->so_faddr.s_addr == (slirp->vnetwork_addr.s_addr|~slirp->vnetwork_mask.s_addr) 
+            || so->so_faddr.s_addr == 0xffffffff)   )
+        setsockopt(so->s, SOL_SOCKET, SO_BROADCAST, &(int){1}, sizeof(int));
+#endif
 
     /*