Changeset 91466 in vbox

Timestamp:

Sep 29, 2021 4:57:26 PM (3 years ago)

Author:

vboxsync

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

147150

Message:

VMNet: bugref:9932 Fixed uninitialized max_packet_size, really enabled VBOX_WITH_VMNET, minor log improvements

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Devices/Network/DrvVMNet.m (modified) (5 diffs)

trunk/Config.kmk

@@ -847 +847 @@
 VBOX_WITH_CLOUD_NET = 1
 # Use Mac OS X VMNET API instead of network kernel extensions
-ifeq ($(KBUILD_TARGET),darwin)
- # Ignore VMNET for special builds
- if !defined(VBOX_ONLY_VALIDATIONKIT) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_EXTPACKS)
-  # VMNET can only be compiled with the newer Xcode
-  ifdef VBOX_WITH_EVEN_NEWER_XCODE
-   # Comment out VBOX_WITH_VMNET to use old-style network kernel extensions
-   VBOX_WITH_VMNET = 1
-   ifdef VBOX_WITH_VMNET
-    # Use SDK 10.15
-    VBOX_DEF_MACOSX_VERSION_MIN=10.15# Catalina
-   endif
-  endif
- endif
-endif
+VBOX_WITH_VMNET = 1
 ## @}
 
@@ -2402 +2389 @@
 VBOX_GOOD_COMSPEC = $(subst \,/,$(SystemRoot))/System32/cmd.exe
 VBOX_GOOD_COMSPEC_BS ?= $(subst /,\,$(VBOX_GOOD_COMSPEC))
+
+# Disable VMNET depending on platform / build / LocalConfig.kmk settings
+ifneq ($(KBUILD_TARGET),darwin)
+ VBOX_WITH_VMNET=
+endif
+# Disable VMNET for special builds
+if defined(VBOX_ONLY_VALIDATIONKIT) || defined(VBOX_ONLY_ADDITIONS) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_EXTPACKS)
+ VBOX_WITH_VMNET=
+endif
+# VMNET can only be compiled with the newer Xcode
+ifndef VBOX_WITH_EVEN_NEWER_XCODE
+ VBOX_WITH_VMNET=
+endif
+# Force SDK 10.15 for VMNET
+ifdef VBOX_WITH_VMNET
+ VBOX_DEF_MACOSX_VERSION_MIN=10.15# Catalina
+endif
 
 #

trunk/src/VBox/Devices/Network/DrvVMNet.m

@@ -374 +374 @@
                 Log(("drvVMNetAttachBridged: Failed to convert '%s' to MAC address (%Rrc)\n", pcszMacAddress ? pcszMacAddress : "(null)", rc));
 #endif
+            max_packet_size = xpc_dictionary_get_uint64(interface_param, vmnet_max_packet_size_key);
 #ifdef LOG_ENABLED
-            max_packet_size = xpc_dictionary_get_uint64(interface_param, vmnet_max_packet_size_key);
             // Log(("MAC address: %s\n", xpc_dictionary_get_string(interface_param, vmnet_mac_address_key)));
             Log(("Max packet size: %zu\n", max_packet_size));
@@ -399 +399 @@
         return VMNET_FAILURE;
     }
+
+    LogRel(("VMNET: Max packet size is %zu\n", max_packet_size));
 
     vmnet_interface_set_event_callback(pThis->Interface, VMNET_INTERFACE_PACKETS_AVAILABLE, pThis->InterfaceQueue, ^(interface_event_t event_mask, xpc_object_t  _Nonnull event) {
@@ -420 +422 @@
             rc = vmnet_read(pThis->Interface, &packets, &packet_count);
             if (rc != VMNET_SUCCESS)
-                Log(("Failed to read packets\n"));
+                Log(("Failed to read packets, rc=%d\n", rc));
             else
             {
@@ -570 +572 @@
 
             pThis->uMode = VMNET_HOST_MODE;
-            LogRel(("VMNet: host network with mask %s (%s to %s)\n", pThis->szNetworkMask, pThis->szLowerIP, pThis->szUpperIP));
+            LogRel(("VMNet: Host network with mask %s (%s to %s)\n", pThis->szNetworkMask, pThis->szLowerIP, pThis->szUpperIP));
             break;
 
@@ -582 +584 @@
                                         N_("Configuration error: Failed to get the \"Trunk\" value"));
             pThis->uMode = VMNET_BRIDGED_MODE;
-            LogRel(("VMNet: bridge to %s\n", pThis->szHostInterface));
+            LogRel(("VMNet: Bridge to %s\n", pThis->szHostInterface));
             break;