Changeset 42009 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Jul 4, 2012 4:57:11 AM (12 years ago)

Author:

vboxsync

Message:

NAT: use read byte counter instead of block number.

File:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -68 +68 @@
     uint16_t    u16ClientPort;
     int         iTimestamp;
+    int         cbTransfered;
     ENMTFTPSESSIONFMT enmTftpFmt;
     TFPTPSESSIONOPTDESC OptionBlkSize;
@@ -493 +494 @@
 DECLINLINE(int) tftpReadDataBlock(PNATState pData,
                                   PTFTPSESSION pcTftpSession,
-                                  uint16_t u16BlockNr,
                                   uint8_t *pu8Data,
                                   int *pcbReadData)
@@ -521 +521 @@
     {
         rc = RTFileSeek(hSessionFile,
-                        u16BlockNr * u16BlkSize,
+                        pcTftpSession->cbTransfered,
                         RTFILE_SEEK_BEGIN,
                         NULL);
@@ -647 +647 @@
     struct mbuf *m;
     PTFTPIPHDR pTftpIpHeader;
-    int nobytes;
-    int rc = VINF_SUCCESS;
-
-    /* we should be sure that we don't talk about file offset prior 0 ;) */
-    if (block_nr < 1)
-        return -1;
+    int cbRead;
+    int rc = VINF_SUCCESS;
 
     m = slirpTftpMbufAlloc(pData);
@@ -666 +662 @@
     pTftpIpHeader->Core.u16TftpOpCode = RT_H2N_U16(block_nr);
 
-    rc = tftpReadDataBlock(pData, pTftpSession, block_nr - 1, (uint8_t *)&pTftpIpHeader->Core.u16TftpOpCode + sizeof(uint16_t), &nobytes);
+    rc = tftpReadDataBlock(pData, pTftpSession, (uint8_t *)&pTftpIpHeader->Core.u16TftpOpCode + sizeof(uint16_t), &cbRead);
 
     if (RT_SUCCESS(rc))
     {
-        m->m_len += nobytes;
+        pTftpSession->cbTransfered += cbRead;
+        m->m_len += cbRead;
         tftpSend(pData, pTftpSession, m, pcTftpIpHeaderRecv);
-        if (nobytes > 0)
+        if (cbRead > 0)
             tftpSessionUpdate(pData, pTftpSession);
         else