Changeset 80984 in vbox for trunk/src/VBox/Devices/Network/slirp/tftp.c

Timestamp:

Sep 24, 2019 4:17:53 PM (5 years ago)

Author:

vboxsync

Message:

NAT: Do not send TFTP OACK packet if the request had no options.

File:

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

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

@@ -612 +612 @@
 }
 
+
 DECLINLINE(int) tftpSendOACK(PNATState pData,
                              PTFTPSESSION pTftpSession,
@@ -625 +626 @@
         tftpSendError(pData, pTftpSession, 2, "Option negotiation failure (file not found or inaccessible?)", pcTftpIpHeaderRecv);
         LogFlowFuncLeave();
-        return -1;
-    }
+        return rc;
+    }
+
+    if (rc == VWRN_NOT_FOUND)
+        return rc;
 
     m = slirpTftpMbufAlloc(pData);
-    if (!m)
-        return -1;
+    if (m == NULL)
+    {
+        tftpSessionTerminate(pTftpSession);
+        return VERR_NO_MEMORY;
+    }
 
     m->m_data += if_maxlinkhdr;
@@ -647 +654 @@
 
     rc = tftpSend(pData, pTftpSession, m, pcTftpIpHeaderRecv);
-    return RT_SUCCESS(rc) ? 0 : -1;
+    if (RT_FAILURE(rc))
+        tftpSessionTerminate(pTftpSession);
+
+    return rc;
 }
 
@@ -795 +805 @@
 
 
-    tftpSendOACK(pData, pTftpSession, pTftpIpHeader);
+    rc = tftpSendOACK(pData, pTftpSession, pTftpIpHeader);
+    if (rc == VWRN_NOT_FOUND)
+        rc = tftpSendData(pData, pTftpSession, 0, pTftpIpHeader);
+
     LogFlowFuncLeave();
     return;