author | Michael Krelin <hacker@klever.net> | 2006-07-02 22:16:25 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2006-07-02 22:16:25 (UTC) |
commit | 577427e68ef10a4d2b75d28e42b22952ae3bcf23 (patch) (unidiff) | |
tree | 24c8fc94ea6524059cab7927ef76639bb1a1a98d /PumpKINDlg.cpp | |
parent | 24e693797daef020ece3fa19bb5acce000e37165 (diff) | |
download | pumpkin-577427e68ef10a4d2b75d28e42b22952ae3bcf23.zip pumpkin-577427e68ef10a4d2b75d28e42b22952ae3bcf23.tar.gz pumpkin-577427e68ef10a4d2b75d28e42b22952ae3bcf23.tar.bz2 |
Do not close RRQ socket until the last ACK is received.
git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@152 fe716a7a-6dde-0310-88d9-d003556173a8
-rw-r--r-- | PumpKINDlg.cpp | 22 |
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 | |||
@@ -578,12 +578,12 @@ int rv = socket->SendTo(udpBase(),length,(SOCKADDR*)saddr,sizeof(SOCKADDR_IN)); | |||
578 | return FALSE; | 578 | return FALSE; |
579 | return TRUE; | 579 | return TRUE; |
580 | } | 580 | } |
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 | } |
587 | 587 | ||
588 | void CXferSocket::OnReceive(int nErrorCode) | 588 | void CXferSocket::OnReceive(int nErrorCode) |
589 | { | 589 | { |
@@ -853,13 +853,9 @@ tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize)); | |||
853 | p->length=p->length-m_blkSize+bytes; | 853 | p->length=p->length-m_blkSize+bytes; |
854 | m_LastSlack = m_blkSize-bytes; | 854 | m_LastSlack = m_blkSize-bytes; |
855 | PostTFTP(p); | 855 | PostTFTP(p); |
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 | } |
863 | }CATCH(CFileException,e){ | 859 | }CATCH(CFileException,e){ |
864 | Deny(e); | 860 | Deny(e); |
865 | }END_CATCH | 861 | }END_CATCH |
@@ -935,11 +931,11 @@ BOOL CRRQSocket::OnTFTP(tftp* p) | |||
935 | { | 931 | { |
936 | BOOL rv = TRUE; | 932 | BOOL rv = TRUE; |
937 | switch(p->Opcode()){ | 933 | switch(p->Opcode()){ |
938 | case tftp::opOACK: | 934 | case tftp::opOACK: |
935 | { | ||
939 | m_ACK=0; | 936 | m_ACK=0; |
940 | ASSERT(state!=stateFinish); | 937 | ASSERT(state!=stateFinish); |
941 | { | ||
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)){ |
@@ -967,9 +963,17 @@ BOOL rv = TRUE; | |||
967 | } | 963 | } |
968 | break; | 964 | break; |
969 | case tftp::opACK: | 965 | case tftp::opACK: |
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(); |
973 | DoXfer(); | 977 | DoXfer(); |
974 | } | 978 | } |
975 | break; | 979 | break; |