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

Timestamp:

Oct 7, 2021 9:03:15 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147348

Message:

NAT/tftp: bugref:9350 - Fix the type and the hungarian prefix of the
filename array. While here, move it to the end of the structure.

File:

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

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

@@ -65 +65 @@
 {
     int         fInUse;
-    unsigned char pszFilename[TFTP_FILENAME_MAX];
     struct      in_addr IpClientAddress;
     uint16_t    u16ClientPort;
@@ -75 +74 @@
     TFPTPSESSIONOPTDESC OptionTSize;
     TFPTPSESSIONOPTDESC OptionTimeout;
+
+    char szFilename[TFTP_FILENAME_MAX];
 } TFTPSESSION, *PTFTPSESSION, **PPTFTPSESSION;
 
@@ -151 +152 @@
     else
     {
-        char *pszFullPathAbs = RTPathAbsExDup(tftp_prefix, (const char *)pcTftpSession->pszFilename, RTPATH_STR_F_STYLE_HOST);
+        char *pszFullPathAbs = RTPathAbsExDup(tftp_prefix, pcTftpSession->szFilename, RTPATH_STR_F_STYLE_HOST);
 
         if (   !pszFullPathAbs
@@ -289 +290 @@
             break;
 
-        if (RTStrNLen((char *)pTftpSession->pszFilename, TFTP_FILENAME_MAX) == 0)
-        {
-            rc = RTStrCopy((char *)pTftpSession->pszFilename, TFTP_FILENAME_MAX, pszTftpRRQRaw);
+        if (RTStrNLen(pTftpSession->szFilename, TFTP_FILENAME_MAX) == 0)
+        {
+            rc = RTStrCopy(pTftpSession->szFilename, TFTP_FILENAME_MAX, pszTftpRRQRaw);
             if (RT_FAILURE(rc))
             {
@@ -424 +425 @@
     LogFlowFuncEnter();
 
-    cchSessionFilename = RTStrPrintf2(szSessionFilename, TFTP_FILENAME_MAX, "%s/%s", tftp_prefix, pTftpSession->pszFilename);
+    cchSessionFilename = RTStrPrintf2(szSessionFilename, TFTP_FILENAME_MAX, "%s/%s", tftp_prefix, pTftpSession->szFilename);
     if (cchSessionFilename > 0)
     {
@@ -438 +439 @@
         rc = VERR_FILENAME_TOO_LONG;
     if (fVerbose)
-        LogRel(("NAT TFTP: %s/%s -> %Rrc\n", tftp_prefix, pTftpSession->pszFilename, rc));
+        LogRel(("NAT TFTP: %s/%s -> %Rrc\n", tftp_prefix, pTftpSession->szFilename, rc));
     LogFlowFuncLeaveRC(rc);
     return rc;