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

Timestamp:

Oct 7, 2021 9:27:26 PM (3 years ago)

Author:

vboxsync

Message:

NAT/tftp: ​bugref:9350 - Define symbolic constants for TFTP error
codes. Use them. Same object code is generated.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• tftp.c (modified) (5 diffs)
• tftp.h (modified) (1 diff)

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

@@ -642 +642 @@
     if (RT_FAILURE(rc))
     {
-        tftpSendError(pData, pTftpSession, 2, "Option negotiation failure (file not found or inaccessible?)", pcTftpIpHeaderRecv);
+        tftpSendError(pData, pTftpSession, TFTP_EACCESS, "Option negotiation failure (file not found or inaccessible?)", pcTftpIpHeaderRecv);
         LogFlowFuncLeave();
         return rc;
@@ -728 +728 @@
     else
     {
-        tftpSendError(pData, pTftpSession, 6, "ACK is wrong", pcTftpIpHeaderRecv);
+        tftpSendError(pData, pTftpSession, TFTP_EEXIST, "ACK is wrong", pcTftpIpHeaderRecv);
         return -1;
     }
@@ -765 +765 @@
     {
         m_freem(pData, m);
-        tftpSendError(pData, pTftpSession, 1, "File not found", pcTftpIpHeaderRecv);
+        tftpSendError(pData, pTftpSession, TFTP_ENOENT, "File not found", pcTftpIpHeaderRecv);
         /* send "file not found" error back */
         return -1;
@@ -808 +808 @@
     if (RT_FAILURE(tftpSecurityFilenameCheck(pData, pTftpSession)))
     {
-        tftpSendError(pData, pTftpSession, 2, "Access violation", pTftpIpHeader);
+        tftpSendError(pData, pTftpSession, TFTP_EACCESS, "Access violation", pTftpIpHeader);
         LogFlowFuncLeave();
         return;
@@ -817 +817 @@
     if (RT_UNLIKELY(!tftpIsSupportedTransferMode(pTftpSession)))
     {
-        tftpSendError(pData, pTftpSession, 4, "Unsupported transfer mode", pTftpIpHeader);
+        tftpSendError(pData, pTftpSession, TFTP_ENOSYS, "Unsupported transfer mode", pTftpIpHeader);
         LogFlowFuncLeave();
         return;

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

@@ -32 +32 @@
 #define TFTP_OACK   6
 
+/* error codes */
+#define TFTP_EUNDEF     0 /* Not defined, see error message (if any). */
+#define TFTP_ENOENT     1 /* File not found. */
+#define TFTP_EACCESS    2 /* Access violation. */
+#define TFTP_EFBIG      3 /* Disk full or allocation exceeded. */
+#define TFTP_ENOSYS     4 /* Illegal TFTP operation. */
+#define TFTP_ESRCH      5 /* Unknown transfer ID. */
+#define TFTP_EEXIST     6 /* File already exists. */
+#define TFTP_EUSER      7 /* No such user. */
+/* RFC 2347 */
+#define TFTP_EONAK      8 /* Option refused. */
+
+
 #define TFTP_FILENAME_MAX 512