invalid opcode during xfer message shows the opcode itself now.

git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@48 fe716a7a-6dde-0310-88d9-d003556173a8

2 files changed, 15 insertions, 7 deletions

diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index fc24596..b6b8a36 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -938,15 +938,19 @@ BOOL rv = TRUE;
                         m_Daddy->LogLine(tmp);

                 }

                 Destroy(FALSE);

                 rv = FALSE;

                 break;

         default:

-                ASSERT(m_Daddy);

-                m_Daddy->LogLine(IDS_LOG_XFEROPCODE);

-                // *** Self destruct maybe??

+                {

+                        ASSERT(m_Daddy);

+                        CString tmp;

+                        tmp.Format(IDS_LOG_XFEROPCODE,p->Opcode());

+                        m_Daddy->LogLine(tmp);

+                        // *** Self destruct maybe??

+                }

                 break;

         }

         return rv;

 }

 

 BOOL CWRQSocket::OnTFTP(tftp* p)

@@ -1018,15 +1022,19 @@ BOOL CWRQSocket::OnTFTP(tftp* p)
                         tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage());

                         m_Daddy->LogLine(tmp);

                 }

                 Destroy(FALSE);

                 return FALSE;

         default:

-                ASSERT(m_Daddy);

-                m_Daddy->LogLine(IDS_LOG_XFEROPCODE);

-                // *** Self destruct maybe??

+                {

+                        ASSERT(m_Daddy);

+                        CString tmp;

+                        tmp.Format(IDS_LOG_XFEROPCODE,p->Opcode());

+                        m_Daddy->LogLine(tmp);

+                        // *** Self destruct maybe??

+                }

                 break;

         }

         return TRUE;

 }

 

 void tftp::SetOpcode(WORD op)

diff --git a/pumpkin.rc b/pumpkin.rc
index 7f3bbde..1bf0fd3 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -492,13 +492,13 @@ BEGIN
     IDS_LOG_XFERRECEIVE     "Error on xfer socket"

     IDS_LOG_XFERSEND        "Error on xfer socket"

     IDS_LOG_XFERUDPRECEIVE  "UDP packet receive failed"

     IDS_LOG_XFERSOURCETID   "Packet from unexpected source"

     IDS_LOG_SENTTFTPERROR   ":%u: %s"

     IDS_LOG_GOTTFTPERROR    "TFTP:%u: %s"

-    IDS_LOG_XFEROPCODE      "Invalid opcode during transfer received"

+    IDS_LOG_XFEROPCODE      "Invalid opcode (%u) during transfer received"

     IDS_LOG_XFERRRQFINISHED "Transfer of '%s' has successfully completed"

     IDS_TITLE_OPTIONS       "Options"

     IDS_LOG_WRQSERVE        "Writing of '%s' of type '%s' is requested by %s"

     IDS_TFTP_ERROR_FAILEDTORENAME "Too many clones of the file"

     IDS_RENAME_TITLE        "Save As"

 END