Changeset 91626 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Oct 7, 2021 9:19:29 PM (3 years ago)

Author:

vboxsync

Message:

NAT/tftp: bugref:9350 - LogRel tftp requests at session allocation time.
Use consistent "NAT:" prefix for messages.

File:

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

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

@@ -385 +385 @@
     *ppTftpSession = pTftpSession;
 
+    LogRel(("NAT: TFTP RRQ %s", pTftpSession->szFilename));
+    const char *pszPrefix = " ";
+    if (pTftpSession->OptionBlkSize.fRequested)
+    {
+        LogRel(("%s" "blksize=%RU64", pszPrefix, pTftpSession->OptionBlkSize.u64Value));
+        pszPrefix = ", ";
+    }
+    if (pTftpSession->OptionTSize.fRequested)
+    {
+        LogRel(("%s" "tsize=%RU64", pszPrefix, pTftpSession->OptionTSize.u64Value));
+        pszPrefix = ", ";
+    }
+    if (pTftpSession->OptionTimeout.fRequested)
+    {
+        LogRel(("%s" "timeout=%RU64", pszPrefix, pTftpSession->OptionTimeout.u64Value));
+        pszPrefix = ", ";
+    }
+    LogRel(("\n"));
+
     tftpSessionUpdate(pData, pTftpSession);
 
@@ -418 +437 @@
 }
 
-DECLINLINE(int) pftpSessionOpenFile(PNATState pData, PTFTPSESSION pTftpSession, bool fVerbose, PRTFILE pSessionFile)
+DECLINLINE(int) pftpSessionOpenFile(PNATState pData, PTFTPSESSION pTftpSession, PRTFILE pSessionFile)
 {
     char szSessionFilename[TFTP_FILENAME_MAX];
@@ -438 +457 @@
     else
         rc = VERR_FILENAME_TOO_LONG;
-    if (fVerbose)
-        LogRel(("NAT TFTP: %s/%s -> %Rrc\n", tftp_prefix, pTftpSession->szFilename, rc));
+
     LogFlowFuncLeaveRC(rc);
     return rc;
@@ -452 +470 @@
     LogFlowFunc(("pTftpSession:%p\n", pTftpSession));
 
-    rc = pftpSessionOpenFile(pData, pTftpSession, true /*fVerbose*/, &hSessionFile);
+    rc = pftpSessionOpenFile(pData, pTftpSession, &hSessionFile);
     if (RT_FAILURE(rc))
     {
@@ -551 +569 @@
 
     u16BlkSize = (uint16_t)pcTftpSession->OptionBlkSize.u64Value;
-    rc = pftpSessionOpenFile(pData, pcTftpSession, false /*fVerbose*/, &hSessionFile);
+    rc = pftpSessionOpenFile(pData, pcTftpSession, &hSessionFile);
     if (RT_FAILURE(rc))
     {
@@ -825 +843 @@
                      RT_N2H_U16(pTftpIpHeader->Core.u16TftpOpCode),
                      pTftpIpHeader))
-        LogRel(("NAT TFTP: failure\n"));
+        LogRel(("NAT: TFTP send failed\n"));
 }