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
@@ -1,227 +1,227 @@
 // PumpKINDlg.cpp : implementation file

 //

 

 #include "stdafx.h"

 #include "PumpKIN.h"

 #include "PumpKINDlg.h"

 

 #include "ACLTargetCombo.h"

 #include "PropsServer.h"

 #include "PropsNetwork.h"

 #include "PropsSounds.h"

 #include "PropsACL.h"

 #include "ConfirmRRQDlg.h"

 #include "ConfirmWRQDlg.h"

 #include "RequestDlg.h"

 #include "Resolver.h"

 #include "Retrier.h"

 #include "Trayer.h"

 

 #include <io.h>

 

 #ifdef _DEBUG

 #define new DEBUG_NEW

 #undef THIS_FILE

 static char THIS_FILE[] = __FILE__;

 #endif

 

 IMPLEMENT_DYNAMIC(CXferSocket, CAsyncSocket)

 IMPLEMENT_DYNAMIC(CWRQSocket, CXferSocket)

 IMPLEMENT_DYNAMIC(CRRQSocket, CXferSocket)

 

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

 // CAboutDlg dialog used for App About

 

 class CAboutDlg : public CDialog

 {

 public:

 	CAboutDlg();

 

 // Dialog Data

 	//{{AFX_DATA(CAboutDlg)

 	enum { IDD = IDD_ABOUTBOX };

 	//}}AFX_DATA

 

 	// ClassWizard generated virtual function overrides

 	//{{AFX_VIRTUAL(CAboutDlg)

 	protected:

 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support

 	//}}AFX_VIRTUAL

 

 // 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()

 	ON_WM_PAINT()

 	ON_WM_QUERYDRAGICON()

 	ON_WM_CREATE()

 	ON_BN_CLICKED(IDC_OPTIONS, OnOptions)

 	ON_WM_TIMER()

 	ON_BN_CLICKED(IDC_EXIT, OnExit)

 	ON_BN_CLICKED(IDC_PUT, OnPut)

 	ON_BN_CLICKED(IDC_GET, OnGet)

 	ON_NOTIFY(LVN_DELETEALLITEMS, IDC_CONNECTIONS, OnDeleteallitemsConnections)

 	ON_NOTIFY(LVN_DELETEITEM, IDC_CONNECTIONS, OnDeleteitemConnections)

 	ON_NOTIFY(LVN_INSERTITEM, IDC_CONNECTIONS, OnInsertitemConnections)

 	ON_NOTIFY(LVN_ITEMCHANGED, IDC_CONNECTIONS, OnItemchangedConnections)

 	ON_BN_CLICKED(IDC_ABORT, OnAbort)

 	ON_WM_CLOSE()

 	ON_COMMAND(ID_TRAY_SHOWPUMPKINWINDOW, OnTrayShowpumpkinwindow)

 	ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen)

 	ON_COMMAND(ID_TRAY_EXIT, OnTrayExit)

 	ON_COMMAND(ID_TRAY_ABOUTPUMPKIN, OnTrayAboutpumpkin)

 	ON_COMMAND(ID_TRAY_FETCHFILE, OnTrayFetchfile)

 	ON_COMMAND(ID_TRAY_HELP, OnTrayHelp)

 	ON_COMMAND(ID_TRAY_OPTIONS, OnTrayOptions)

 	ON_COMMAND(ID_TRAY_SENDFILE, OnTraySendfile)

 	ON_WM_WINDOWPOSCHANGING()

 	ON_LBN_SELCHANGE(IDC_LOG, OnSelchangeLog)

 	ON_COMMAND(ID_TRAY_OPENFILESFOLDER, OnTrayOpenfilesfolder)

 	ON_WM_DROPFILES()

 	ON_BN_CLICKED(ID_HELP, OnHelp)

 	ON_BN_CLICKED(IDC_LISTENING, OnListening)

 	ON_WM_GETMINMAXINFO()

 	ON_WM_SIZE()

 	//}}AFX_MSG_MAP

 END_MESSAGE_MAP()

 

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

 // CPumpKINDlg message handlers

 

 BOOL CPumpKINDlg::OnInitDialog()

 {

 	CDialog::OnInitDialog();

 

 	// Add "About..." menu item to system menu.

 

 	// IDM_ABOUTBOX must be in the system command range.

 	ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);

 	ASSERT(IDM_ABOUTBOX < 0xF000);

 

 	CMenu* pSysMenu = GetSystemMenu(FALSE);

 	CString strAboutMenu;

 	strAboutMenu.LoadString(IDS_ABOUTBOX);

 	if (!strAboutMenu.IsEmpty())

 	{

 		pSysMenu->AppendMenu(MF_SEPARATOR);

 		pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu);

 	}

 

 	// Set the icon for this dialog.  The framework does this automatically

 	//  when the application's main window is not a dialog

 	SetIcon(m_hIcon, TRUE);			// Set big icon

 	SetIcon(m_hIcon, FALSE);		// Set small icon

 

 	VERIFY(m_Retrier->Create(NULL,"PumpKIN-Retrier",WS_CHILD,CRect(0,0,0,0),this,0));

 

 	m_Images.Create(16,16,TRUE,2,1);

 	m_iRRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_RRQ));

 	m_iWRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_WRQ));

 	ASSERT(m_iRRQ>=0);

 	ASSERT(m_iWRQ>=0);

 	m_List.SetImageList(&m_Images,LVSIL_NORMAL);

 	m_List.SetImageList(&m_Images,LVSIL_SMALL);

 	m_List.SetImageList(&m_Images,LVSIL_STATE);

 	m_List.SetTextColor(RGB(255,255,0));	// Yellow

 	m_List.SetTextBkColor(RGB(12,167,0));	// Green

 	m_List.SetBkColor(RGB(12,167,0));	// Green

 CRect listrc;

 	m_List.GetClientRect(&listrc);

 	m_List.InsertColumn(0,"File",LVCFMT_LEFT,listrc.Width()-((listrc.Width()/7)*3+listrc.Width()*2/7),subitemFile);

 	m_List.InsertColumn(1,"type",LVCFMT_CENTER,listrc.Width()/7,subitemType);

 	m_List.InsertColumn(2,"peer",LVCFMT_LEFT,listrc.Width()*2/7,subitemPeer);

 	m_List.InsertColumn(3,"ACK",LVCFMT_RIGHT,listrc.Width()/7,subitemBytes);

 	m_List.InsertColumn(4,"tsize",LVCFMT_RIGHT,listrc.Width()/7,subitemTSize);

@@ -908,256 +908,260 @@ UINT eMsgID;
 	case CFileException::directoryFull:

 		eCode=tftp::errDiskFull;

 		eMsgID=IDS_TFTP_ERROR_DIRFULL;

 		break;

 	case CFileException::sharingViolation:

 		eCode=tftp::errAccessViolation;

 		eMsgID=IDS_TFTP_ERROR_SHARING;

 		break;

 	case CFileException::diskFull:

 		eCode=tftp::errDiskFull;

 		eMsgID=IDS_TFTP_ERROR_DISKFULL;

 		break;

 	default:

 		eCode=tftp::errUndefined;

 		eMsgID=IDS_TFTP_ERROR_UNDEFINED;

 		break;

 	}

 	PostError(eCode,eMsgID);

 }

 

 ULONG CRRQSocket::GetACK(void)

 {

 	return (m_ACK*m_blkSize)-m_LastSlack;

 }

 

 BOOL CRRQSocket::OnTFTP(tftp* p)

 {

 BOOL rv = TRUE;

 	switch(p->Opcode()){

 	case tftp::opOACK:

 		{

 			m_ACK=0;

 			ASSERT(state!=stateFinish);

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

 						rv = TRUE;

 						break;

 					}

 				}

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

 					m_timeOut=atoi(v);

 					if(!m_timeOut){	// *** More sanity checks

 						Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);

 						rv = TRUE;

 						break;

 					}

 				}

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

 					m_ACK=atoi(v);

 				}

 			}

 			UpdateList();

 			DoXfer();

 		}

 		break;

 	case tftp::opACK:

 		m_ACK=p->data.m_ACK.Block();

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

 			DoXfer();

 		}

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

 		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??

 		}

 		break;

 	}

 	return TRUE;

 }

 

 void tftp::SetOpcode(WORD op)

 {

 	opcode = REVERSEBYTES(op);

 }

 void tftp::tftpDATA::SetBlock(WORD b)

 {

 	block=REVERSEBYTES(b);

 }

 WORD tftp::tftpDATA::Block()

 {

 	return REVERSEBYTES(block);

 }

 WORD tftp::tftpACK::Block()

 {

 	return REVERSEBYTES(block);

 }

 void tftp::tftpACK::SetBlock(WORD b)

 {

 	block = REVERSEBYTES(b);

 }

 WORD tftp::tftpERROR::Code()

 {

 	return REVERSEBYTES(code);

 }

 void tftp::tftpERROR::SetCode(WORD c)

 {

 	code = REVERSEBYTES(c);

 }

 

 

 CString tftp::errMessage()

 {

 CString rv;

 	if(memchr(data.m_ERROR.data,0,length-(tftpHdrSize-tftpSlackSize)-sizeof(data.m_ERROR.code)))

 		rv = (LPCTSTR)data.m_ERROR.data;

 	return rv;

 }

 

 void CXferSocket::Destroy(BOOL success)

 {

 	if(m_wndResolver){

 		delete m_wndResolver;

 		m_wndResolver=NULL;

 	}

 	SetTry();

 	m_Daddy->m_bnw.StartSound(

 		success

 			? m_Daddy->m_bnwSuccess

 			: m_Daddy->m_bnwAbort

 	);

 	if(m_File.m_hFile!=CFile::hFileNull){

 		TRY{

 			m_File.Close();

 		}CATCH(CFileException,e){

 			TRACE0("Error closing file\n");

 		}END_CATCH

 	}

 	ASSERT(m_Daddy);

 	m_Daddy->KillTimer(m_hSocket);

 	m_Daddy->m_Xfers.RemoveKey(m_hSocket);

 LV_FINDINFO lvf;

 	memset(&lvf,0,sizeof(lvf));

 	lvf.flags=LVFI_PARAM;

 	lvf.lParam=(LPARAM)this;

 int i = m_Daddy->m_List.FindItem(&lvf);

 	if(i>=0)

 		m_Daddy->m_List.DeleteItem(i);

 	delete this;

 }

 

 void CPumpKINDlg::LogLineToScreen(LPCTSTR str)

 {

 	ASSERT(m_LogLength);

 	while(m_Log.GetCount()>m_LogLength && m_Log.GetCount()!=LB_ERR){

@@ -1284,256 +1288,261 @@ BOOL CWRQSocket::Create(LPCTSTR localFile,LPCTSTR hostName)
 {

 	if(!CAsyncSocket::Create(0,SOCK_DGRAM))

 		return FALSE;

 	ASSERT(m_Daddy);

 	ASSERT(m_Peer.sin_addr.s_addr!=INADDR_NONE || hostName);

 	m_Daddy->m_Xfers[m_hSocket]=this;

 	UpdateList();

 CString lf;

  	if(!localFile) {

 		lf = m_FileName;

 		TurnSlashes(lf,TRUE);

 	}

 CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(lf);

 	if(!localFile){	// This is an incoming request..

 		if(CheckBadRelativeness(m_FileName)){

 			Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS);

 			return TRUE;

 		}

 	BOOL exists;

 		if(!_access((LPCTSTR)fn,0))

 			m_Rename=exists=TRUE;

 		else

 			m_Rename=exists=FALSE;

 		int atar=m_Daddy->m_aclRules.FindTarget(acl_rule::opWRQ,m_Peer.sin_addr.s_addr);

 		if(atar<0)

 			atar=m_Daddy->m_WRQMode;

 		switch(atar){

 		case CPumpKINDlg::wrqTakeAll:

 			if(exists){

 				if(!RenameFile(fn)){

 					Deny(tftp::errDiskFull,IDS_TFTP_ERROR_FAILEDTORENAME);

 					return TRUE;

 				}

 			}

 			break;

 		case CPumpKINDlg::wrqConfirmIfExists:

 			if(!exists)

 				break;

 		case CPumpKINDlg::wrqAlwaysConfirm:

 			if(exists)

 				m_bResume=TRUE;

 			if(ConfirmRequest()){

 				if(m_Rename){

 					RenameFile(fn);

 					if(SaveAs(fn))

 						break;

 				}else

 					break;

 			}

 		default:

 			TRACE1("Unexpected access target: %d\n",atar);

 		case CPumpKINDlg::wrqDenyAll:

 			Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS);

 			return TRUE;

 		}

 	}

 CFileException e;

 	if(!m_File.Open(

 			fn,

 			m_bResume

 			 ?(CFile::modeWrite|CFile::shareDenyWrite)

 			 :(CFile::modeCreate|CFile::modeWrite|CFile::shareDenyWrite),

 			&e

 	)){

 		if(localFile){	// Outgoing request

 		CString tmp;

 			tmp.Format(IDS_LOG_FAILEDTOOPEN,fn);

 			m_Daddy->LogLine(tmp);

 			return FALSE;

 		}else{

 			Deny(&e);

 			return TRUE;

 		}

 	}

 	if(hostName){

 		m_HostName=hostName;

 

 	CString tmp;

 		tmp.Format(IDS_LOG_REQUESTING,m_FileName,m_HostName);

 		m_Daddy->LogLine(tmp);

 

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

 		}

 	}

 CString testFN;

 	for(UINT tmp=0;tmp<32768;tmp++){

 		testFN.Format("%s (%u)",(LPCTSTR)renamed,tmp);

 		if(!_access((LPCTSTR)testFN,0))

 			continue;

 		fn=testFN;

 		return TRUE;

 	}

 	return FALSE;

 }

 

 BOOL CWRQSocket::SaveAs(CString& fn)

 {

 CFileDialog cfd(FALSE,NULL,fn,OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT|OFN_PATHMUSTEXIST,NULL,m_Daddy);

 CString title;

 	title.LoadString(IDS_RENAME_TITLE);

 	cfd.m_ofn.lpstrTitle=(LPCTSTR)title;

 	if(cfd.DoModal()!=IDOK)

 		return FALSE;

 	fn = cfd.GetPathName();

 	return TRUE;

 }

 

 void CWRQSocket::DoXfer()

 {

 tftp *p = tftp::Allocate(tftp::tftpACK::tftpSize());

 	ASSERT(p);

 	p->SetOpcode(tftp::opACK);

 	p->data.m_ACK.SetBlock(m_ACK);

 	TRACE1("WRQ-ACK-%u\n",m_ACK);

 	PostTFTP(p,TRUE);	// *** ??? Hope this is right

 }

 

 UINT tftp::tftpACK::tftpSize()

 {

 	return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpACK);

 }

 

 ULONG CWRQSocket::GetACK()

 {

 	return (m_ACK*m_blkSize)-m_LastSlack;

 }

 

 void CXferSocket::ResetTimeout()

 {

 	ASSERT(m_Daddy);

 	m_Daddy->m_Retrier->KillTimer(m_hSocket);

 	if(m_Retry)

 		m_Daddy->m_Retrier->SetTimer(m_hSocket,min(60,m_Daddy->m_RetryTimeOut.GetTotalSeconds())*1000,NULL);

 	if(!m_bRetry){

 		m_Daddy->KillTimer(m_hSocket);

 		m_Daddy->SetTimer(m_hSocket,min(60,m_timeOut)*1000,NULL);

 	}

 }

 

 void CXferSocket::Abort()

 {

 	ASSERT(m_Daddy);

 CString tmp;

 	tmp.Format(IDS_LOG_XFERABORTED,(LPCTSTR)m_FileName);

 	m_Daddy->LogLine(tmp);

 	Destroy(FALSE);

 }

 

 void CPumpKINDlg::OnTimer(UINT nIDEvent) 

 {

 CXferSocket *socket;

 	if(m_Xfers.Lookup(nIDEvent,socket)){

 	CString tmp;

 		tmp.Format(IDS_LOG_TIMEDOUT,socket->m_FileName);

 		LogLine(tmp);

 		socket->Abort();

 	}else{

 		TRACE0("Failed to find timed out socket!\n");

 	}

 	CDialog::OnTimer(nIDEvent);

 }

 

 void CPumpKINDlg::OnExit()