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

1 files changed, 2 insertions, 1 deletions

diff --git a/PumpKINDlg.h b/PumpKINDlg.h
index c5469f1..23c2657 100644
--- a/PumpKINDlg.h
+++ b/PumpKINDlg.h
@@ -303,25 +303,25 @@ public:
 	void PostError(UINT errCode,UINT errID);

 	void PostTFTP(tftp* p,BOOL retryable=FALSE);

 	CXferSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN* sin);

 	CFile m_File;

 	virtual ULONG GetACK();

 	CString m_Type;

 	CString m_FileName;

 	CXferSocket();

 	void UpdateList();

 	void SetPeer(SOCKADDR_IN *sin);

 	virtual BOOL OnTFTP(tftp* p) = 0;

 	virtual void OnReceive(int nErrorCode);

-	void DoSelect();

+	void DoSelect(BOOL do_select=FALSE);

 	SOCKADDR_IN m_Peer;

 	virtual void OnSend(int nErrorCode);

 	CPumpKINDlg* m_Daddy;

 	CTFTPList m_Queue;

 

 	DECLARE_DYNAMIC(CXferSocket)

 };

 class CWRQSocket : public CXferSocket {

 public:

 	BOOL m_bResume;

 	void OnHostKnown();

 	virtual void OnResolved();

@@ -332,24 +332,25 @@ public:
 	BOOL SaveAs(CString& fn);

 	BOOL RenameFile(CString& fn);

 	BOOL m_Rename;

 	BOOL ConfirmRequest();

 	BOOL Create(LPCTSTR localFile=NULL,LPCTSTR hostName=NULL);

 	CWRQSocket(CPumpKINDlg* daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin);

 	BOOL OnTFTP(tftp* p);

 

 	DECLARE_DYNAMIC(CWRQSocket)

 };

 class CRRQSocket : public CXferSocket {

 public:

+	UINT m_ACKtoClose;

 	void OnHostKnown();

 	virtual void OnResolved();

 	BOOL ConfirmRequest();

 	WORD m_LastSlack;

 	UINT m_ACK;

 	BOOL OnTFTP(tftp* p);

 	ULONG GetACK(void);

 	void DoXfer();

 	CRRQSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin);

 	BOOL Create(LPCTSTR localFile=NULL,LPCTSTR hostName=NULL);

 

 	DECLARE_DYNAMIC(CRRQSocket)