VirtualBox

Changeset 17387 in vbox


Ignore:
Timestamp:
Mar 5, 2009 11:00:14 AM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
43789
Message:

Main: net if API fixes

Location:
trunk/src/VBox
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.cpp

    r17275 r17387  
    306306}
    307307STDMETHODIMP
    308 NetworkAdapter::AttachToBridgedNetwork()
     308NetworkAdapter::AttachToBridgedInterface()
    309309{
    310310  AssertMsg(0,("Not implemented yet\n"));

  • trunk/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.h

    r17275 r17387  
    107107    // INetworkAdapter methods
    108108    STDMETHOD(AttachToNAT)();
    109     STDMETHOD(AttachToBridgedNetwork)();
     109    STDMETHOD(AttachToBridgedInterface)();
    110110    STDMETHOD(AttachToInternalNetwork)();
    111111    STDMETHOD(Detach)();

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

    r17323 r17387  
    13871387                {
    13881388                    CHECK_ERROR_RET(nic, COMSETTER(Enabled) (TRUE), 1);
    1389                     CHECK_ERROR_RET(nic, AttachToBridgedNetwork(), 1);
     1389                    CHECK_ERROR_RET(nic, AttachToBridgedInterface(), 1);
    13901390                }
    13911391                else if (strcmp(nics[n], "intnet") == 0)
    … …  
    13991399
    14001400                    CHECK_ERROR_RET(nic, COMSETTER(Enabled) (TRUE), 1);
    1401                     CHECK_ERROR_RET(nic, AttachToHostOnlyNetwork(), 1);
     1401                    CHECK_ERROR_RET(nic, AttachToHostOnlyInterface(), 1);
    14021402                }
    14031403#endif /* defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) */

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp

    r17275 r17387  
    131131            break;
    132132        case KNetworkAttachmentType_Bridged:
    133             mAdapter.AttachToBridgedNetwork();
     133            mAdapter.AttachToBridgedInterface();
    134134            break;
    135135        case KNetworkAttachmentType_Internal:
    … …  
    137137            break;
    138138        case KNetworkAttachmentType_HostOnly:
    139             mAdapter.AttachToHostOnlyNetwork();
     139            mAdapter.AttachToHostOnlyInterface();
    140140            break;
    141141        default:

  • trunk/src/VBox/Main/NetworkAdapterImpl.cpp

    r17275 r17387  
    713713}
    714714
    715 STDMETHODIMP NetworkAdapter::AttachToBridgedNetwork()
     715STDMETHODIMP NetworkAdapter::AttachToBridgedInterface()
    716716{
    717717    AutoCaller autoCaller (this);
    … …  
    781781}
    782782
    783 STDMETHODIMP NetworkAdapter::AttachToHostOnlyNetwork()
     783STDMETHODIMP NetworkAdapter::AttachToHostOnlyInterface()
    784784{
    785785    AutoCaller autoCaller (this);
    … …  
    925925        CheckComRCReturnRC (rc);
    926926
    927         rc = AttachToBridgedNetwork();
     927        rc = AttachToBridgedInterface();
    928928        CheckComRCReturnRC (rc);
    929929    }
    … …  
    953953
    954954        /* Host Interface Networking */
    955         rc = AttachToHostOnlyNetwork();
     955        rc = AttachToHostOnlyInterface();
    956956        CheckComRCReturnRC (rc);
    957957    }

  • trunk/src/VBox/Main/idl/VirtualBox.xidl

    r17359 r17387  
    1045710457  <interface
    1045810458     name="INetworkAdapter" extends="$unknown"
    10459      uuid="8eca30de-a883-40ee-b856-aac86f1ec383"
     10459     uuid="65607a27-2b73-4d43-b4cc-0ba2c817fbde"
    1046010460     wsmap="managed"
    1046110461     >
    … …  
    1054510545    </method>
    1054610546
    10547     <method name="attachToBridgedNetwork">
     10547    <method name="attachToBridgedInterface">
    1054810548      <desc>
    1054910549        Attach the network adapter to a bridged host interface.
    … …  
    1055710557    </method>
    1055810558
    10559     <method name="attachToHostOnlyNetwork">
     10559    <method name="attachToHostOnlyInterface">
    1056010560      <desc>
    1056110561        Attach the network adapter to the host-only network.

  • trunk/src/VBox/Main/include/NetworkAdapterImpl.h

    r17275 r17387  
    127127    // INetworkAdapter methods
    128128    STDMETHOD(AttachToNAT)();
    129     STDMETHOD(AttachToBridgedNetwork)();
     129    STDMETHOD(AttachToBridgedInterface)();
    130130    STDMETHOD(AttachToInternalNetwork)();
    131     STDMETHOD(AttachToHostOnlyNetwork)();
     131    STDMETHOD(AttachToHostOnlyInterface)();
    132132    STDMETHOD(Detach)();
    133133
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette