1 files changed, 13 insertions, 9 deletions

diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 070f3e8..2a01918 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -570,28 +570,28 @@ void CXferSocket::OnSend(int nErrorCode)
         }

 }

 

 BOOL tftp::Send(CAsyncSocket *socket,SOCKADDR_IN* saddr)

 {

         ASSERT(socket);

 int rv = socket->SendTo(udpBase(),length,(SOCKADDR*)saddr,sizeof(SOCKADDR_IN));

         if(rv!=length)

                 return FALSE;

         return TRUE;

 }

 

-void CXferSocket::DoSelect()

+void CXferSocket::DoSelect(BOOL do_select)

 {

         if(m_Peer.sin_addr.s_addr!=INADDR_NONE)

-                AsyncSelect(FD_CLOSE|FD_READ|(m_Queue.IsEmpty()?0:FD_WRITE));

+                AsyncSelect(FD_CLOSE|FD_READ|((m_Queue.IsEmpty()&&!do_select)?0:FD_WRITE));

 }

 

 void CXferSocket::OnReceive(int nErrorCode)

 {

         if(nErrorCode){

                 ASSERT(m_Daddy);

                 m_Daddy->LogLine(IDS_LOG_XFERRECEIVE);

                 return;

         }

         ASSERT(m_Daddy);

 DWORD fionread = 0;

         VERIFY(IOCtl(FIONREAD,&fionread));

@@ -845,29 +845,25 @@ void CRRQSocket::DoXfer()
 {

 tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize));

         ASSERT(p);

         p->SetOpcode(tftp::opDATA);

         TRY{

                 m_File.Seek(m_ACK*m_blkSize,CFile::begin);

         int bytes = m_File.Read(p->data.m_DATA.data,m_blkSize);

                 p->data.m_DATA.SetBlock(m_ACK+1);

                 p->length=p->length-m_blkSize+bytes;

                 m_LastSlack = m_blkSize-bytes;

                 PostTFTP(p);

                 if(bytes<m_blkSize){

-                        state=stateFinish;

-                        ASSERT(m_Daddy);

-                CString tmp;

-                        tmp.Format(IDS_LOG_XFERRRQFINISHED,(LPCTSTR)m_FileName);

-                        m_Daddy->LogLine(tmp);

+                        state=stateClosing; m_ACKtoClose = m_ACK+1;

                 }

         }CATCH(CFileException,e){

                 Deny(e);

         }END_CATCH

 }

 

 UINT tftp::tftpDATA::tftpSize(UINT blkSize)

 {

         return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpDATA)

                 -sizeof(BYTE)+blkSize;

 }

 

@@ -927,27 +923,27 @@ UINT eMsgID;
 }

 

 ULONG CRRQSocket::GetACK(void)

 {

         return (m_ACK*m_blkSize)-m_LastSlack;

 }

 

 BOOL CRRQSocket::OnTFTP(tftp* p)

 {

 BOOL rv = TRUE;

         switch(p->Opcode()){

         case tftp::opOACK:

+                {

                 m_ACK=0;

                 ASSERT(state!=stateFinish);

-        {

         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);

                                         rv = TRUE;

                                         break;

                                 }

                         }

                         if(o.Lookup(tftpoTOut,v)){

@@ -959,25 +955,33 @@ BOOL rv = TRUE;
                                 }

                         }

                         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){

+                if(state==stateClosing && m_ACK==m_ACKtoClose) {

+                        state = stateFinish;

+                        ASSERT(m_Daddy);

+                CString tmp;

+                        tmp.Format(IDS_LOG_XFERRRQFINISHED,(LPCTSTR)m_FileName);

+                        m_Daddy->LogLine(tmp);

+                        rv = FALSE;

+                        DoSelect(TRUE);

+                }else 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);