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
@@ -87,25 +87,25 @@ CPumpKINDlg::CPumpKINDlg(CWnd* pParent /*=NULL*/)
 

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

@@ -1024,24 +1024,28 @@ BOOL CWRQSocket::OnTFTP(tftp* p)
 				}

 			}

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

@@ -1400,24 +1404,29 @@ tftp::tftpOptions oack;
 			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;

 }