Changeset 57968 in vbox

Timestamp:

Sep 30, 2015 2:10:00 PM (9 years ago)

Author:

vboxsync

Message:

ValidationKit: some fixes/adjustments for MAC address generation based on the host's IP, adding sanity checks and logging if the address looks fishy.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

@@ -1430 +1430 @@
 
         # Resolve missing MAC address prefix
-        cchMacAddr = len(sMacAddr) > 0;
+        cchMacAddr = len(sMacAddr)
         if cchMacAddr > 0 and cchMacAddr < 12:
-            sHostName = '';
-            try:
-                sHostName = socket.getfqdn();
-                if sys.platform == 'win32' \
-                 and sHostName.endswith('.sun.com') \
-                 and not sHostName.endswith('.germany.sun.com'):
-                    sHostName = socket.gethostname(); # klugde.
-                abHostIP = socket.inet_aton(socket.gethostbyname(sHostName));
-            except:
-                reporter.errorXcpt('failed to determin the host IP for "%s".' % (sHostName,));
-                abHostIP = array.array('B', (0x80, 0x86, 0x00, 0x00)).tostring();
+            sHostName = ''
+            try:
+                sHostName = socket.getfqdn()
+                sHostIP = socket.gethostbyname(sHostName)
+                abHostIP = socket.inet_aton(sHostIP)
+                if ord(abHostIP[0]) == 127 \
+                    or ord(abHostIP[0]) == 169 and ord(abHostIP[1]) == 254 \
+                    or ord(abHostIP[0]) == 192 and ord(abHostIP[1]) == 168 and ord(abHostIP[2]) == 56:
+                    reporter.log('warning: host IP for "%s" is %s, most likely not unique.' % (sHostName, sHostIP))
+            except:
+                reporter.errorXcpt('failed to determine the host IP for "%s".' % (sHostName,))
+                abHostIP = array.array('B', (0x80, 0x86, 0x00, 0x00)).tostring()
             sDefaultMac = '%02X%02X%02X%02X%02X%02X' \
-                % (0x02, ord(abHostIP[0]), ord(abHostIP[1]), ord(abHostIP[2]), ord(abHostIP[3]), iNic);
-            sMacAddr = sDefaultMac[0:(11 - cchMacAddr)] + sMacAddr;
+                % (0x02, ord(abHostIP[0]), ord(abHostIP[1]), ord(abHostIP[2]), ord(abHostIP[3]), iNic)
+            sMacAddr = sDefaultMac[0:(12 - cchMacAddr)] + sMacAddr
 
         # Get the NIC object and try set it address.