Changeset 42020 in vbox

Timestamp:

Jul 4, 2012 2:16:39 PM (13 years ago)

Author:

vboxsync

Message:

NAT: adds TFTP ACK verification.

File:

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

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

@@ -69 +69 @@
     int         iTimestamp;
     uint64_t    cbTransfered;
+    uint16_t    cTftpAck;
     ENMTFTPSESSIONFMT enmTftpFmt;
     TFPTPSESSIONOPTDESC OptionBlkSize;
@@ -620 +621 @@
 static int tftpSendData(PNATState pData,
                           PTFTPSESSION pTftpSession,
-                          u_int16_t block_nr,
+                          uint16_t u16Block,
                           PCTFTPIPHDR pcTftpIpHeaderRecv)
 {
@@ -627 +628 @@
     int cbRead;
     int rc = VINF_SUCCESS;
+
+    if (u16Block == pTftpSession->cTftpAck)
+        pTftpSession->cTftpAck++;
+    else
+    {
+        tftpSendError(pData, pTftpSession, 6, "ACK is wrong", pcTftpIpHeaderRecv);
+        tftpSessionTerminate(pTftpSession);
+        return -1;
+    }
 
     m = slirpTftpMbufAlloc(pData);
@@ -638 +648 @@
 
     pTftpIpHeader->u16TftpOpType = RT_H2N_U16_C(TFTP_DATA);
-    pTftpIpHeader->Core.u16TftpOpCode = RT_H2N_U16(block_nr);
+    pTftpIpHeader->Core.u16TftpOpCode = RT_H2N_U16(pTftpSession->cTftpAck);
 
     rc = tftpReadDataBlock(pData, pTftpSession, (uint8_t *)&pTftpIpHeader->Core.u16TftpOpCode + sizeof(uint16_t), &cbRead);
@@ -729 +739 @@
     AssertReturnVoid(tftpSendData(pData,
                                     pTftpSession,
-                                    RT_N2H_U16(pTftpIpHeader->Core.u16TftpOpCode) + 1, pTftpIpHeader) == 0);
+                                    RT_N2H_U16(pTftpIpHeader->Core.u16TftpOpCode), pTftpIpHeader) == 0);
 }