Changeset 20977 in vbox for trunk/src/VBox/Main/ConsoleImpl2.cpp

Timestamp:

Jun 26, 2009 2:38:55 PM (15 years ago)

Author:

vboxsync

Message:

API: weed out NULL strings, as many clients cannot use them

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2797 +2797 @@
                 Bstr tmpAddr, tmpMask;
                 hrc = virtualBox->GetExtraData(Bstr("HostOnly/vboxnet0/IPAddress"), tmpAddr.asOutParam());
-                if (SUCCEEDED(hrc) && !tmpAddr.isNull())
+                if (SUCCEEDED(hrc) && !tmpAddr.isEmpty())
                 {
                     hrc = virtualBox->GetExtraData(Bstr("HostOnly/vboxnet0/IPNetMask"), tmpMask.asOutParam());
-                    if (SUCCEEDED(hrc) && !tmpAddr.isEmpty())
+                    if (SUCCEEDED(hrc) && !tmpMask.isEmpty())
                         hrc = hostInterface->EnableStaticIpConfig(tmpAddr, tmpMask);
+                    else
+                        hrc = hostInterface->EnableStaticIpConfig(tmpAddr,
+                                                                  Bstr(VBOXNET_IPV4MASK_DEFAULT));
                 }
                 else
@@ -2811 +2814 @@
                 if (SUCCEEDED(hrc))
                     hrc = virtualBox->GetExtraData(Bstr("HostOnly/vboxnet0/IPV6NetMask"), tmpMask.asOutParam());
-                if (SUCCEEDED(hrc) && !tmpAddr.isEmpty())
+                if (SUCCEEDED(hrc) && !tmpAddr.isEmpty() && !tmpMask.isEmpty())
                     hrc = hostInterface->EnableStaticIpConfigV6(tmpAddr, Utf8Str(tmpMask).toUInt32());
 #endif