← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

Viewing changes to src/VBox/Main/include/DHCPServerImpl.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/include/DHCPServerImpl.h
25
25
#define ____H_H_DHCPSERVERIMPL
26
26
 
27
27
#include "VirtualBoxBase.h"
28
 
#include "VirtualBoxImpl.h"
 
28
 
 
29
class VirtualBox;
29
30
 
30
31
#ifdef VBOX_WITH_HOSTNETIF_API
31
 
/* class DHCPServer; */
32
 
/* #include "netif.h" */
33
32
struct NETIFINFO;
34
33
#endif
35
34
 
 
35
namespace settings
 
36
{
 
37
    struct DHCPServer;
 
38
}
 
39
 
36
40
class ATL_NO_VTABLE DHCPServer :
37
 
    public VirtualBoxBaseNEXT,
38
 
    public VirtualBoxSupportErrorInfoImpl <DHCPServer, IDHCPServer>,
39
 
    public VirtualBoxSupportTranslation <DHCPServer>,
 
41
    public VirtualBoxBase,
 
42
    public VirtualBoxSupportErrorInfoImpl<DHCPServer, IDHCPServer>,
 
43
    public VirtualBoxSupportTranslation<DHCPServer>,
40
44
    VBOX_SCRIPTABLE_IMPL(IDHCPServer)
41
45
{
42
46
public:
53
57
        COM_INTERFACE_ENTRY (IDispatch)
54
58
    END_COM_MAP()
55
59
 
56
 
    NS_DECL_ISUPPORTS
57
 
 
58
60
    DECLARE_EMPTY_CTOR_DTOR (DHCPServer)
59
61
 
60
62
    HRESULT FinalConstruct();
61
63
    void FinalRelease();
62
64
 
63
 
    HRESULT init(VirtualBox *aVirtualBox, IN_BSTR aName);
64
 
    HRESULT init(VirtualBox *aVirtualBox, const settings::Key &aNode);
65
 
    HRESULT saveSettings (settings::Key &aParentNode);
 
65
    HRESULT init(VirtualBox *aVirtualBox,
 
66
                 IN_BSTR aName);
 
67
    HRESULT init(VirtualBox *aVirtualBox,
 
68
                 const settings::DHCPServer &data);
 
69
    HRESULT saveSettings(settings::DHCPServer &data);
66
70
 
67
71
    void uninit();
68
72
 
69
73
    // IDHCPServer properties
70
 
    STDMETHOD(COMGETTER(NetworkName)) (BSTR *aName);
71
 
    STDMETHOD(COMGETTER(Enabled)) (BOOL *aEnabled);
72
 
    STDMETHOD(COMSETTER(Enabled)) (BOOL aEnabled);
73
 
    STDMETHOD(COMGETTER(IPAddress)) (BSTR *aIPAddress);
74
 
    STDMETHOD(COMGETTER(NetworkMask)) (BSTR *aNetworkMask);
75
 
    STDMETHOD(COMGETTER(LowerIP)) (BSTR *aIPAddress);
76
 
    STDMETHOD(COMGETTER(UpperIP)) (BSTR *aIPAddress);
77
 
 
78
 
    STDMETHOD(SetConfiguration) (IN_BSTR aIPAddress, IN_BSTR aNetworkMask, IN_BSTR aFromIPAddress, IN_BSTR aToIPAddress);
79
 
 
80
 
    STDMETHOD(Start) (IN_BSTR aNetworkName, IN_BSTR aTrunkName, IN_BSTR aTrunkType);
81
 
    STDMETHOD(Stop) ();
 
74
    STDMETHOD(COMGETTER(NetworkName))(BSTR *aName);
 
75
    STDMETHOD(COMGETTER(Enabled))(BOOL *aEnabled);
 
76
    STDMETHOD(COMSETTER(Enabled))(BOOL aEnabled);
 
77
    STDMETHOD(COMGETTER(IPAddress))(BSTR *aIPAddress);
 
78
    STDMETHOD(COMGETTER(NetworkMask))(BSTR *aNetworkMask);
 
79
    STDMETHOD(COMGETTER(LowerIP))(BSTR *aIPAddress);
 
80
    STDMETHOD(COMGETTER(UpperIP))(BSTR *aIPAddress);
 
81
 
 
82
    STDMETHOD(SetConfiguration)(IN_BSTR aIPAddress, IN_BSTR aNetworkMask, IN_BSTR aFromIPAddress, IN_BSTR aToIPAddress);
 
83
 
 
84
    STDMETHOD(Start)(IN_BSTR aNetworkName, IN_BSTR aTrunkName, IN_BSTR aTrunkType);
 
85
    STDMETHOD(Stop)();
82
86
 
83
87
    // for VirtualBoxSupportErrorInfoImpl
84
88
    static const wchar_t *getComponentName() { return L"DHCPServer"; }
85
89
 
86
90
private:
87
91
    /** weak VirtualBox parent */
88
 
    const ComObjPtr <VirtualBox, ComWeakRef> mVirtualBox;
 
92
    const ComObjPtr<VirtualBox, ComWeakRef> mVirtualBox;
89
93
 
90
94
    const Bstr mName;
91
95
 
105
109
};
106
110
 
107
111
#endif // ____H_H_DHCPSERVERIMPL
108
 
/* vi: set tabstop=4 shiftwidth=4 expandtab: */