1 files changed, 37 insertions, 33 deletions
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 070f3e8..2a01918 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -581,6 +581,6 @@ int rv = socket->SendTo(udpBase(),length,(SOCKADDR*)saddr,sizeof(SOCKADDR_IN));
-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));
 }
@@ -856,7 +856,3 @@ tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize));
                if(bytes<m_blkSize){
-                        state=stateFinish;
+                        state=stateClosing; m_ACKtoClose = m_ACK+1;
-                        ASSERT(m_Daddy);
-                CString tmp;
-                        tmp.Format(IDS_LOG_XFERRRQFINISHED,(LPCTSTR)m_FileName);
-                        m_Daddy->LogLine(tmp);
                }
@@ -938,31 +934,31 @@ BOOL rv = TRUE;
        case tftp::opOACK:
-                m_ACK=0;
+                {
-                ASSERT(state!=stateFinish);
+                        m_ACK=0;
-        {
+                        ASSERT(state!=stateFinish);
-        tftp::tftpOptions o;
+                tftp::tftpOptions o;
-                if(p->GetOptions(&o)){
+                        if(p->GetOptions(&o)){
-                CString v;
+                        CString v;
-                        if(o.Lookup(tftpoBSize,v)){
+                                if(o.Lookup(tftpoBSize,v)){
-                                m_blkSize=atoi(v);
+                                        m_blkSize=atoi(v);
-                                        if(!m_blkSize){// *** More sanity checks
+                                                if(!m_blkSize){// *** More sanity checks
-                                        Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);
+                                                Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);
-                                        rv = TRUE;
+                                                rv = TRUE;
-                                        break;
+                                                break;
+                                        }
                                }
-                        }
+                                if(o.Lookup(tftpoTOut,v)){
-                        if(o.Lookup(tftpoTOut,v)){
+                                        m_timeOut=atoi(v);
-                                m_timeOut=atoi(v);
+                                                if(!m_timeOut){// *** More sanity checks
-                                        if(!m_timeOut){// *** More sanity checks
+                                                Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);
-                                        Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);
+                                                rv = TRUE;
-                                        rv = TRUE;
+                                                break;
-                                        break;
+                                        }
+                                }
+                                if(o.Lookup(tftpoXResume,v)){
+                                        m_ACK=atoi(v);
                                }
                        }
-                        if(o.Lookup(tftpoXResume,v)){
+                        UpdateList();
-                                m_ACK=atoi(v);
+                        DoXfer();
-                        }
                }
-                UpdateList();
-                DoXfer();
-        }
                break;
@@ -970,3 +966,11 @@ BOOL rv = TRUE;
                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();

diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp index 070f3e8..2a01918 100644 --- a/PumpKINDlg.cpp +++ b/PumpKINDlg.cpp
@@ -581,6 +581,6 @@ int rv = socket->SendTo(udpBase(),length,(SOCKADDR*)saddr,sizeof(SOCKADDR_IN));
581		581
582	void CXferSocket::DoSelect()	582	void CXferSocket::DoSelect(BOOL do_select)
583	{	583	{
584	if(m_Peer.sin_addr.s_addr!=INADDR_NONE)	584	if(m_Peer.sin_addr.s_addr!=INADDR_NONE)
585	AsyncSelect(FD_CLOSE\|FD_READ\|(m_Queue.IsEmpty()?0:FD_WRITE));	585	AsyncSelect(FD_CLOSE\|FD_READ\|((m_Queue.IsEmpty()&&!do_select)?0:FD_WRITE));
586	}	586	}
@@ -856,7 +856,3 @@ tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize));
856	if(bytes<m_blkSize){	856	if(bytes<m_blkSize){
857	state=stateFinish;	857	state=stateClosing; m_ACKtoClose = m_ACK+1;
858	ASSERT(m_Daddy);
859	CString tmp;
860	tmp.Format(IDS_LOG_XFERRRQFINISHED,(LPCTSTR)m_FileName);
861	m_Daddy->LogLine(tmp);
862	}	858	}
@@ -938,31 +934,31 @@ BOOL rv = TRUE;
938	case tftp::opOACK:	934	case tftp::opOACK:
939	m_ACK=0;	935	{
940	ASSERT(state!=stateFinish);	936	m_ACK=0;
941	{	937	ASSERT(state!=stateFinish);
942	tftp::tftpOptions o;	938	tftp::tftpOptions o;
943	if(p->GetOptions(&o)){	939	if(p->GetOptions(&o)){
944	CString v;	940	CString v;
945	if(o.Lookup(tftpoBSize,v)){	941	if(o.Lookup(tftpoBSize,v)){
946	m_blkSize=atoi(v);	942	m_blkSize=atoi(v);
947	if(!m_blkSize){// *** More sanity checks	943	if(!m_blkSize){// *** More sanity checks
948	Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);	944	Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);
949	rv = TRUE;	945	rv = TRUE;
950	break;	946	break;
		947	}
951	}	948	}
952	}	949	if(o.Lookup(tftpoTOut,v)){
953	if(o.Lookup(tftpoTOut,v)){	950	m_timeOut=atoi(v);
954	m_timeOut=atoi(v);	951	if(!m_timeOut){// *** More sanity checks
955	if(!m_timeOut){// *** More sanity checks	952	Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);
956	Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);	953	rv = TRUE;
957	rv = TRUE;	954	break;
958	break;	955	}
		956	}
		957	if(o.Lookup(tftpoXResume,v)){
		958	m_ACK=atoi(v);
959	}	959	}
960	}	960	}
961	if(o.Lookup(tftpoXResume,v)){	961	UpdateList();
962	m_ACK=atoi(v);	962	DoXfer();
963	}
964	}	963	}
965	UpdateList();
966	DoXfer();
967	}
968	break;	964	break;
@@ -970,3 +966,11 @@ BOOL rv = TRUE;
970	m_ACK=p->data.m_ACK.Block();	966	m_ACK=p->data.m_ACK.Block();
971	if(state!=stateFinish){	967	if(state==stateClosing && m_ACK==m_ACKtoClose) {
		968	state = stateFinish;
		969	ASSERT(m_Daddy);
		970	CString tmp;
		971	tmp.Format(IDS_LOG_XFERRRQFINISHED,(LPCTSTR)m_FileName);
		972	m_Daddy->LogLine(tmp);
		973	rv = FALSE;
		974	DoSelect(TRUE);
		975	}else if(state!=stateFinish){
972	UpdateList();	976	UpdateList();