Changeset 48101 in vbox

Timestamp:

Aug 27, 2013 6:23:47 PM (11 years ago)

Author:

vboxsync

Message:

BUGZ#6780: API change: introduced GetShortName() method for HostNetworkInterface class, updated host interfaces checker on GUI start in order to take into account interface short names.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/include/HostNetworkInterfaceImpl.h (modified) (1 diff)
• Main/src-server/HostNetworkInterfaceImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1358 +1358 @@
     {
         availableInterfaceNames << iface.GetName();
+        availableInterfaceNames << iface.GetShortName();
     }
 

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

@@ -8167 +8167 @@
     </attribute>
 
+    <attribute name="shortName" type="wstring" readonly="yes">
+      <desc>Returns the host network interface short name.</desc>
+    </attribute>
+
     <attribute name="id" type="uuid" mod="string" readonly="yes">
       <desc>Returns the interface UUID.</desc>

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

@@ -60 +60 @@
     // IHostNetworkInterface properties
     STDMETHOD(COMGETTER(Name))(BSTR *aInterfaceName);
+    STDMETHOD(COMGETTER(ShortName))(BSTR *aShortName);
     STDMETHOD(COMGETTER(Id))(BSTR *aGuid);
     STDMETHOD(COMGETTER(DHCPEnabled))(BOOL *aDHCPEnabled);

trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp

@@ -80 +80 @@
     unconst(mInterfaceName) = aInterfaceName;
     unconst(mNetworkName) = composeNetworkName(aShortName);
+    unconst(mShortName) = aShortName;
     unconst(mGuid) = aGuid;
     mIfType = ifType;
@@ -251 +252 @@
 
     mInterfaceName.cloneTo(aInterfaceName);
+
+    return S_OK;
+}
+
+/**
+ * Returns the short name of the host network interface.
+ *
+ * @returns COM status code
+ * @param   aShortName address of result pointer
+ */
+STDMETHODIMP HostNetworkInterface::COMGETTER(ShortName)(BSTR *aShortName)
+{
+    CheckComArgOutPointerValid(aShortName);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    mShortName.cloneTo(aShortName);
 
     return S_OK;