Changeset 2275 in vbox for trunk/src

Timestamp:

Apr 20, 2007 2:06:54 PM (18 years ago)

Author:

vboxsync

Message:

Correctly handle PXE menus with 0 boot servers for an entry. Use the
already found TFTP server in this case.

File:

• trunk/src/VBox/Devices/PC/Etherboot-src/core/nic.c (modified) (3 diffs)

trunk/src/VBox/Devices/PC/Etherboot-src/core/nic.c

@@ -1002 +1002 @@
                 return 0;
 #ifdef PXE_DHCP_STRICT
-#ifndef VBOX /* Disabled, but it would never be active, as we don't use 4011 as source port. */
         /* in principle one could check here:
          *
@@ -1019 +1018 @@
                 return 1;
         }
-#endif /* !VBOX */
 #endif /* PXE_DHCP_STRICT */
 #ifndef VBOX /* This fails for an ACK from a DHCP server that doesn't know the next server IP address. Annoying, as this is the default for DHCP with RIS ProxyDHCP. */
@@ -1896 +1894 @@
                 pxe_boot_menu[i].id = item;
         }
+#ifndef VBOX
         memcpy(&pxe_boot_menu[i].ip, p + 3, sizeof(in_addr));
+#else /* VBOX */
+        if (*(p + 2) > 0)
+            memcpy(&pxe_boot_menu[i].ip, p + 3, sizeof(in_addr));
+        else
+            pxe_boot_menu[i].ip.s_addr = arptable[ARP_SERVER].ipaddr.s_addr;
+#endif /* VBOX */
 }