Changeset 37199 in vbox

Timestamp:

May 24, 2011 3:17:03 PM (14 years ago)

Author:

vboxsync

Message:

Device/Network/UDPTunnel: build integration

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• configure (modified) (7 diffs)
• configure.vbs (modified) (6 diffs)
• include/VBox/log.h (modified) (3 diffs)

trunk/Config.kmk

@@ -553 +553 @@
  endif
 endif
+# Enables the UDP tunnel transport.
+VBOX_WITH_UDPTUNNEL = 1
 # Enable Virtual Distributed Ethernet or not.
 if1of ($(KBUILD_TARGET), freebsd linux)

trunk/configure

@@ -4 +4 @@
 
 #
-# Copyright (C) 2006-2009 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -88 +88 @@
 WITH_OPENGL=1
 WITH_HARDENING=1
+WITH_UDPTUNNEL=1
 WITH_VDE=0
 WITH_VNC=0
@@ -2180 +2181 @@
 [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo "  --enable-vde             enable VDE networking"
 cat << EOF
+  --disable-udptunnel      disable UDP tunnel networking
   --disable-hardening      don't be strict about /dev/vboxdrv access
   --build-libxml2          build libxml2 from sources
@@ -2197 +2199 @@
   --with-iasl=PATH         location of the iasl compiler [$IASL]
   --with-mkisofs=PATH      location of mkisofs [$MKISOFS]
+  --with-makeself=PATH     location of makeself [$MAKESELF]
 EOF
 [ "$OS"    = "linux" ] && echo "  --with-linux=DIR         Linux kernel source directory [$LINUX]"
@@ -2294 +2297 @@
       MKISOFS=`echo $option | cut -d'=' -f2`
       ;;
+    --with-makeself=*)
+      MAKESELF=`echo $option | cut -d'=' -f2`
+      ;;
     --target-arch=*)
       TARGET_MACHINE=`echo $option | cut -d'=' -f2`
@@ -2353 +2359 @@
     --enable-hardening)
       WITH_HARDENING=2
+      ;;
+    --disable-udptunnel)
+      WITH_UDPTUNNEL=0
       ;;
     --enable-vde)
@@ -2603 +2612 @@
     cnf_append "VBOX_WITH_WEBSERVICES" ""
   fi
+fi
+
+# UDPTUNNEL
+if [ $WITH_UDPTUNNEL -eq 0 ]; then
+  cnf_append "VBOX_WITH_UDPTUNNEL" ""
 fi
 

trunk/configure.vbs

@@ -10 +10 @@
 
 '
-' Copyright (C) 2006-2007 Oracle Corporation
+' Copyright (C) 2006-2011 Oracle Corporation
 '
 ' This file is part of VirtualBox Open Source Edition (OSE), as
@@ -752 +752 @@
       CfgPrint "VBOX_WITH_DEBUGGER_GUI="
       CfgPrint "VBOX_WITHOUT_COM=1"
+   end if
+end sub
+
+
+''
+' No UDPTunnel
+sub DisableUDPTunnel(strReason)
+   if g_blnDisableUDPTunnel = False then
+      LogPrint "Disabled UDPTunnel network transport: " & strReason
+      g_blnDisableUDPTunnel = True
+      g_strDisableUDPTunnel = strReason
+      CfgPrint "VBOX_WITH_UDPTUNNEL="
    end if
 end sub
@@ -2228 +2240 @@
    Print "Components:"
    Print "  --disable-COM"
+   Print "  --disable-UDPTunnel"
    Print ""
    Print "Locations:"
@@ -2283 +2296 @@
    strOptMkisofs = ""
    blnOptDisableCOM = False
+   blnOptDisableUDPTunnel = False
    for i = 1 to Wscript.Arguments.Count
       dim str, strArg, strPath
@@ -2337 +2351 @@
          case "--enable-com"
             blnOptDisableCOM = False
+         case "--disable-udptunnel"
+            blnOptDisableUDPTunnel = True
          case "--internal"
             g_blnInternalMode = True
@@ -2376 +2392 @@
       DisableCOM "--disable-com"
    end if
+   if blnOptDisableUDPTunnel = True then
+      DisableUDPTunnel "--disable-udptunnel"
    CheckSourcePath
    CheckForkBuild strOptkBuild

trunk/include/VBox/log.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -200 +200 @@
     /** TUN network transport driver group */
     LOG_GROUP_DRV_TUN,
+    /** UDP tunnet network transport driver group. */
+    LOG_GROUP_DRV_UDPTUNNEL,
     /** USB Proxy driver group. */
     LOG_GROUP_DRV_USBPROXY,
@@ -445 +447 @@
     "DRV_TRANSPORT_ASYNC", \
     "DRV_TUN",      \
+    "DRV_UDPTUNNEL", \
     "DRV_USBPROXY", \
     "DRV_VBOXHDD",  \