Changeset 45652 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 19, 2013 6:16:28 PM (12 years ago)

Author:

vboxsync

Message:

slirp/tftp.c: better error message if option negotiation fails (often because the requested file doesn't exist), especially in combination with Intel PXE, plus cleanups

File:

• trunk/src/VBox/Devices/Network/slirp/tftp.c (modified) (6 diffs)

trunk/src/VBox/Devices/Network/slirp/tftp.c

@@ -434 +434 @@
     if (RT_FAILURE(rc))
     {
-        LogFlowFuncLeave();
+        LogFlowFuncLeaveRC(rc);
         return rc;
     }
@@ -442 +442 @@
     if (RT_FAILURE(rc))
     {
-        LogFlowFuncLeave();
+        LogFlowFuncLeaveRC(rc);
         return rc;
     }
@@ -448 +448 @@
     if (pTftpSession->OptionTSize.fRequested)
     {
-       pTftpSession->OptionTSize.u64Value = cbSessionFile;
+        pTftpSession->OptionTSize.u64Value = cbSessionFile;
     }
     if (   !pTftpSession->OptionBlkSize.u64Value
@@ -570 +570 @@
     if (RT_FAILURE(rc))
     {
-        tftpSendError(pData, pTftpSession, 2, "Internal Error (blksize evaluation)", pcTftpIpHeaderRecv);
+        tftpSendError(pData, pTftpSession, 2, "Option negotiation failure (file not found or inaccessible?)", pcTftpIpHeaderRecv);
         LogFlowFuncLeave();
         return -1;
@@ -578 +578 @@
     if (!m)
         return -1;
-
-
 
     m->m_data += if_maxlinkhdr;
@@ -757 +755 @@
         return;
 
-    AssertReturnVoid(tftpSendData(pData,
-                                    pTftpSession,
-                                    RT_N2H_U16(pTftpIpHeader->Core.u16TftpOpCode), pTftpIpHeader) == 0);
+    if (tftpSendData(pData, pTftpSession,
+                     RT_N2H_U16(pTftpIpHeader->Core.u16TftpOpCode),
+                     pTftpIpHeader))
+        LogRel(("NAT TFTP: failure\n"));
 }