Changeset 41996 in vbox

Timestamp:

Jul 3, 2012 10:55:24 AM (13 years ago)

Author:

vboxsync

Message:

NAT: enhances TFTP option handling.

File:

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

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

@@ -55 +55 @@
 } ENMTFTPSESSIONFMT;
 
+typedef struct TFPTPSESSIONOPTDESC
+{
+    int fRequested;
+    int u16Value;
+} TFPTPSESSIONOPTDESC, *PTFPTPSESSIONOPTDESC;
+
 typedef struct TFTPSESSION
 {
@@ -63 +69 @@
     int         iTimestamp;
     ENMTFTPSESSIONFMT enmTftpFmt;
-    uint16_t    u16BlkSize;
-    uint16_t    u16TSize;
-    uint16_t    u16Size;
-    uint16_t    u16Timeout;
+    TFPTPSESSIONOPTDESC OptionBlkSize;
+    TFPTPSESSIONOPTDESC OptionTSize;
+    TFPTPSESSIONOPTDESC OptionSize;
+    TFPTPSESSIONOPTDESC OptionTimeout;
 } TFTPSESSION, *PTFTPSESSION, **PPTFTPSESSION;
 
@@ -115 +121 @@
 };
 
-static uint16_t g_au16RFC2348TftpSessionBlkSize[] =
-{
-    512,
-    1024,
-    1428,
-    2048,
-    4096,
-    8192
-};
-
 /**
  * This function evaluate file name.
@@ -262 +258 @@
 {
     pTftpSession->fInUse = 0;
+}
+
+DECLINLINE(int)tftpSessionParseAndMarkOption(const char *pcszRawOption, PTFPTPSESSIONOPTDESC pTftpSessionOption)
+{
+    int rc  = VINF_SUCCESS;
+    rc = RTStrToInt16Full(pcszRawOption, 0, (int16_t *)&pTftpSessionOption->u16Value);
+    AssertRCReturn(rc, rc);
+    pTftpSessionOption->fRequested = 1;
+    return rc;
 }
 
@@ -306 +311 @@
         {
             if (!RTStrICmp("blksize", g_TftpDesc[idxOptionArg].pszName))
-                rc = RTStrToInt16Full(pszTftpRRQRaw, 0, (int16_t *)&pTftpSession->u16BlkSize);
+                rc = tftpSessionParseAndMarkOption(pszTftpRRQRaw, &pTftpSession->OptionBlkSize);
             else if (!RTStrICmp("size", g_TftpDesc[idxOptionArg].pszName))
-                rc = RTStrToInt16Full(pszTftpRRQRaw, 0, (int16_t *)&pTftpSession->u16Size);
+                rc = tftpSessionParseAndMarkOption(pszTftpRRQRaw, &pTftpSession->OptionSize);
             else if (!RTStrICmp("tsize", g_TftpDesc[idxOptionArg].pszName))
-                rc = RTStrToInt16Full(pszTftpRRQRaw, 0, (int16_t *)&pTftpSession->u16TSize);
+                rc = tftpSessionParseAndMarkOption(pszTftpRRQRaw, &pTftpSession->OptionTSize);
             else if (!RTStrICmp("timeoute", g_TftpDesc[idxOptionArg].pszName))
-                rc = RTStrToInt16Full(pszTftpRRQRaw, 0, (int16_t *)&pTftpSession->u16Timeout);
+                rc = tftpSessionParseAndMarkOption(pszTftpRRQRaw, &pTftpSession->OptionSize);
             else
                 rc = VERR_INVALID_PARAMETER;
@@ -431 +436 @@
 
 /* @todo: rewrite this */
-DECLINLINE(int) tftpSessionEvaluateBlkSize(PNATState pData, PTFTPSESSION pTftpSession)
+DECLINLINE(int) tftpSessionEvaluateOptions(PNATState pData, PTFTPSESSION pTftpSession)
 {
     int rc = VINF_SUCCESS;
     RTFILE hSessionFile;
     uint64_t cbSessionFile = 0;
-    int      idxRFC2348TftpSessionBlkSize = 0;
-    uint32_t cBlockSessionFile = 0;
     LogFlowFunc(("pTftpSession:%p\n", pTftpSession));
 
@@ -455 +458 @@
     }
 
-    if (!pTftpSession->u16BlkSize)
-    {
-        pTftpSession->u16BlkSize = 1428;
-    }
-    cBlockSessionFile = ASMDivU64ByU32RetU32(cbSessionFile, pTftpSession->u16BlkSize);
-    while (   cBlockSessionFile >= UINT16_MAX
-           && idxRFC2348TftpSessionBlkSize < RT_ELEMENTS(g_au16RFC2348TftpSessionBlkSize))
-    {
-        if (pTftpSession->u16BlkSize > g_au16RFC2348TftpSessionBlkSize[idxRFC2348TftpSessionBlkSize])
-        {
-            idxRFC2348TftpSessionBlkSize++;
-            continue;
-        }
-
-
-        idxRFC2348TftpSessionBlkSize++;
-        /* No bigger values in RFC2348 */
-        AssertReturn(idxRFC2348TftpSessionBlkSize < RT_ELEMENTS(g_au16RFC2348TftpSessionBlkSize), VERR_INTERNAL_ERROR);
-        if (g_au16RFC2348TftpSessionBlkSize[idxRFC2348TftpSessionBlkSize] >= if_maxlinkhdr)
-        {
-            /* Buffer size is too large for current settings */
-            rc = VERR_BUFFER_OVERFLOW;
-            LogFlowFuncLeaveRC(rc);
-        }
+    if (pTftpSession->OptionTSize.fRequested)
+        pTftpSession->OptionTSize.u16Value = (uint16_t)cbSessionFile;
+    if (   !pTftpSession->OptionBlkSize.u16Value
+        && !pTftpSession->OptionBlkSize.fRequested)
+    {
+        pTftpSession->OptionBlkSize.u16Value = 1428;
     }
     LogFlowFuncLeaveRC(rc);
@@ -508 +493 @@
 
 DECLINLINE(int) tftpReadDataBlock(PNATState pData,
-                                  PTFTPSESSION pTftpSession,
+                                  PTFTPSESSION pcTftpSession,
                                   uint16_t u16BlockNr,
                                   uint8_t *pu8Data,
@@ -515 +500 @@
     RTFILE  hSessionFile;
     int rc = VINF_SUCCESS;
-    LogFlowFunc(("pTftpSession:%p, u16BlockNr:%RX16, pu8Data:%p, pcbReadData:%p\n",
-                    pTftpSession,
+    uint16_t u16BlkSize = 0;
+    AssertPtrReturn(pData, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pcTftpSession, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pu8Data, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pcbReadData, VERR_INVALID_PARAMETER);
+    LogFlowFunc(("pcTftpSession:%p, u16BlockNr:%RX16, pu8Data:%p, pcbReadData:%p\n",
+                    pcTftpSession,
                     u16BlockNr,
                     pu8Data,
                     pcbReadData));
 
-    rc = pftpSessionOpenFile(pData, pTftpSession, &hSessionFile);
+    u16BlkSize = pcTftpSession->OptionBlkSize.u16Value;
+    rc = pftpSessionOpenFile(pData, pcTftpSession, &hSessionFile);
     if (RT_FAILURE(rc))
     {
@@ -531 +522 @@
     {
         rc = RTFileSeek(hSessionFile,
-                        u16BlockNr * pTftpSession->u16BlkSize,
+                        u16BlockNr * u16BlkSize,
                         RTFILE_SEEK_BEGIN,
                         NULL);
@@ -540 +531 @@
             return rc;
         }
-        rc = RTFileRead(hSessionFile, pu8Data, pTftpSession->u16BlkSize, (size_t *)pcbReadData);
+        rc = RTFileRead(hSessionFile, pu8Data, u16BlkSize, (size_t *)pcbReadData);
         if (RT_FAILURE(rc))
         {
@@ -587 +578 @@
     int rc = VINF_SUCCESS;
 
-    rc = tftpSessionEvaluateBlkSize(pData, pTftpSession);
+    rc = tftpSessionEvaluateOptions(pData, pTftpSession);
     if (RT_FAILURE(rc))
     {
@@ -608 +599 @@
     pTftpIpHeader->u16TftpOpType = RT_H2N_U16_C(TFTP_OACK);
 
-    if (pTftpSession->u16BlkSize)
-        rc = tftpAddOptionToOACK(pData, m, "blksize", pTftpSession->u16BlkSize);
-    if (   RT_SUCCESS(rc)
-        && pTftpSession->u16Size)
-        rc = tftpAddOptionToOACK(pData, m, "size", pTftpSession->u16Size);
-    if (   RT_SUCCESS(rc)
-        && pTftpSession->u16TSize)
-        rc = tftpAddOptionToOACK(pData, m, "tsize", pTftpSession->u16TSize);
+    if (pTftpSession->OptionBlkSize.fRequested)
+        rc = tftpAddOptionToOACK(pData, m, "blksize", pTftpSession->OptionBlkSize.u16Value);
+    else if (pTftpSession->OptionSize.fRequested)
+        rc = tftpAddOptionToOACK(pData, m, "size", pTftpSession->OptionSize.u16Value);
+    else if (pTftpSession->OptionTSize.fRequested)
+        rc = tftpAddOptionToOACK(pData, m, "tsize", pTftpSession->OptionTSize.u16Value);
 
     rc = tftpSend(pData, pTftpSession, m, pcTftpIpHeaderRecv);