Increased default blocksize and added reject with explicit error message for

WRQ request in case I can see the file is too big for us.


git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@193 fe716a7a-6dde-0310-88d9-d003556173a8

1 files changed, 10 insertions, 1 deletions

diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index bb15211..f41b69f 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -51,97 +51,97 @@ public:
 // Implementation

 protected:

 	//{{AFX_MSG(CAboutDlg)

 	afx_msg void OnKlevernet();

 	//}}AFX_MSG

 	DECLARE_MESSAGE_MAP()

 };

 

 CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)

 {

 	//{{AFX_DATA_INIT(CAboutDlg)

 	//}}AFX_DATA_INIT

 }

 

 void CAboutDlg::DoDataExchange(CDataExchange* pDX)

 {

 	CDialog::DoDataExchange(pDX);

 	//{{AFX_DATA_MAP(CAboutDlg)

 	//}}AFX_DATA_MAP

 }

 

 BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)

 	//{{AFX_MSG_MAP(CAboutDlg)

 	ON_BN_CLICKED(IDC_KLEVERNET, OnKlevernet)

 	//}}AFX_MSG_MAP

 END_MESSAGE_MAP()

 

 /////////////////////////////////////////////////////////////////////////////

 // CPumpKINDlg dialog

 

 CPumpKINDlg::CPumpKINDlg(CWnd* pParent /*=NULL*/)

 	: CDialog(CPumpKINDlg::IDD, pParent), m_MinSize(0,0)

 {

 	m_Listener.m_Daddy = this;

 

 	m_bListen = TRUE;

 

 	m_ListenPort = 69;

 	m_bTFTPSubdirs = TRUE;

 	m_RRQMode = rrqAlwaysConfirm;

 	m_WRQMode = wrqAlwaysConfirm;

 	m_TFTPTimeOut = CTimeSpan(0,0,0,30);

 	m_RetryTimeOut = CTimeSpan(0,0,0,10);

 	m_LogLength = 100;

 	m_SpeakPort = 69;

 	m_PromptTimeOut=30;

 	m_bShown=TRUE;

 	m_bExiting=FALSE;

-	m_BlockSize=1024;

+	m_BlockSize=2048;

 	m_bnw.AssignSound("(bang)",IDR_WAVE_RING,CBellsNWhistles::CBang::bangResource);

 	m_bnw.AssignSound("(done)",IDR_WAVE_FINISHED,CBellsNWhistles::CBang::bangResource);

 	m_bnw.AssignSound("(oops)",IDR_WAVE_ABORTED,CBellsNWhistles::CBang::bangResource);

 	m_bnw.AssignSound("(none)",(int)0,CBellsNWhistles::CBang::bangNone);

 	m_bnwRequest="(bang)"; m_bnwSuccess="(done)";

 	m_bnwAbort="(oops)";

 	//{{AFX_DATA_INIT(CPumpKINDlg)

 	//}}AFX_DATA_INIT

 	// Note that LoadIcon does not require a subsequent DestroyIcon in Win32

 	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);

 	m_bmpBack.LoadBitmap(IDB_BACKGROUND);

 	m_bmpBack.GetBitmap(&m_bitmapBack);

 	m_Retrier = new CRetrier(this);

 	ASSERT(m_Retrier);

 	m_Trayer = new CTrayer(this);

 	ASSERT(m_Trayer);

 	/* Ensure we're backwards compatible */

 	ASSERT(CPumpKINDlg::rrqGiveAll==0);

 	ASSERT(CPumpKINDlg::rrqAlwaysConfirm==1);

 	ASSERT(CPumpKINDlg::rrqDenyAll==2);

 	ASSERT(CPumpKINDlg::wrqTakeAll==0);

 	ASSERT(CPumpKINDlg::wrqConfirmIfExists==1);

 	ASSERT(CPumpKINDlg::wrqAlwaysConfirm==2);

 	ASSERT(CPumpKINDlg::wrqDenyAll==3);

 	/* -- */

 	LoadSettings();

 }

 

 void CPumpKINDlg::DoDataExchange(CDataExchange* pDX)

 {

 	CDialog::DoDataExchange(pDX);

 	//{{AFX_DATA_MAP(CPumpKINDlg)

 	DDX_Control(pDX, ID_HELP, m_HelpCtl);

 	DDX_Control(pDX, IDC_PUT, m_PutCtl);

 	DDX_Control(pDX, IDC_GET, m_GetCtl);

 	DDX_Control(pDX, IDC_EXIT, m_ExitCtl);

 	DDX_Control(pDX, IDC_LISTENING, m_ListenCtl);

 	DDX_Control(pDX, IDC_ABORT, m_AbortCtl);

 	DDX_Control(pDX, IDC_OPTIONS, m_OptionsCtl);

 	DDX_Control(pDX, IDC_LOG, m_Log);

 	DDX_Control(pDX, IDC_CONNECTIONS, m_List);

 	//}}AFX_DATA_MAP

 }

 

 BEGIN_MESSAGE_MAP(CPumpKINDlg, CDialog)

 	//{{AFX_MSG_MAP(CPumpKINDlg)

 	ON_WM_SYSCOMMAND()

 	ON_WM_DESTROY()

@@ -988,96 +988,100 @@ BOOL rv = TRUE;
 			m_Daddy->LogLine(tmp);

 		}

 		Destroy(FALSE);

 		rv = FALSE;

 		break;

 	default:

 		{

 			ASSERT(m_Daddy);

 			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;

 				}

 			}

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

 				m_xferSize=atoi(v);

 			}

+			if(m_xferSize>=0 && m_xferSize>=(m_blkSize<<16)) {

+				Deny(tftp::errUndefined,IDS_TFTP_ERROR_TOOBIG);

+				return TRUE;

+			}

 		}

 		UpdateList();

 		DoXfer();

 	}

 		break;

 	case tftp::opDATA:

 		{

 		UINT	block = p->data.m_DATA.Block();

 			TRY{

 				m_File.Seek((block-1)*m_blkSize,CFile::begin);

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

 			CString tmp;

 			tmp.Format(IDS_LOG_XFEROPCODE,p->Opcode());

 			m_Daddy->LogLine(tmp);

 			// *** Self destruct maybe??

@@ -1364,96 +1368,101 @@ CFileException e;
 

 	CString inAddr = hostName;

 	int at = inAddr.Find('@');

 		if(at>=0)

 			inAddr=inAddr.Mid(at+1);

 		if((m_Peer.sin_addr.s_addr=inet_addr((LPCTSTR)inAddr))==INADDR_NONE){

 			ASSERT(!m_wndResolver);

 			m_wndResolver = new CResolver(this);

 			ASSERT(m_wndResolver);

 			return m_wndResolver->Resolve();

 		}else{

 			OnHostKnown();

 			return TRUE;

 		}

 	}

 CString v;

 tftp::tftpOptions oack;

 	if(m_Options.Lookup(tftpoTSize,v)){

 		m_xferSize=atol(v);

 		if(!m_xferSize){

 			Deny(tftp::errOption,IDS_TFTP_ERROR_TSIZE);

 			return TRUE;

 		}

 	}

 	if(m_Options.Lookup(tftpoBSize,v)){

 		m_blkSize=atoi(v);

 		if(!m_blkSize){	//  *** Do more about sanity check

 			Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);

 			return TRUE;

 		}

 		v.Format("%u",m_blkSize);

 		oack[tftpoBSize]=v;

 	}

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

 		m_timeOut=atoi(v);

 		if(!m_timeOut){	// *** Do more about sanity check

 			Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);

 			return TRUE;

 		}

 		v.Format("%u",m_timeOut);

 		oack[tftpoTOut]=v;

 	}

 	if(m_Options.Lookup(tftpoXResume,v) && m_bResume){

 		m_ACK=m_File.GetLength()/m_blkSize;

 		v.Format("%u",m_ACK);

 		oack[tftpoXResume]=v;

 	}else

 		m_ACK=0;

+	// XXX: see if we can negotiate the right block size somehow

+	if(m_xferSize>=0 && m_xferSize>=(m_blkSize<<16)) {

+		Deny(tftp::errUndefined,IDS_TFTP_ERROR_TOOBIG);

+		return TRUE;

+	}

 	state=stateXfer;

 	if(oack.GetCount()){

 	tftp *p = tftp::Allocate(tftp::tftpOACK::tftpSize(&oack));

 		ASSERT(p);

 		p->SetOpcode(tftp::opOACK);

 		p->data.m_OACK.Set(&oack);

 		PostTFTP(p,TRUE);

 	}else

 		DoXfer();

 	return TRUE;

 }

 

 BOOL CWRQSocket::ConfirmRequest()

 {

 CConfirmWRQDlg cd(NULL);

 	cd.m_Daddy=this;

 	cd.m_File=m_FileName;

 	cd.m_Host=inet_ntoa(m_Peer.sin_addr);

 	switch(cd.DoModal()){

 	case IDOK:

 		m_Rename=FALSE;

 		m_bResume=FALSE;

 		return TRUE;

 	case IDC_RENAME:

 		m_bResume=FALSE;

 		m_Rename=TRUE;

 		return TRUE;

 	case IDC_RESUME:

 		m_Rename=FALSE;

 		m_bResume=TRUE;

 		return TRUE;

 	case IDCANCEL:

 		return FALSE;

 	}

 	return FALSE;

 }

 

 BOOL CWRQSocket::RenameFile(CString& fn)

 {

 CString renamed = fn;

 	if(fn.IsEmpty())

 		return FALSE;

 	if(fn[fn.GetLength()-1]==')'){

 	int op = fn.ReverseFind('(');

 		if(op>0 && fn[op-1]==' '){

 			if(fn.Mid(op+1,fn.GetLength()-op-2).SpanExcluding("0123456789").IsEmpty())

 				renamed = renamed.Left(op-1);

 		}