1 files changed, 14 insertions, 6 deletions
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index fc24596..b6b8a36 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -912,67 +912,71 @@ BOOL rv = TRUE;
                                        if(!m_timeOut){// *** More sanity checks
                                        Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);
                                        rv = TRUE;
                                        break;
                                }
                        }
                        if(o.Lookup(tftpoXResume,v)){
                                m_ACK=atoi(v);
                        }
                }
                UpdateList();
                DoXfer();
        }
                break;
        case tftp::opACK:
                m_ACK=p->data.m_ACK.Block();
                if(state!=stateFinish){
                        UpdateList();
                        DoXfer();
                }
                break;
        case tftp::opERROR:
                {
                        ASSERT(m_Daddy);
                CString tmp;
                        tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage());
                        m_Daddy->LogLine(tmp);
                }
                Destroy(FALSE);
                rv = FALSE;
                break;
        default:
-                ASSERT(m_Daddy);
+                {
-                m_Daddy->LogLine(IDS_LOG_XFEROPCODE);
+                        ASSERT(m_Daddy);
-                // *** Self destruct maybe??
+                        CString tmp;
+                        tmp.Format(IDS_LOG_XFEROPCODE,p->Opcode());
+                        m_Daddy->LogLine(tmp);
+                        // *** Self destruct maybe??
+                }
                break;
        }
        return rv;
 }
 BOOL CWRQSocket::OnTFTP(tftp* p)
 {
        switch(p->Opcode()){
        case tftp::opOACK:
                ASSERT(state!=stateFinish);
        {
                if(m_bResume)
                        m_ACK=m_File.GetLength()/m_blkSize;
                else
                        m_ACK=0;
        tftp::tftpOptions o;
                if(p->GetOptions(&o)){
                CString v;
                        if(o.Lookup(tftpoBSize,v)){
                                m_blkSize=atoi(v);
                                        if(!m_blkSize){// *** More sanity checks
                                        Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);
                                        return TRUE;
                                }
                        }
                        if(o.Lookup(tftpoTOut,v)){
                                m_timeOut=atoi(v);
                                        if(!m_timeOut){// *** More sanity checks
                                        Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);
                                        return TRUE;
                                }
                        }
@@ -992,67 +996,71 @@ BOOL CWRQSocket::OnTFTP(tftp* p)
                        int bytes = p->length-sizeof(p->data.m_DATA.block)-(tftpHdrSize-tftpSlackSize);
                                if(bytes){
                                        m_File.Write(p->data.m_DATA.data,bytes);
                                        // *** Move to the other place where we can do it not that often
                                        m_File.SetLength(m_File.GetPosition());
                                }
                                if(bytes<m_blkSize){
                                        state=stateFinish;
                                        ASSERT(m_Daddy);
                                CString tmp;
                                        tmp.Format(IDS_LOG_XFERWRQFINISHED,(LPCTSTR)m_FileName);
                                        m_Daddy->LogLine(tmp);
                                }
                                m_ACK=block;
                                m_LastSlack=m_blkSize-bytes;
                                UpdateList();
                                DoXfer();
                        }CATCH(CFileException,e){
                                Deny(e);
                        }END_CATCH
                }
                break;
        case tftp::opERROR:
                {
                        ASSERT(m_Daddy);
                CString tmp;
                        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);
+                        ASSERT(m_Daddy);
-                // *** Self destruct maybe??
+                        CString tmp;
+                        tmp.Format(IDS_LOG_XFEROPCODE,p->Opcode());
+                        m_Daddy->LogLine(tmp);
+                        // *** Self destruct maybe??
+                }
                break;
        }
        return TRUE;
 }
 void tftp::SetOpcode(WORD op)
 {
        opcode = REVERSEBYTES(op);
 }
 void tftp::tftpDATA::SetBlock(WORD b)
 {
        block=REVERSEBYTES(b);
 }
 WORD tftp::tftpDATA::Block()
 {
        return REVERSEBYTES(block);
 }
 WORD tftp::tftpACK::Block()
 {
        return REVERSEBYTES(block);
 }
 void tftp::tftpACK::SetBlock(WORD b)
 {
        block = REVERSEBYTES(b);
 }
 WORD tftp::tftpERROR::Code()
 {
        return REVERSEBYTES(code);
 }
 void tftp::tftpERROR::SetCode(WORD c)
 {
        code = REVERSEBYTES(c);