Changeset 46969 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jul 4, 2013 6:35:01 AM (12 years ago)

Author:

vboxsync

Message:

backed out r86967,r86968,r86969,r86970,r86971,r86972,r86973,r86975,r86976.
will fix build locally.

Location:

trunk/src/VBox/Main/include

Files:

• DHCPServerImpl.h (modified) (3 diffs)
• HostImpl.h (modified) (2 diffs)
• NATNetworkImpl.h (modified) (1 diff)
• NetworkServiceRunner.h (deleted)

trunk/src/VBox/Main/include/DHCPServerImpl.h

@@ -30 +30 @@
 {
     struct DHCPServer;
-    struct VmNameSlotKey;
 }
-#ifdef RT_OS_WINDOWS
-# define DHCP_EXECUTABLE_NAME "VBoxNetDHCP.exe"
-#else
-# define DHCP_EXECUTABLE_NAME "VBoxNetDHCP"
-#endif
-
-class DHCPServerRunner: public NetworkServiceRunner
-{
-public:
-    DHCPServerRunner():NetworkServiceRunner(DHCP_EXECUTABLE_NAME){}
-    virtual ~DHCPServerRunner(){};
-};
-
-/**
- *  for server configuration needs, it's perhaps better to use (VM,slot) pair
- *  (vm-name, slot) <----> (MAC)
- *  
- *  but for client configuration, when server will have MACs at hand, it'd be
- *  easier to requiest options by MAC.
- *  (MAC) <----> (option-list)
- *
- *  Doubts: What should be done if MAC changed for (vm-name, slot), when syncing should? 
- *  XML: serialization of dependecy (DHCP options) - (VM,slot) shouldn't be done via MAC in 
- *  the middle.
- */
-
-typedef std::map<DhcpOpt_T, com::Utf8Str> DhcpOptionMap;
-typedef DhcpOptionMap::value_type DhcpOptValuePair;
-typedef DhcpOptionMap::const_iterator DhcpOptConstIterator;
-typedef DhcpOptionMap::iterator DhcpOptIterator;
-
-typedef std::map<settings::VmNameSlotKey, DhcpOptionMap> VmSlot2OptionsMap;
-typedef VmSlot2OptionsMap::value_type VmSlot2OptionsPair;
-typedef VmSlot2OptionsMap::iterator VmSlot2OptionsIterator;
-
 
 class ATL_NO_VTABLE DHCPServer :
@@ -106 +70 @@
     STDMETHOD(COMGETTER(UpperIP))(BSTR *aIPAddress);
 
-    STDMETHOD(AddGlobalOption)(DhcpOpt_T aOption, IN_BSTR aValue);
-    STDMETHOD(COMGETTER(GlobalOptions))(ComSafeArrayOut(BSTR, aValue));
-    STDMETHOD(COMGETTER(VmConfigs))(ComSafeArrayOut(BSTR, aValue));
-    STDMETHOD(AddVmSlotOption)(IN_BSTR aVmName, LONG aSlot, DhcpOpt_T aOption, IN_BSTR aValue);
-    STDMETHOD(RemoveVmSlotOptions)(IN_BSTR aVmName, LONG aSlot);
-    STDMETHOD(GetVmSlotOptions)(IN_BSTR aVmName, LONG aSlot, ComSafeArrayOut(BSTR, aValues));
-    STDMETHOD(GetMacOptions)(IN_BSTR aMAC, ComSafeArrayOut(BSTR, aValues));
-    STDMETHOD(COMGETTER(EventSource))(IEventSource **aEventSource);
-    
-
     STDMETHOD(SetConfiguration)(IN_BSTR aIPAddress, IN_BSTR aNetworkMask, IN_BSTR aFromIPAddress, IN_BSTR aToIPAddress);
 
@@ -132 +86 @@
 
         Bstr IPAddress;
+        Bstr networkMask;
         Bstr lowerIP;
         Bstr upperIP;
+        BOOL enabled;
 
-        BOOL enabled;
         DHCPServerRunner dhcp;
-        
-        DhcpOptionMap GlobalDhcpOptions;
-        VmSlot2OptionsMap VmSlot2Options;
     } m;
-    
-    DhcpOptionMap& findOptMapByVmNameSlot(const com::Utf8Str& aVmName, 
-                                   LONG Slot);
+
 };
 

trunk/src/VBox/Main/include/HostImpl.h

@@ -62 +62 @@
     STDMETHOD(COMGETTER(USBDeviceFilters))(ComSafeArrayOut(IHostUSBDeviceFilter *, aUSBDeviceFilters));
     STDMETHOD(COMGETTER(NetworkInterfaces))(ComSafeArrayOut(IHostNetworkInterface *, aNetworkInterfaces));
-    STDMETHOD(COMGETTER(NameServers))(ComSafeArrayOut(BSTR, aNameServers));
-    STDMETHOD(COMGETTER(DomainName))(BSTR *aDomainName);
-    STDMETHOD(COMGETTER(SearchStrings))(ComSafeArrayOut(BSTR, aSearchStrings));
-
     STDMETHOD(COMGETTER(ProcessorCount))(ULONG *count);
     STDMETHOD(COMGETTER(ProcessorOnlineCount))(ULONG *count);
@@ -151 +147 @@
     HRESULT updateNetIfList();
 
-#ifndef RT_OS_WINDOWS
-    HRESULT parseResolvConf();
-#else
-    HRESULT fetchNameResolvingInformation();
-#endif
-
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
     void registerMetrics(PerformanceCollector *aCollector);

trunk/src/VBox/Main/include/NATNetworkImpl.h

@@ -37 +37 @@
 }
 
-#ifdef RT_OS_WINDOWS
-# define NATSR_EXECUTABLE_NAME "VBoxNetLwipNAT.exe"
-#else
-# define NATSR_EXECUTABLE_NAME "VBoxNetLwipNAT"
-#endif
-
-class NATNetworkServiceRunner: public NetworkServiceRunner
-{
-public: 
-    NATNetworkServiceRunner(): NetworkServiceRunner(NATSR_EXECUTABLE_NAME){}
-    virtual ~NATNetworkServiceRunner(){}
-};
 
 class ATL_NO_VTABLE NATNetwork :