network settings: bind to specific ip address

Signed-off-by: Michael Krelin <hacker@klever.net>

9 files changed, 64 insertions, 48 deletions

diff --git a/PropsNetwork.cpp b/PropsNetwork.cpp
index b5585d7..2dd5913 100644..100755
--- a/PropsNetwork.cpp
+++ b/PropsNetwork.cpp
@@ -1,71 +1,74 @@
 // PropsNetwork.cpp : implementation file

 //

 

 #include "stdafx.h"

 #include "PumpKIN.h"

 #include "PropsNetwork.h"

 

 #ifdef _DEBUG

 #define new DEBUG_NEW

 #undef THIS_FILE

 static char THIS_FILE[] = __FILE__;

 #endif

 

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

 // CPropsNetwork property page

 

 IMPLEMENT_DYNCREATE(CPropsNetwork, CPropertyPage)

 

 CPropsNetwork::CPropsNetwork() : CPropertyPage(CPropsNetwork::IDD)

 {

 	//{{AFX_DATA_INIT(CPropsNetwork)

 	m_ListenPort = 0;

 	m_SpeakPort = 0;

 	m_TimeOut = 0;

 	m_BlockSize = 0;

+	m_ListenAddress = _T("");

 	//}}AFX_DATA_INIT

 }

 

 CPropsNetwork::~CPropsNetwork()

 {

 }

 

 void CPropsNetwork::DoDataExchange(CDataExchange* pDX)

 {

 	CPropertyPage::DoDataExchange(pDX);

 	//{{AFX_DATA_MAP(CPropsNetwork)

 	DDX_Control(pDX, IDC_BSIZESPIN, m_BSizeSpinCtl);

 	DDX_Control(pDX, IDC_TIMESPIN, m_TimeSpinCtl);

 	DDX_Control(pDX, IDC_SPEAKSPIN, m_SpeakSpinCtl);

 	DDX_Control(pDX, IDC_LISTENSPIN, m_ListenSpinCtl);

 	DDX_Text(pDX, IDC_LISTENPORT, m_ListenPort);

 	DDX_Text(pDX, IDC_SPEAKPORT, m_SpeakPort);

 	DDX_Text(pDX, IDC_TIMEOUT, m_TimeOut);

 	DDV_MinMaxUInt(pDX, m_TimeOut, 5, 60);

 	DDX_Text(pDX, IDC_BLOCKSIZE, m_BlockSize);

+	DDX_Text(pDX, IDC_LISTENADDRESS, m_ListenAddress);

+	DDV_MaxChars(pDX, m_ListenAddress, 15);

 	//}}AFX_DATA_MAP

 }

 

 

 BEGIN_MESSAGE_MAP(CPropsNetwork, CPropertyPage)

 	//{{AFX_MSG_MAP(CPropsNetwork)

 	//}}AFX_MSG_MAP

 END_MESSAGE_MAP()

 

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

 // CPropsNetwork message handlers

 

 BOOL CPropsNetwork::OnInitDialog() 

 {

 	CPropertyPage::OnInitDialog();

 	

 	m_ListenSpinCtl.SetRange(0,32767);

 	m_SpeakSpinCtl.SetRange(0,32767);

 	m_TimeSpinCtl.SetRange(5,60);

 	m_BSizeSpinCtl.SetRange(512,16384);

 UDACCEL uda = {0,512};

 	m_BSizeSpinCtl.SetAccel(1,&uda);

 

 	return TRUE;  // return TRUE unless you set the focus to a control

 	              // EXCEPTION: OCX Property Pages should return FALSE

 }

diff --git a/PropsNetwork.h b/PropsNetwork.h
index 67d0b53..565b090 100644..100755
--- a/PropsNetwork.h
+++ b/PropsNetwork.h
@@ -1,45 +1,46 @@
 // PropsNetwork.h : header file

 //

 

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

 // CPropsNetwork dialog

 

 class CPropsNetwork : public CPropertyPage

 {

 	DECLARE_DYNCREATE(CPropsNetwork)

 

 // Construction

 public:

 	CPropsNetwork();

 	~CPropsNetwork();

 

 // Dialog Data

 	//{{AFX_DATA(CPropsNetwork)

 	enum { IDD = IDD_PROPS_NETWORK };

 	CSpinButtonCtrl	m_BSizeSpinCtl;

 	CSpinButtonCtrl	m_TimeSpinCtl;

 	CSpinButtonCtrl	m_SpeakSpinCtl;

 	CSpinButtonCtrl	m_ListenSpinCtl;

 	UINT	m_ListenPort;

 	UINT	m_SpeakPort;

 	UINT	m_TimeOut;

 	UINT	m_BlockSize;

+	CString	m_ListenAddress;

 	//}}AFX_DATA

 

 

 // Overrides

 	// ClassWizard generate virtual function overrides

 	//{{AFX_VIRTUAL(CPropsNetwork)

 	protected:

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

 	//}}AFX_VIRTUAL

 

 // Implementation

 protected:

 	// Generated message map functions

 	//{{AFX_MSG(CPropsNetwork)

 	virtual BOOL OnInitDialog();

 	//}}AFX_MSG

 	DECLARE_MESSAGE_MAP()

 

 };

diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 3ff1500..0c5c19b 100755
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -1039,407 +1039,409 @@ BOOL CWRQSocket::OnTFTP(tftp* p)
 				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){

 	CTime *t = (CTime*)m_Log.GetItemData(0);

 		if(((DWORD)t)!=LB_ERR){

 			ASSERT(t);

 			m_LogTimes.RemoveKey(t);

 			delete t;

 		}

 		m_Log.DeleteString(0);

 	}

 int i = m_Log.AddString(str);

 	ASSERT(i!=LB_ERR);

 CTime *t = new CTime(CTime::GetCurrentTime());

 	m_Log.SetItemData(i,(DWORD)(m_LogTimes[t]=t));

 	m_Log.SetCurSel(i);

 }

 

 void CPumpKINDlg::LogLine(UINT msgID)

 {

 CString tmp;

 	tmp.Format(msgID);

 	LogLine(tmp);

 }

 

 void CXferSocket::TurnSlashes(CString& fn,BOOL bBack)

 {

 int	s = fn.Find(bBack?'/':'\\');

 	while(s>=0){

 		fn.SetAt(s,bBack?'\\':'/');

 		s = fn.Find(bBack?'/':'\\');

 	}

 }

 

 CString CXferSocket::ApplyRoot(LPCTSTR fileName)

 {

 	ASSERT(m_Daddy);

 CString fn  = fileName;

 CString rv = m_Daddy->m_TFTPRoot;

 	if(rv.IsEmpty())

 		rv = ".";

 	if(rv[rv.GetLength()-1]!='\\')

 		rv+="\\";

 	while((!fn.IsEmpty()) && fn[0]=='\\')

 		fn=fn.Mid(1);

 	rv+=fn;

 	return rv;

 }

 

 void CPumpKINDlg::OnOptions() 

 {

 CPropertySheet cps(IDS_TITLE_OPTIONS,this);

 CPropsServer server;

 CPropsNetwork network;

 CPropsSounds sounds;

 CPropsACL acl;

 

 	server.m_RRQMode=m_RRQMode;

 	server.m_TFTPRoot=m_TFTPRoot;

 	server.m_TFTPSubdirs=m_bTFTPSubdirs;

 	server.m_WRQMode=m_WRQMode;

 	server.m_PromptTimeOut=m_PromptTimeOut;

 	server.m_LogFile=m_LogFile;

 

 	network.m_ListenPort=m_ListenPort;

+	network.m_ListenAddress=m_ListenAddress;

 	network.m_SpeakPort=m_SpeakPort;

 	network.m_TimeOut=m_TFTPTimeOut.GetTotalSeconds();

 	network.m_BlockSize=m_BlockSize;

 

 	sounds.m_Request = m_bnwRequest;

 	sounds.m_Success = m_bnwSuccess;

 	sounds.m_Abort = m_bnwAbort;

 

 	acl.m_rulist = m_aclRules;

 

 	cps.AddPage(&server);

 	cps.AddPage(&network);

 	cps.AddPage(&sounds);

 	cps.AddPage(&acl);

 	if(cps.DoModal()==IDOK){

 		m_RRQMode=server.m_RRQMode;

 		m_TFTPRoot=server.m_TFTPRoot;

 		m_bTFTPSubdirs=server.m_TFTPSubdirs;

 		m_WRQMode=server.m_WRQMode;

 		m_PromptTimeOut=server.m_PromptTimeOut;

 		m_LogFile=server.m_LogFile;

 

 		m_ListenPort=network.m_ListenPort;

+		m_ListenAddress=network.m_ListenAddress;

 		m_SpeakPort=network.m_SpeakPort;

 		m_TFTPTimeOut=CTimeSpan(network.m_TimeOut);

 		m_BlockSize=network.m_BlockSize;

 

 		m_bnwRequest = sounds.m_Request;

 		m_bnwSuccess = sounds.m_Success;

 		m_bnwAbort = sounds.m_Abort;

 

 		m_aclRules = acl.m_rulist;

 

 		m_lastlogerr.Empty();

 	}

 }

 

 BOOL CRRQSocket::ConfirmRequest()

 {

 CConfirmRRQDlg cd(NULL);

 	cd.m_Daddy=this;

 	cd.m_File=m_FileName;

 	cd.m_Host=inet_ntoa(m_Peer.sin_addr);

 	if(cd.DoModal()==IDOK)

 		return TRUE;

 	return FALSE;

 }

 

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

 	: CXferSocket(daddy,fileName,type,sin)

 {

 	state=stateNone;

 	m_ACK=0;

 	m_LastSlack=0;

 	m_bResume=FALSE;

 }

 

 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:

@@ -1686,491 +1688,491 @@ tftp	*p = tftp::Allocate(tftp::tftpWRQ::tftpSize(m_FileName,m_Type,&o));
 }

 

 UINT tftp::tftpRQ::tftpSize(LPCTSTR file,LPCTSTR type,tftp::tftpOptions* ops)

 {

 UINT rv = tftpHdrSize-tftpSlackSize+strlen(file)+1+strlen(type)+1;

 	if(ops){

 	tftpOptions& o = *ops;

 	POSITION p = o.GetStartPosition();

 		while(p){

 		CString n,v;

 			o.GetNextAssoc(p,n,v);

 			rv+=n.GetLength()+1+v.GetLength()+1;

 		}

 	}

 	return rv;

 }

 UINT tftp::tftpRRQ::tftpSize(LPCTSTR file,LPCTSTR type,tftp::tftpOptions* ops)

 {

 	return tftp::tftpRQ::tftpSize(file,type,ops);

 }

 UINT tftp::tftpWRQ::tftpSize(LPCTSTR file,LPCTSTR type,tftp::tftpOptions* ops)

 {

 	return tftp::tftpRQ::tftpSize(file,type,ops);

 }

 UINT tftp::tftpOACK::tftpSize(tftp::tftpOptions* ops)

 {

 UINT rv = tftpHdrSize-tftpSlackSize;

 	if(ops){

 	tftpOptions& o = *ops;

 	POSITION p = o.GetStartPosition();

 		while(p){

 		CString n,v;

 			o.GetNextAssoc(p,n,v);

 			rv+=n.GetLength()+1+v.GetLength()+1;

 		}

 	}

 	return rv;

 }

 void tftp::tftpRQ::Set(LPCTSTR file,LPCTSTR type,tftp::tftpOptions* ops)

 {

 	// MAY BE DANGEROUS!

 UINT ptr = 0;

 	strcpy((LPTSTR)&data[ptr],file); ptr+=strlen(file)+1;

 	strcpy((LPTSTR)&data[ptr],type); ptr+=strlen(type)+1;

 	if(ops){

 	tftpOptions& o = *ops;

 	POSITION p = o.GetStartPosition();

 		while(p){

 		CString n,v;

 			o.GetNextAssoc(p,n,v);

 			strcpy((LPTSTR)&data[ptr],(LPCTSTR)n); ptr+=n.GetLength()+1;

 			strcpy((LPTSTR)&data[ptr],(LPCTSTR)v); ptr+=v.GetLength()+1;

 		}

 	}

 }

 void tftp::tftpRRQ::Set(LPCTSTR file,LPCTSTR type,tftp::tftpOptions* ops)

 {

 	// MAY BE DANGEROUS!

 UINT ptr = 0;

 	strcpy((LPTSTR)&data[ptr],file); ptr+=strlen(file)+1;

 	strcpy((LPTSTR)&data[ptr],type); ptr+=strlen(type)+1;

 	if(ops){

 	tftpOptions& o = *ops;

 	POSITION p = o.GetStartPosition();

 		while(p){

 		CString n,v;

 			o.GetNextAssoc(p,n,v);

 			strcpy((LPTSTR)&data[ptr],(LPCTSTR)n); ptr+=n.GetLength()+1;

 			strcpy((LPTSTR)&data[ptr],(LPCTSTR)v); ptr+=v.GetLength()+1;

 		}

 	}

 }

 void tftp::tftpWRQ::Set(LPCTSTR file,LPCTSTR type,tftp::tftpOptions* ops)

 {

 	// MAY BE DANGEROUS!

 UINT ptr = 0;

 	strcpy((LPTSTR)&data[ptr],file); ptr+=strlen(file)+1;

 	strcpy((LPTSTR)&data[ptr],type); ptr+=strlen(type)+1;

 	if(ops){

 	tftpOptions& o = *ops;

 	POSITION p = o.GetStartPosition();

 		while(p){

 		CString n,v;

 			o.GetNextAssoc(p,n,v);

 			strcpy((LPTSTR)&data[ptr],(LPCTSTR)n); ptr+=n.GetLength()+1;

 			strcpy((LPTSTR)&data[ptr],(LPCTSTR)v); ptr+=v.GetLength()+1;

 		}

 	}

 }

 void tftp::tftpOACK::Set(tftpOptions* ops)

 {

 	ASSERT(ops);

 UINT ptr = 0;

 tftpOptions& o = *ops;

 POSITION p = o.GetStartPosition();

 	while(p){

 	CString n,v;

 		o.GetNextAssoc(p,n,v);

 		strcpy((LPTSTR)&data[ptr],(LPCTSTR)n); ptr+=n.GetLength()+1;

 		strcpy((LPTSTR)&data[ptr],(LPCTSTR)v); ptr+=v.GetLength()+1;

 	}

 }

 

 void CWRQSocket::OnResolved()

 {

 	CXferSocket::OnResolved();

 	OnHostKnown();

 }

 

 void CWRQSocket::OnHostKnown()

 {

 	ASSERT(m_Daddy);

 	m_Peer.sin_port=htons(m_Daddy->m_SpeakPort);

 tftp::tftpOptions o;

 CString v;

 	o[tftpoTSize]="0";

 	if(m__blkSize){

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

 		o[tftpoBSize]=v;

 	}

 	if(m__timeOut){

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

 		o[tftpoTOut]=v;

 	}

 tftp	*p = tftp::Allocate(tftp::tftpRRQ::tftpSize(m_FileName,m_Type,&o));

 	ASSERT(p);

 	p->SetOpcode(tftp::opRRQ);

 	p->data.m_RRQ.Set(m_FileName,m_Type,&o);

 	PostTFTP(p,TRUE);

 	state=stateInit;

 	UpdateList();

 }

 

 void CPumpKINDlg::OnClose() 

 {

 	OnTrayShowpumpkinwindow();

 }

 

 void CPumpKINDlg::OnTrayShowpumpkinwindow() 

 {

 	if(IsWindowVisible()){

 		m_bShown=FALSE;

 		ShowWindow(SW_HIDE);

 	}else{

 		m_bShown=TRUE;

 		ShowWindow(SW_SHOW);

 		SetForegroundWindow();

 		SetFocus();

 	}

 }

 

 void CPumpKINDlg::OnTrayExit() 

 {

 	OnExit();

 }

 

 void CPumpKINDlg::OnTrayAboutpumpkin() 

 {

 CAboutDlg dlgAbout;

 	dlgAbout.DoModal();

 }

 

 void CPumpKINDlg::OnTrayFetchfile() 

 {

 	OnGet();

 }

 

 void CPumpKINDlg::OnTrayHelp() 

 {

 	OnHelp();

 }

 

 void CPumpKINDlg::OnTrayOptions() 

 {

 	OnOptions();

 }

 

 void CPumpKINDlg::OnTraySendfile() 

 {

 	OnPut();

 }

 

 void CPumpKINDlg::LoadSettings()

 {

 CWinApp *app = AfxGetApp();

 	ASSERT(app);

 	m_bListen=app->GetProfileInt("TFTPSettings","Listen",m_bListen);

 	m_bnwRequest=app->GetProfileString("BellsNWhistles","Request",m_bnwRequest);

 	m_bnwSuccess=app->GetProfileString("BellsNWhistles","Success",m_bnwSuccess);

 	m_bnwAbort=app->GetProfileString("BellsNWhistles","Abort",m_bnwAbort);

 	m_bTFTPSubdirs=app->GetProfileInt("TFTPSettings","Subdirs",m_bTFTPSubdirs);

 	m_ListenPort=app->GetProfileInt("TFTPSettings","ListenPort",m_ListenPort);

+	m_ListenAddress=app->GetProfileString("TFTPSettings","ListenAddress",m_ListenAddress);

 	m_LogLength=app->GetProfileInt("UISettings","LogLength",m_LogLength);

 	m_PromptTimeOut=app->GetProfileInt("UISettings","PromptTimeout",m_PromptTimeOut);

 	m_RRQMode=app->GetProfileInt("TFTPSettings","RRQMode",m_RRQMode);

 	m_SpeakPort=app->GetProfileInt("TFTPSettings","SpeakPort",m_SpeakPort);

 	m_TFTPRoot=app->GetProfileString("TFTPSettings","TFTPRoot",m_TFTPRoot);

 	m_LogFile=app->GetProfileString("General","LogFile",m_LogFile);

 	m_TFTPTimeOut=CTimeSpan(app->GetProfileInt("TFTPSettings","TFTPTimeout",m_TFTPTimeOut.GetTotalSeconds()));

 	m_BlockSize=app->GetProfileInt("TFTPSettings","TFTPBlockSize",m_BlockSize);

 	m_RetryTimeOut=CTimeSpan(app->GetProfileInt("TFTPSettings","RetryTimeout",m_RetryTimeOut.GetTotalSeconds()));

 	m_WRQMode=app->GetProfileInt("TFTPSettings","WRQMode",m_WRQMode);

 	m_bShown=app->GetProfileInt("UISettings","Visble",m_bShown);

 	if(m_TFTPRoot.IsEmpty()){

 	DWORD dL = ::GetCurrentDirectory(0,NULL);

 		VERIFY(::GetCurrentDirectory(dL,m_TFTPRoot.GetBuffer(dL)));

 		m_TFTPRoot.ReleaseBuffer();

 	}

 	::SetCurrentDirectory(m_TFTPRoot);

 	m_aclRules.LoadProfile(app);

 }

 

 void CPumpKINDlg::SaveSettings()

 {

 CWinApp *app = AfxGetApp();

 	ASSERT(app);

 	app->WriteProfileInt("TFTPSettings","Listen",m_bListen);

 	app->WriteProfileString("BellsNWhistles","Request",m_bnwRequest);

 	app->WriteProfileString("BellsNWhistles","Success",m_bnwSuccess);

 	app->WriteProfileString("BellsNWhistles","Abort",m_bnwAbort);

 	app->WriteProfileInt("TFTPSettings","Subdirs",m_bTFTPSubdirs);

 	app->WriteProfileInt("TFTPSettings","ListenPort",m_ListenPort);

+	app->WriteProfileString("TFTPSettings","ListenAddress",m_ListenAddress);

 	app->WriteProfileInt("UISettings","LogLength",m_LogLength);

 	app->WriteProfileInt("UISettings","PromptTimeout",m_PromptTimeOut);

 	app->WriteProfileInt("TFTPSettings","RRQMode",m_RRQMode);

 	app->WriteProfileInt("TFTPSettings","SpeakPort",m_SpeakPort);

 	app->WriteProfileString("TFTPSettings","TFTPRoot",m_TFTPRoot);

 	app->WriteProfileString("General","LogFile",m_LogFile);

 	app->WriteProfileInt("TFTPSettings","TFTPTimeout",m_TFTPTimeOut.GetTotalSeconds());

 	app->WriteProfileInt("TFTPSettings","TFTPBlockSize",m_BlockSize);

 	app->WriteProfileInt("TFTPSettings","RetryTimeout",m_RetryTimeOut.GetTotalSeconds());

 	app->WriteProfileInt("TFTPSettings","WRQMode",m_WRQMode);

 	app->WriteProfileInt("UISettings","Visble",m_bShown);

 	m_aclRules.SaveProfile(app);

 }

 

 void CPumpKINDlg::OnWindowPosChanging(WINDOWPOS FAR* lpwndpos) 

 {

 	CDialog::OnWindowPosChanging(lpwndpos);

 	if(!m_bExiting){

 		if(m_bShown){

 			lpwndpos->flags&=~SWP_HIDEWINDOW;

 			lpwndpos->flags|=SWP_SHOWWINDOW;

 		}else{

 			lpwndpos->flags&=~SWP_SHOWWINDOW;

 			lpwndpos->flags|=SWP_HIDEWINDOW;

 			if(::GetForegroundWindow()==m_hWnd && (m_Trayer &&  !m_Trayer->m_inMenu))

 				GetDesktopWindow()->SetForegroundWindow();

 		}

 	}

 }

 

 CString CXferSocket::ApplyRootGently(LPCTSTR fn)

 {

 CString f = fn;

 CString rv = f;

 	if((!f.IsEmpty()) && f[0]!='\\' && f.Find(":")<0 && f.Find("\\")<0)

 		rv = ApplyRoot(f);

 	return rv;

 }

 

 BOOL CXferSocket::CheckBadRelativeness(LPCTSTR file)

 {

 CString tmp = file;

 	if(tmp.IsEmpty())

 		return FALSE;

 	if(tmp.Find("..")>=0)

 		return TRUE;

 	if(tmp.Find(":")>=0)

 		return TRUE;

 	if((!m_Daddy->m_bTFTPSubdirs) && m_FileName.Find('\\')>=0)

 		return TRUE;

 	return FALSE;

 }

 

 void CAboutDlg::OnKlevernet() 

 {

 CString url;

 	url.LoadString(IDS_KLEVERNET_URL);

 	ShellExecute(::GetDesktopWindow(),"open",url,NULL,NULL,SW_SHOWMAXIMIZED);

 }

 

 BOOL CPumpKINDlg::PreTranslateMessage(MSG* pMsg)

 {

 	// CG: The following block was added by the ToolTips component.

 	{

 		// Let the ToolTip process this message.

 		m_tooltip.RelayEvent(pMsg);

 

 		return CDialog::PreTranslateMessage(pMsg);

 	}

 }

 

 void CPumpKINDlg::OnSelchangeLog() 

 {

 int sel = m_Log.GetCurSel();

 	if(sel==LB_ERR){

 		TRACE0("Error retrieving selection\n");

 	}else{

 	CTime *t = (CTime*)m_Log.GetItemData(sel);

 		ASSERT(t);

 		m_tooltip.UpdateTipText(t->Format(IDS_LOGTIMEFORMAT),&m_Log);

 	}

 }

 

 void CPumpKINDlg::OnTrayOpenfilesfolder() 

 {

 	ShellExecute(::GetDesktopWindow(),NULL,m_TFTPRoot,NULL,NULL,SW_SHOWDEFAULT);

 }

 

 void CPumpKINDlg::OnDropFiles(HDROP hDropInfo) 

 {

 UINT files = ::DragQueryFile(hDropInfo,0xFFFFFFFF,NULL,0);

 	ASSERT(files);

 	for(UINT file=0;file<files;file++){

 	CString theFile;

 	UINT fileNameLength = ::DragQueryFile(hDropInfo,file,NULL,0);

 		ASSERT(fileNameLength);

 		VERIFY(::DragQueryFile(hDropInfo,file,theFile.GetBuffer(fileNameLength+5),fileNameLength+4)<=fileNameLength);

 		theFile.ReleaseBuffer();

 		// Send it over!

 	CRequestDlg crd(NULL);

 		crd.m_Drop=TRUE;

 		crd.m_Put=TRUE;

 		crd.m_BSize=m_BlockSize;

 		crd.m_LocalFile=theFile;

 		if(crd.DoModal()==IDOK){

 		CRRQSocket *socket = new CRRQSocket(this,crd.m_RemoteFile,crd.m_Type,NULL);

 			if(crd.m_BSize)

 				socket->m__blkSize=crd.m_BSize;

 			if(!socket->Create(crd.m_LocalFile,crd.m_Host))

 				socket->Destroy();

 		}

 	}

 	::DragFinish(hDropInfo);

 }

 

 void CPumpKINDlg::OnCancel() 

 {

 	OnClose();

 }

 

 CPumpKINDlg::~CPumpKINDlg()

 {

 	delete m_Trayer;

 	delete m_Retrier;

 }

 

 void CXferSocket::OnRetry()

 {

 	if(!m_Retry){

 		TRACE("Retrying unretriable..\n");

 		return;

 	}

 	TRACE0("Retrying..\n");

 	m_bRetry=TRUE;

 	PostTFTP(tftp::Copy(m_Retry));

 	m_bRetry=FALSE;

 }

 

 tftp* tftp::Copy(tftp *src)

 {

 	ASSERT(src);

 	ASSERT(src->length);

 tftp* rv = Allocate(src->length);

 	ASSERT(rv);

 	memmove(rv,src,tftpSlackSize+src->length);

 	return rv;

 }

 

 void CXferSocket::SetTry(tftp *p)

 {

 	if(m_Retry)

 		delete m_Retry;

 	m_Retry=p?tftp::Copy(p):NULL;

 }

 

 void CPumpKINDlg::OnHelp() 

 {

 	AfxGetApp()->WinHelp(0,HELP_FINDER);	

 }

 

 BOOL CListenSocket::SetListen(BOOL b) {

 	ASSERT(m_Daddy);

-	if(b==m_bListen)

-		return TRUE;

-	if(b) {

-		if(!Create(m_Daddy->m_ListenPort,SOCK_DGRAM))

-			return FALSE;

-		return m_bListen=TRUE;

-	}else{

+	if(b==m_bListen) return TRUE;

+	if(!b) {

 		Close(); m_bListen=FALSE;

 		return TRUE;

 	}

+	return m_bListen=Create(m_Daddy->m_ListenPort,SOCK_DGRAM,

+		FD_READ|FD_WRITE|FD_OOB|FD_ACCEPT|FD_CONNECT|FD_CLOSE,

+		m_Daddy->m_ListenAddress.IsEmpty()?NULL:(LPCTSTR)m_Daddy->m_ListenAddress);

 }

 

 void CPumpKINDlg::OnListening() 

 {

 	if(!m_Listener.SetListen(m_ListenCtl.GetCheck()==1)) {

 		TRACE0("Failed to create socket\n");

 		AfxMessageBox(IDS_BOX_CANTBIND,MB_OK|MB_ICONEXCLAMATION);

 	}

 	m_ListenCtl.SetCheck(m_Listener.m_bListen?1:0);

 	m_bListen=m_Listener.m_bListen;

 }

 

 void CPumpKINDlg::OnTrayListen() 

 {

 	if(!m_Listener.SetListen(!m_Listener.m_bListen)) {

 		TRACE0("Failed to create socket\n");

 		AfxMessageBox(IDS_BOX_CANTBIND,MB_OK|MB_ICONEXCLAMATION);

 	}

 	m_ListenCtl.SetCheck(m_Listener.m_bListen?1:0);

 	m_bListen=m_Listener.m_bListen;

 }

 

 void CPumpKINDlg::LogLine(LPCTSTR str)

 {

 	LogLineToScreen(str);

 	if(!m_LogFile.IsEmpty()) {

 		if(!Klever::LogRecord((LPCTSTR)m_LogFile,str)) {

 			if(m_lastlogerr!=m_LogFile) {

 				CString tmp;

 				tmp.Format(IDS_LOG_LOGERROR,m_LogFile);

 				LogLineToScreen(tmp);

 				m_lastlogerr=m_LogFile;

 			}

 		}

 	}

 }

 

 void CPumpKINDlg::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) 

 {

 	CDialog::OnGetMinMaxInfo(lpMMI);

 	if(m_MinSize.cx>0 && m_MinSize.cy>0){

 		lpMMI->ptMinTrackSize.x = m_MinSize.cx;

 		lpMMI->ptMinTrackSize.y = m_MinSize.cy;

 	}

 }

 

 void CPumpKINDlg::OnSize(UINT nType, int cx, int cy) 

 {

 	CDialog::OnSize(nType, cx, cy);

 	if(nType==SIZE_RESTORED)

 		RecalcLayout(cx,cy);

 }

 

 void CPumpKINDlg::RecalcLayout(int,int)

 {

 	CRect wrc;

 	GetClientRect(&wrc);

 	AdjustButton(m_GetCtl,wrc);

 	AdjustButton(m_PutCtl,wrc);

 	AdjustButton(m_AbortCtl,wrc);

 	AdjustButton(m_HelpCtl,wrc);

 	AdjustButton(m_ExitCtl,wrc);

 	AdjustButton(m_OptionsCtl,wrc);

 	CRect brc;

 	m_List.GetWindowRect(&brc); ScreenToClient(&brc);

 	m_List.SetWindowPos(

 		0,

 		brc.left, brc.top,

 		wrc.right-m_rightGapList-brc.left, brc.bottom-brc.top,

 		SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER|SWP_NOCOPYBITS );

 	m_Log.GetWindowRect(&brc); ScreenToClient(&brc);

 	m_Log.SetWindowPos(

 		0,

 		brc.left, brc.top,

 		wrc.right-m_rightGapButtons-brc.left, wrc.bottom-m_bottomGapLog-brc.top,

 		SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER|SWP_NOCOPYBITS );

 	m_ListenCtl.GetWindowRect(&brc); ScreenToClient(&brc);

 	m_ListenCtl.SetWindowPos(

 		0,

 		wrc.right-brc.Width()-m_rightGapButtons, wrc.bottom-brc.Height()-m_bottomGapListen,

 		0,0,

 		SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER|SWP_NOCOPYBITS );

 	int i = m_Log.GetCount();

 	if(i!=LB_ERR)

 		m_Log.SetCurSel(i-1);

 }

 

 void CPumpKINDlg::AdjustButton(CWnd& w,CRect& wrc)

 {

 	CRect brc;

 	w.GetWindowRect(&brc); ScreenToClient(&brc);

 	w.SetWindowPos(

 		0,

 		wrc.right-brc.Width()-m_rightGapButtons, brc.top,

 		0, 0,

 		SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER|SWP_NOCOPYBITS );

 }

diff --git a/PumpKINDlg.h b/PumpKINDlg.h
index 23c2657..9077292 100644..100755
--- a/PumpKINDlg.h
+++ b/PumpKINDlg.h
@@ -242,260 +242,261 @@ public:
 			m_pData[i].SaveProfile(app,i);

 		app->WriteProfileInt("ACL","rules",s);

 	}

 	void LoadProfile(CWinApp* app) {

 		RemoveAll();

 		int s=app->GetProfileInt("ACL","rules",0);

 		for(int i=0;i<s;++i) {

 			acl_rule r;

 			r.LoadProfile(app,i);

 			if(r.IsValid())

 				Add(r);

 		}

 	}

 };

 

 class CPumpKINDlg;

 class CListenSocket : public CAsyncSocket	{

 public:

 	CPumpKINDlg* m_Daddy;

 	BOOL m_bListen;

 

 	CListenSocket()

 		: m_bListen(FALSE), m_Daddy(0) { }

 

 	BOOL SetListen(BOOL b);

 	virtual void OnReceive(int nErrorCode);

 };

 

 typedef	CList<tftp*,tftp*>	CTFTPList;

 class CResolver;

 class CXferSocket : public CAsyncSocket	{

 public:

 	UINT m__timeOut;

 	UINT m__blkSize;

 	tftp::tftpOptions m_Options;

 	LONG m_xferSize;

 	UINT m_timeOut;

 	UINT m_blkSize;

 	BOOL m_bRetry;

 	void SetTry(tftp *p=NULL);

 	tftp* m_Retry;

 	void OnRetry();

 	BOOL CheckBadRelativeness(LPCTSTR file);

 	CString ApplyRootGently(LPCTSTR fn);

 	CString m_HostName;

 	virtual void OnResolved();

 	virtual void OnFailedToResolve();

 	CResolver *m_wndResolver;

 	BYTE m_ResolveBuff[MAXGETHOSTSTRUCT];

 	virtual void Abort();

 	void ResetTimeout();

 	enum	{

 		stateNone, stateDeny, stateInit, stateOACK, stateXfer, stateFinish, stateClosing

 	};

 	int state;

 	void Deny(UINT errCode,UINT errID);

 	void Deny(CFileException* e);

 	CString ApplyRoot(LPCTSTR fileName);

 	void TurnSlashes(CString& fn,BOOL bBack=TRUE);

 	virtual void Destroy(BOOL success=TRUE);

 	void PostError(CFileException* e);

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

 	UINT m_LastSlack;

 	ULONG GetACK();

 	void DoXfer();

 	UINT m_ACK;

 	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)

 };

 

 typedef	CMap<SOCKET,SOCKET,CXferSocket*,CXferSocket*>	CTIDMap;

 typedef CMap<CTime*,CTime*,CTime*,CTime*> CTimeMap;

 

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

 // CPumpKINDlg dialog

 

 class CTrayer;

 class CRetrier;

 class CPumpKINDlg : public CDialog

 {

 // Construction

 public:

 	void AdjustButton(CWnd& w,CRect& wrc);

 	void RecalcLayout(int,int);

 	CSize m_MinSize;

 	UINT m_bottomGapLog;

 	UINT m_bottomGapListen;

 	UINT m_rightGapList;

 	UINT m_rightGapButtons;

 	CString m_lastlogerr;

 	void LogLine(LPCTSTR str);

 	CString m_LogFile;

 	BOOL m_bListen;

 	acl_rules_t m_aclRules;

 	CString m_bnwRequest;

 	CString m_bnwSuccess;

 	CString m_bnwAbort;

 	CBellsNWhistles m_bnw;

 	CTrayer *m_Trayer;

 	CTimeSpan m_RetryTimeOut;

 	virtual ~CPumpKINDlg();

 	CRetrier* m_Retrier;

 	virtual BOOL PreTranslateMessage(MSG* pMsg);

 	BOOL m_bShown;

 	BOOL m_bExiting;

 	void SaveSettings();

 	void LoadSettings();

 	void SetupButtons();

 	BITMAP m_bitmapBack;

 	CBitmap m_bmpBack;

 	UINT m_PromptTimeOut;

 	UINT m_SpeakPort;

 	void LogLine(UINT msgID);

 	CTimeMap m_LogTimes;

 	void LogLineToFile(LPCTSTR str);

 	void LogLineToScreen(LPCTSTR str);

 	int m_LogLength;

 	enum	{

 		subitemFile=0, subitemType, subitemPeer, subitemBytes, subitemTSize

 	};

 	int m_iWRQ;

 	int m_iRRQ;

 	CImageList m_Images;

 	CTIDMap m_Xfers;

 	CTimeSpan m_TFTPTimeOut;

 	enum	{

 		rrqGiveAll=acl_rule::rrqGrant,

 		rrqAlwaysConfirm=acl_rule::rrqPrompt,

 		rrqDenyAll=acl_rule::rrqDeny,

 		rrqFallback=acl_rule::rrqNone,

 		rrqGrant=rrqGiveAll, rrqDeny=rrqDenyAll, rrqPrompt=rrqAlwaysConfirm

 	};

 	enum	{

 		wrqTakeAll=acl_rule::wrqGrant,

 		wrqConfirmIfExists=acl_rule::wrqPromptIfExists,

 		wrqAlwaysConfirm=acl_rule::wrqPrompt,

 		wrqDenyAll=acl_rule::wrqDeny,

 		wrqFallback=acl_rule::wrqNone,

 		wrqGrant=wrqTakeAll,wrqDeny=wrqDenyAll, wrqPrompt=wrqAlwaysConfirm

 	};

 	UINT m_RRQMode;

 	UINT m_WRQMode;

 	BOOL m_bTFTPSubdirs;

 	CString m_TFTPRoot;

 	UINT m_ListenPort;

+	CString m_ListenAddress;

 	UINT m_BlockSize;

 	CListenSocket m_Listener;

 	CPumpKINDlg(CWnd* pParent = NULL);	// standard constructor

 

 // Dialog Data

 	//{{AFX_DATA(CPumpKINDlg)

 	enum { IDD = IDD_PUMPKIN_DIALOG };

 	CButton	m_HelpCtl;

 	CButton	m_PutCtl;

 	CButton	m_GetCtl;

 	CButton	m_ExitCtl;

 	CButton	m_ListenCtl;

 	CButton	m_AbortCtl;

 	CButton	m_OptionsCtl;

 	CListBox	m_Log;

 	CListCtrl	m_List;

 	//}}AFX_DATA

 

 	// ClassWizard generated virtual function overrides

 	//{{AFX_VIRTUAL(CPumpKINDlg)

 	protected:

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

 	//}}AFX_VIRTUAL

 

 // Implementation

 protected:

 	CToolTipCtrl m_tooltip;

 	HICON m_hIcon;

 

 	// Generated message map functions

 	//{{AFX_MSG(CPumpKINDlg)

 	virtual BOOL OnInitDialog();

 	afx_msg void OnSysCommand(UINT nID, LPARAM lParam);

 	afx_msg void OnDestroy();

 	afx_msg void OnPaint();

 	afx_msg HCURSOR OnQueryDragIcon();

 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);

 	afx_msg void OnOptions();

 	afx_msg void OnTimer(UINT nIDEvent);

 	afx_msg void OnExit();

 	afx_msg void OnPut();

 	afx_msg void OnGet();

 	afx_msg void OnDeleteallitemsConnections(NMHDR* pNMHDR, LRESULT* pResult);

 	afx_msg void OnDeleteitemConnections(NMHDR* pNMHDR, LRESULT* pResult);

 	afx_msg void OnInsertitemConnections(NMHDR* pNMHDR, LRESULT* pResult);

 	afx_msg void OnItemchangedConnections(NMHDR* pNMHDR, LRESULT* pResult);

 	afx_msg void OnAbort();

 	afx_msg void OnClose();

 	afx_msg void OnTrayShowpumpkinwindow();

 	afx_msg void OnTrayListen();

 	afx_msg void OnTrayExit();

 	afx_msg void OnTrayAboutpumpkin();

 	afx_msg void OnTrayFetchfile();

 	afx_msg void OnTrayHelp();

 	afx_msg void OnTrayOptions();

 	afx_msg void OnTraySendfile();

 	afx_msg void OnWindowPosChanging(WINDOWPOS FAR* lpwndpos);

 	afx_msg void OnSelchangeLog();

 	afx_msg void OnTrayOpenfilesfolder();

 	afx_msg void OnDropFiles(HDROP hDropInfo);

 	virtual void OnCancel();

 	afx_msg void OnHelp();

 	afx_msg void OnListening();

 	afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);

 	afx_msg void OnSize(UINT nType, int cx, int cy);

 	//}}AFX_MSG

 	DECLARE_MESSAGE_MAP()

 };

diff --git a/help/pumpkin.rtf b/help/pumpkin.rtf
index 8358490..39fc02a 100644
--- a/help/pumpkin.rtf
+++ b/help/pumpkin.rtf
@@ -1,145 +1,148 @@
 {\rtf1\ansi

 @{\footnote

 THIS FILE WAS AUTOMATICALLY GENERATED FROM XML DOCUMENT.

 DO NOT MODIFY THIS FILE DIRECTLY. EDIT XML DOCUMENT INSTEAD

 }

 {\fonttbl{\f0\froman Times New Roman;}{\f1\fswiss Arial;}{\f3\froman Symbol;}}{\colortbl;

    \red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;

    \red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;

    \red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;

    \red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}

   

 \pard\plain\keepn

 #{\footnote About}

 ${\footnote About PumpKIN}

 K{\footnote about}

 { \f1\fs18\b\sb120 About {\b PumpKIN}}

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b PumpKIN} is a program designed to send and receive files over the net while having {\uldb {\b T42}}{\v %!ExecFile("http://kin.klever.net/T42/")} or {\b\cf6 Wintalk} session running using {\i TFTP} ({\uldb {\b RFC1350}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1350.txt")}) protocol. It includes full-functional {\i TFTP} server/client so it may be useful for maintaining {\uldb CISCO}{\v %!ExecFile("http://www.cisco.com/")} routers and other network equipment.

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}}

+\par\sa120\sb120\qj \f1\fs18\sb120 {\b PumpKIN} is a program designed to send and receive files over the net while having {\uldb {\b T42}}{\v %!ExecFile("http://kin.klever.net/T42/")} or {\b\cf6 Wintalk} session running using {\i TFTP} ({\uldb {\b RFC1350}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1350.txt")}) protocol. It includes full-functional {\i TFTP} server/client so it may be useful for maintaining {\uldb CISCO}{\v %!ExecFile("http://www.cisco.com/")} routers and other network equipment.
+\par\sa120\sb120\qj \f1\fs18\sb120 
+\par\sa120\sb120\qj \f1\fs18\sb120 {\b {\i Enjoy!}}
 {

-\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1997-2006 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}

+\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1997-2011 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}
 \par\qj\sb120\sa120Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

 \par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

 \par \sa360 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 }

 \page

 

 \pard\plain

 #{\footnote News}

 ${\footnote What's New}

+\par\pard\plain\f1\fs24\qc\cf2\b 2.7.2.1 - Apr 27th, 2011
+\par\pard\plain\fi0\li0\f1\fs18 \bullet  Fixed a minor bug that lead to misdiagnosis of the packet from unexpected source
 \par\pard\plain\f1\fs24\qc\cf2\b 2.7.2 - October 18th, 2006

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Added rejecting of too large file requests with explicit error message about the block size

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  A bit more elaborate logging

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Not closing receive socket until the last ACK receved now

 \par\pard\plain\f1\fs24\qc\cf2\b 2.7.1 - March 13th, 2006

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Bugfix release

 \par\pard\plain\f1\fs24\qc\cf2\b 2.7 - February 28th, 2006

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Access lists based on request IP address and TFTP opcode for automating access policy

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Possibility to start/stop TFTP server, while keeping client functionality intact

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Logging to file

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Resizable main window

 \par\pard\plain\f1\fs24\qc\cf2\b 2.6 - August 6th, 2005

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  more robust solution to the backslash/slash dilemma

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  A bit more elaborate error reporting

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Fixed uninstall procedure so that it works on XP

 \par\pard\plain\f1\fs24\qc\cf2\b 2.5 - July 11th, 2004

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Change of {\uldb license}{\v About} and opening the source.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Minor cosmetic changes

 \par\pard\plain\f1\fs24\qc\cf2\b 2.0 - June 13th, 1998

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Sounds customization. Now you can customize {\b PumpKIN} bells and whistles or turn them off completely.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Previous version of {\b PumpKIN} had a bug causing it to misbehave when you're requesting file from remote {\i tftp} server using {\b IP Address} (as opposed to {\b hostname}).

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Typo causing {\b PumpKIN} to log outgoing request in reverse (i.e. {\i Requesting 'hostname' from 'filename'}) fixed.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Something else that you may not notice and I can not remember.

 \par\pard\plain\f1\fs24\qc\cf2\b 1.5 - February 12th, 1998

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Transfer resumes. No checking on file contents is done, so it's up to you to decide whether you want to start transmission from the beginning or resume unfinished transfer.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Support for {\b block size}, {\b trasnfer size} and {\b transfer timeout} options as described in {\uldb {\b RFC1782}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1782.txt")}, {\uldb {\b RFC1783}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1783.txt")} and {\uldb {\b RFC1784}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1784.txt")}. I'm not sure if there are any other {\i TFTP} implementations supporting this, but at least it makes sense if you use {\b PumpKIN} on both ends.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  New Install program

 \page

 

 \pard\plain\keepn

 #{\footnote Using}

 ${\footnote Using PumpKIN}

 { \f1\fs18\b\sb120 Using {\b PumpKIN}}

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 This is a simple program for file exchange between two parties. It allows you to send files over the network to your party while having a {\uldb {\b T42}}{\v %!ExecFile("http://kin.klever.net/T42/")} or {\b\cf6 Wintalk} conversation. It uses open sessions to determine IP address of your party. Also you may use it as a {\i TFTP} client/server by itself. To get/put files from/to {\i TFTP} server you need to enter host name/IP address manually in the {\uldb Request Dialog}{\v Request}.

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 To Abort transfer(s) currently in progress - select transfer(s) you want to terminate in the list and click {\b Abort xfer} button.

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 You may want to hide {\b PumpKIN} window and leave it as a tray icon only. Just click the \{bmct pumpkin.bmp\} icon in the tray or simply close the window.

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 Use {\uldb Options}{\v Options} button to set {\b PumpKIN} options.

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 You can start and stop {\b PumpKIN}'s {\i TFTP} server by checking and unchecking the {\b Server is running} checkbox in the lower right corner of main {\b PumpKIN} window.

+\par\sa120\sb120\qj \f1\fs18\sb120 This is a simple program for file exchange between two parties. It allows you to send files over the network to your party while having a {\uldb {\b T42}}{\v %!ExecFile("http://kin.klever.net/T42/")} or {\b\cf6 Wintalk} conversation. It uses open sessions to determine IP address of your party. Also you may use it as a {\i TFTP} client/server by itself. To get/put files from/to {\i TFTP} server you need to enter host name/IP address manually in the {\uldb Request Dialog}{\v Request}.
+\par\sa120\sb120\qj \f1\fs18\sb120 To Abort transfer(s) currently in progress - select transfer(s) you want to terminate in the list and click {\b Abort xfer} button.
+\par\sa120\sb120\qj \f1\fs18\sb120 You may want to hide {\b PumpKIN} window and leave it as a tray icon only. Just click the \{bmct pumpkin.bmp\} icon in the tray or simply close the window.
+\par\sa120\sb120\qj \f1\fs18\sb120 Use {\uldb Options}{\v Options} button to set {\b PumpKIN} options.
+\par\sa120\sb120\qj \f1\fs18\sb120 You can start and stop {\b PumpKIN}'s {\i TFTP} server by checking and unchecking the {\b Server is running} checkbox in the lower right corner of main {\b PumpKIN} window.
 \page

 

 \pard\plain\keepn

 #{\footnote ConfirmRRQ}

 ${\footnote Confirm Read Request Dialog}

 { \f1\fs18\b\sb120 Confirm Read Request Dialog}

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 When the file is requested from your {\i TFTP} server you may choose to {\b Grant Access} to this file or to {\b Deny Access}. If you hesitate to answer for {\uldb {\b Confirmation timeout}}{\v ConfirmationTimeout} ({\i default - 30 seconds}) {\b PumpKIN} defaults to denial of all requests.

+\par\sa120\sb120\qj \f1\fs18\sb120 When the file is requested from your {\i TFTP} server you may choose to {\b Grant Access} to this file or to {\b Deny Access}. If you hesitate to answer for {\uldb {\b Confirmation timeout}}{\v ConfirmationTimeout} ({\i default - 30 seconds}) {\b PumpKIN} defaults to denial of all requests.
 \page

 

 \pard\plain\keepn

 #{\footnote ConfirmWRQ}

 ${\footnote Confirm Write Request Dialog}

 { \f1\fs18\b\sb120 Confirm Write Request Dialog}

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 Whenever your party sends you a file you have always a choice to accept it or not. You can also save the file under a different name by choosing the {\b Rename} option. If you already have file with such name you may chose to {\b resume} transfer. No checking on file contents is done. This option may or may not work depending on remote implementation of protocol. It does work if you use {\b PumpKIN} on both ends. If you are still unsure for {\uldb {\b Confirmation timeout}}{\v ConfirmationTimeOut} ({\i default - 30 seconds}) {\b PumpKIN} will make safe decision for you (deny).

+\par\sa120\sb120\qj \f1\fs18\sb120 Whenever your party sends you a file you have always a choice to accept it or not. You can also save the file under a different name by choosing the {\b Rename} option. If you already have file with such name you may chose to {\b resume} transfer. No checking on file contents is done. This option may or may not work depending on remote implementation of protocol. It does work if you use {\b PumpKIN} on both ends. If you are still unsure for {\uldb {\b Confirmation timeout}}{\v ConfirmationTimeOut} ({\i default - 30 seconds}) {\b PumpKIN} will make safe decision for you (deny).
 \page

 

 \pard\plain\keepn

 #{\footnote Request}

 ${\footnote Request Dialog}

 { \f1\fs18\b\sb120 Request Dialog}

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 Request dialog is aimed to let you form read or write request. You may set the following options:\pard

+\par\sa120\sb120\qj \f1\fs18\sb120 Request dialog is aimed to let you form read or write request. You may set the following options:\pard
 \par \fi0\li0 \bullet   {\b Local File} - You can change the name of the file you're sending (or destination in case you're receiving) right here. You may also use {\b Browse} button to select the file.

 \par \fi0\li0 \bullet   {\b Remote File} Specifies the name of file on the remote host you're requesting (in case of read request) or the name of file you want your file to appear as (in case of write request).

 \par \fi0\li0 \bullet   {\b Remote Host} is your party's host or {\i TFTP} server you're requesting file from/sending file to. To refresh the list of your talk windows use {\b REFRESH} button.

 \par \fi0\li0 \bullet   {\b Type} is the type of transfer as defined in {\uldb {\b RFC1350}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1350.txt")}. Doesn't mean much, really. Defined types are '{\i octet}' or '{\i netascii}'. Default is '{\i octet}'.

 \par \fi0\li0 \bullet   {\b Block Size} - Use this block size if remote is {\uldb {\b RFC1783}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1783.txt")}-compliant. If remote doesn't support this option {\b PumpKIN} will fallback to 512 bytes per block.\pard

 \page

 

 \pard\plain\keepn

 #{\footnote Options}

 ${\footnote Options}

 { \f1\fs18\b\sb120 Options}

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b PumpKIN} options property sheet consists of two tabs. For more information see {\uldb {\b Network}}{\v NetworkOptions} and {\b Server} options.

+\par\sa120\sb120\qj \f1\fs18\sb120 {\b PumpKIN} options property sheet consists of two tabs. For more information see {\uldb {\b Network}}{\v NetworkOptions} and {\b Server} options.
 \page

 

 \pard\plain\keepn

 #{\footnote NetworkOptions}

 ${\footnote Network Options}

 { \f1\fs18\b\sb120 Network Options}\pard

 \par \fi0\li0 \bullet   {\b UDP Ports}\pard

 \par \fi0\li0 \bullet   {\b Listen for incoming connections on port} - specifies the port we're listening to. The default as defined in {\uldb {\b RFC1350}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1350.txt")} is 69.

+\par \fi0\li0 \bullet   {\b ip address} - ip address to listen to.
 \par \fi0\li0 \bullet   {\b Send outgoing requests to port} - specifies the port we're going to send all requests to.\pard

 \par \fi0\li0 \bullet   {\b Default Connection timeout} - if there's no activity for specified time, transfer is considered to be dead and terminated. {\b PumpKIN} tries to propagate this value to remote as described in {\uldb {\b RFC1782}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1782.txt")} and {\uldb {\b RFC1784}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1784.txt")} if possible.

 \par \fi0\li0 \bullet   {\b Default Block Size} - {\b PumpKIN} tries to negotiate block size with remote using this value unless specified explicitly in request. If remote doesn't support {\uldb {\b RFC1782}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1782.txt")} and {\uldb {\b RFC1783}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1783.txt")}{\b PumpKIN} falls back to 512 bytes per block.\pard

 \page

 

 \pard\plain\keepn

 #{\footnote ServerOptions}

 ${\footnote Server Options}

 { \f1\fs18\b\sb120 Server Options}\pard

 \par \fi0\li0 \bullet   {\b TFTP Filesystem root} - Specifies the location of files you're transmitting or where to start looking for them from. Defaults to the directory you start {\b PumpKIN} for the first time from.

 \par \fi0\li0 \bullet   {\b Allow access to subdirectories} - specifies whether you want allow access to the whole subtree of {\b TFTP Root} or only to the directory itself.

 \par \fi0\li0 \bullet   {\b Read Request Behavior} - You may choose to automatically agree to give all files requested, to be prompted to confirm these operations, or to deny all requests as if you're not even here.

 \par \fi0\li0 \bullet   {\b Write Request Behavior} - You may chose to {\b take all files} ({\i not recommended}), to {\b prompt only if file exists already}, {\b Always prompt} or {\b Deny all requests}.

 \par \fi0\li0 \bullet   {#{\footnote ConfirmationTimeOut}}{\b Confirmation timeout} - this is the time {\b PumpKIN} will wait for you to accept or deny request before it will give up and take default action which is always deny.

 \par \fi0\li0 \bullet   {\b Log file} - If you want to enable logging to file, set the destination file here.\pard

 \page

 

 \pard\plain\keepn

 #{\footnote SoundsOptions}

 ${\footnote Sounds Options}

 { \f1\fs18\b\sb120 Sounds}

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 You can customize {\b PumpKIN} sounds notifications here. There are three customizable sounds defined - {\b Incoming request}, which notifies you about incoming request prompt if you're set to be prompted whenever incoming request occurs. {\b xfer Aborted} - which happens to sound every time transfer is interrupted for whatever reason - time out, explicit kill, denied access, etc. {\b xfer Finished} means that your file was successfully transmitted.

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 You can select any {\b .wav} file or one of the predefined sounds from the dropdown list.

+\par\sa120\sb120\qj \f1\fs18\sb120 You can customize {\b PumpKIN} sounds notifications here. There are three customizable sounds defined - {\b Incoming request}, which notifies you about incoming request prompt if you're set to be prompted whenever incoming request occurs. {\b xfer Aborted} - which happens to sound every time transfer is interrupted for whatever reason - time out, explicit kill, denied access, etc. {\b xfer Finished} means that your file was successfully transmitted.
+\par\sa120\sb120\qj \f1\fs18\sb120 You can select any {\b .wav} file or one of the predefined sounds from the dropdown list.
 \page

 

 \pard\plain\keepn

 #{\footnote ACL}

 ${\footnote Access Lists}

 { \f1\fs18\b\sb120 Access Lists}

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 You can slightly automate your access policies by setting up read/write request behavior for different incoming requests.

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 The rule consists of {\b request type}, source network ({\b ip} and {\b netmask}) and {\b action} to take (see also {\uldb Server Options}{\v ServerOptions}).

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 When {\b PumpKIN} receives request it goes through the list of rules and bases its decision on the first matching rule. To rearrange order of rules, select the rule you wish to move and use up and down arrows buttons on the right. To remove rule, use the cross button.

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 To add a new rule fill in the information about {\b request type}, source {\b address} and {\b netmask} and desired action. Then click on the 'Add new rule' button.

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 If you wish to amend the rule, select it in the rules list, change parameters below and click the 'Replace rule' button.

+\par\sa120\sb120\qj \f1\fs18\sb120 You can slightly automate your access policies by setting up read/write request behavior for different incoming requests.
+\par\sa120\sb120\qj \f1\fs18\sb120 The rule consists of {\b request type}, source network ({\b ip} and {\b netmask}) and {\b action} to take (see also {\uldb Server Options}{\v ServerOptions}).
+\par\sa120\sb120\qj \f1\fs18\sb120 When {\b PumpKIN} receives request it goes through the list of rules and bases its decision on the first matching rule. To rearrange order of rules, select the rule you wish to move and use up and down arrows buttons on the right. To remove rule, use the cross button.
+\par\sa120\sb120\qj \f1\fs18\sb120 To add a new rule fill in the information about {\b request type}, source {\b address} and {\b netmask} and desired action. Then click on the 'Add new rule' button.
+\par\sa120\sb120\qj \f1\fs18\sb120 If you wish to amend the rule, select it in the rules list, change parameters below and click the 'Replace rule' button.
 \page

 }
\ No newline at end of file
diff --git a/help/pumpkin.xml b/help/pumpkin.xml
index 2e53edd..153219a 100644
--- a/help/pumpkin.xml
+++ b/help/pumpkin.xml
@@ -1,115 +1,116 @@
 <?xml version="1.0"?>

 <winhelp>

  <topic id="About" title="About PumpKIN" keywords="about">

   <heading scroll="no">About <kin>PumpKIN</kin></heading>

   <p><kin>PumpKIN</kin> is a program designed to send and receive files over the net while having <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> session running using <term>TFTP</term> (<rfc num="1350"/>) protocol. It includes full-functional <term>TFTP</term> server/client so it may be useful for maintaining <a href="http://www.cisco.com/">CISCO</a> routers and other network equipment.</p>

   <p/>

   <p><b><i>Enjoy!</i></b></p>

   <license years="1997-2006"/>

   <credist/>

  </topic>

  <topic id="News" title="What's New">

   <newsfor version="2.7.2" date="October 18th, 2006">

    <ni>Added rejecting of too large file requests with explicit error message about the block size</ni>

    <ni>A bit more elaborate logging</ni>

    <ni>Not closing receive socket until the last ACK receved now</ni>

   </newsfor>

   <newsfor version="2.7.1" date="March 13th, 2006">

    <ni>Bugfix release</ni>

   </newsfor>

   <newsfor version="2.7" date="February 28th, 2006">

    <ni>Access lists based on request IP address and TFTP opcode for automating access policy</ni>

    <ni>Possibility to start/stop TFTP server, while keeping client functionality intact</ni>

    <ni>Logging to file</ni>

    <ni>Resizable main window</ni>

   </newsfor>

   <newsfor version="2.6" date="August 6th, 2005">

    <ni>more robust solution to the backslash/slash dilemma</ni>

    <ni>A bit more elaborate error reporting</ni>

    <ni>Fixed uninstall procedure so that it works on XP</ni>

   </newsfor>

   <newsfor version="2.5" date="July 11th, 2004">

    <ni>Change of <a href="#About">license</a> and opening the source.</ni>

    <ni>Minor cosmetic changes</ni>

   </newsfor>

   <newsfor version="2.0" date="June 13th, 1998">

    <ni>Sounds customization. Now you can customize <kin>PumpKIN</kin> bells and whistles or turn them off completely.</ni>

    <ni>Previous version of <kin>PumpKIN</kin> had a bug causing it to misbehave when you're requesting file from remote <term>tftp</term> server using <b>IP Address</b> (as opposed to <b>hostname</b>).</ni>

    <ni>Typo causing <kin>PumpKIN</kin> to log outgoing request in reverse (i.e. <i>Requesting 'hostname' from 'filename'</i>) fixed.</ni>

    <ni>Something else that you may not notice and I can not remember.</ni>

   </newsfor>

   <newsfor version="1.5" date="February 12th, 1998">

    <ni>Transfer resumes. No checking on file contents is done, so it's up to you to decide whether you want to start transmission from the beginning or resume unfinished transfer.</ni>

    <ni>Support for <b>block size</b>, <b>trasnfer size</b> and <b>transfer timeout</b> options as described in <rfc num="1782"/>, <rfc num="1783"/> and <rfc num="1784"/>. I'm not sure if there are any other <term>TFTP</term> implementations supporting this, but at least it makes sense if you use <kin>PumpKIN</kin> on both ends.</ni>

    <ni>New Install program</ni>

   </newsfor>

  </topic>

  <topic id="Using" title="Using PumpKIN">

   <heading scroll="no">Using <kin>PumpKIN</kin></heading>

   <p>This is a simple program for file exchange between two parties. It allows you to send files over the network to your party while having a <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> conversation. It uses open sessions to determine IP address of your party. Also you may use it as a <term>TFTP</term> client/server by itself. To get/put files from/to <term>TFTP</term> server you need to enter host name/IP address manually in the <a href="#Request">Request Dialog</a>.</p>

   <p>To Abort transfer(s) currently in progress - select transfer(s) you want to terminate in the list and click <b>Abort xfer</b> button.</p>

   <p>You may want to hide <kin>PumpKIN</kin> window and leave it as a tray icon only. Just click the <image source="pumpkin.bmp"/> icon in the tray or simply close the window.</p>

   <p>Use <a href="#Options">Options</a> button to set <kin>PumpKIN</kin> options.</p>

   <p>You can start and stop <kin>PumpKIN</kin>'s <term>TFTP</term> server by checking and unchecking the <b>Server is running</b> checkbox in the lower right corner of main <kin>PumpKIN</kin> window.</p>

  </topic>

  <topic id="ConfirmRRQ" title="Confirm Read Request Dialog">

   <heading scroll="no">Confirm Read Request Dialog</heading>

   <p>When the file is requested from your <term>TFTP</term> server you may choose to <b>Grant Access</b> to this file or to <b>Deny Access</b>. If you hesitate to answer for <a href="#ConfirmationTimeout"><b>Confirmation timeout</b></a> (<i>default - 30 seconds</i>) <kin>PumpKIN</kin> defaults to denial of all requests.</p>

  </topic>

  <topic id="ConfirmWRQ" title="Confirm Write Request Dialog">

   <heading scroll="no">Confirm Write Request Dialog</heading>

   <p>Whenever your party sends you a file you have always a choice to accept it or not. You can also save the file under a different name by choosing the <b>Rename</b> option. If you already have file with such name you may chose to <b>resume</b> transfer. No checking on file contents is done. This option may or may not work depending on remote implementation of protocol. It does work if you use <kin>PumpKIN</kin> on both ends. If you are still unsure for <a href="#ConfirmationTimeOut"><b>Confirmation timeout</b></a> (<i>default - 30 seconds</i>) <kin>PumpKIN</kin> will make safe decision for you (deny).</p>

  </topic>

  <topic id="Request" title="Request Dialog">

   <heading scroll="no">Request Dialog</heading>

   <p>Request dialog is aimed to let you form read or write request. You may set the following options:</p>

   <ul>

    <li><b>Local File</b> - You can change the name of the file you're sending (or destination in case you're receiving) right here. You may also use <b>Browse</b> button to select the file.</li>

    <li><b>Remote File</b> Specifies the name of file on the remote host you're requesting (in case of read request) or the name of file you want your file to appear as (in case of write request).</li>

    <li><b>Remote Host</b> is your party's host or <term>TFTP</term> server you're requesting file from/sending file to. To refresh the list of your talk windows use <b>REFRESH</b> button.</li>

    <li><b>Type</b> is the type of transfer as defined in <rfc num="1350"/>. Doesn't mean much, really. Defined types are '<i>octet</i>' or '<i>netascii</i>'. Default is '<i>octet</i>'.</li>

    <li><b>Block Size</b> - Use this block size if remote is <rfc num="1783"/>-compliant. If remote doesn't support this option <kin>PumpKIN</kin> will fallback to 512 bytes per block.</li>

   </ul>

  </topic>

  <topic id="Options" title="Options">

   <heading scroll="no">Options</heading>

   <p><kin>PumpKIN</kin> options property sheet consists of two tabs. For more information see <a href="#NetworkOptions"><b>Network</b></a> and <a herf="#ServerOptions"><b>Server</b></a> options.</p>

  </topic>

  <topic id="NetworkOptions" title="Network Options">

   <heading scroll="no">Network Options</heading>

   <ul>

    <li><b>UDP Ports</b>

     <ul>

      <li><b>Listen for incoming connections on port</b> - specifies the port we're listening to. The default as defined in <rfc num="1350"/> is 69.</li>

+     <li><b>ip address</b> - ip address to listen to.</li>

      <li><b>Send outgoing requests to port</b> - specifies the port we're going to send all requests to.</li>

     </ul>

    </li>

    <li><b>Default Connection timeout</b> - if there's no activity for specified time, transfer is considered to be dead and terminated. <kin>PumpKIN</kin> tries to propagate this value to remote as described in <rfc num="1782"/> and <rfc num="1784"/> if possible.</li>

    <li><b>Default Block Size</b> - <kin>PumpKIN</kin> tries to negotiate block size with remote using this value unless specified explicitly in request. If remote doesn't support <rfc num="1782"/> and <rfc num="1783"/> <kin>PumpKIN</kin> falls back to 512 bytes per block.</li>

   </ul>

  </topic>

  <topic id="ServerOptions" title="Server Options">

   <heading scroll="no">Server Options</heading>

   <ul>

    <li><b>TFTP Filesystem root</b> - Specifies the location of files you're transmitting or where to start looking for them from. Defaults to the directory you start <kin>PumpKIN</kin> for the first time from.</li>

    <li><b>Allow access to subdirectories</b> - specifies whether you want allow access to the whole subtree of <b>TFTP Root</b> or only to the directory itself.</li>

    <li><b>Read Request Behavior</b> - You may choose to automatically agree to give all files requested, to be prompted to confirm these operations, or to deny all requests as if you're not even here.</li>

    <li><b>Write Request Behavior</b> - You may chose to <b>take all files</b> (<i>not recommended</i>), to <b>prompt only if file exists already</b>, <b>Always prompt</b> or <b>Deny all requests</b>.</li>

    <li><a name="ConfirmationTimeOut"/><b>Confirmation timeout</b> - this is the time <kin>PumpKIN</kin> will wait for you to accept or deny request before it will give up and take default action which is always deny.</li>

    <li><b>Log file</b> - If you want to enable logging to file, set the destination file here.</li>

   </ul>

  </topic>

  <topic id="SoundsOptions" title="Sounds Options">

   <heading scroll="no">Sounds</heading>

   <p>You can customize <kin>PumpKIN</kin> sounds notifications here. There are three customizable sounds defined - <b>Incoming request</b>, which notifies you about incoming request prompt if you're set to be prompted whenever incoming request occurs. <b>xfer Aborted</b> - which happens to sound every time transfer is interrupted for whatever reason - time out, explicit kill, denied access, etc. <b>xfer Finished</b> means that your file was successfully transmitted.</p>

   <p>You can select any <b>.wav</b> file or one of the predefined sounds from the dropdown list.</p>

  </topic>

  <topic id="ACL" title="Access Lists">

   <heading scroll="no">Access Lists</heading>

   <p>You can slightly automate your access policies by setting up read/write request behavior for different incoming requests.</p>

   <p>The rule consists of <b>request type</b>, source network (<b>ip</b> and <b>netmask</b>) and <b>action</b> to take (see also <a href="#ServerOptions">Server Options</a>).</p>

   <p>When <kin>PumpKIN</kin> receives request it goes through the list of rules and bases its decision on the first matching rule. To rearrange order of rules, select the rule you wish to move and use up and down arrows buttons on the right. To remove rule, use the cross button.</p>

   <p>To add a new rule fill in the information about <b>request type</b>, source <b>address</b> and <b>netmask</b> and desired action. Then click on the 'Add new rule' button.</p>

   <p>If you wish to amend the rule, select it in the rules list, change parameters below and click the 'Replace rule' button.</p>

  </topic>

 </winhelp>

diff --git a/pumpkin.clw b/pumpkin.clw
index 213d8c1..7fa927b 100644
--- a/pumpkin.clw
+++ b/pumpkin.clw
@@ -1,327 +1,329 @@
 ; CLW file contains information for the MFC ClassWizard

 

 [General Info]

 Version=1

-LastClass=CPumpKINDlg

+LastClass=CPropsNetwork

 LastTemplate=CComboBox

 NewFileInclude1=#include "stdafx.h"

 NewFileInclude2=#include "PumpKIN.h"

 

 ClassCount=14

 Class1=CPumpKINApp

 Class2=CPumpKINDlg

 Class3=CAboutDlg

 

 ResourceCount=10

 Resource1=IDD_REQUEST

-Resource2=IDD_PROPS_NETWORK

+Resource2=IDD_PUMPKIN_DIALOG

 Resource3=IDD_CONFIRM_RRQ

 Resource4=IDD_PROPS_SERVER

 Class4=CPropsServer

 Class5=CPropsNetwork

 Resource5=IDD_CONFIRM_WRQ

 Resource6=IDD_PROPS_ACL

 Class6=CConfirmRRQDlg

 Class7=CConfirmWRQDlg

 Resource7=IDD_ABOUTBOX

 Class8=CRequestDlg

 Class9=CResolver

 Class10=CRetrier

 Class11=CTrayer

 Resource8=IDD_PROPS_SOUNDS

 Class12=CPropsSounds

 Resource9=IDM_POPUPS

 Class13=CPropsACL

 Class14=CACLTargetCombo

-Resource10=IDD_PUMPKIN_DIALOG

+Resource10=IDD_PROPS_NETWORK

 

 [CLS:CPumpKINApp]

 Type=0

 HeaderFile=PumpKIN.h

 ImplementationFile=PumpKIN.cpp

 Filter=N

 

 [CLS:CPumpKINDlg]

 Type=0

 HeaderFile=PumpKINDlg.h

 ImplementationFile=PumpKINDlg.cpp

 Filter=W

 BaseClass=CDialog

 VirtualFilter=dWC

 LastObject=CPumpKINDlg

 

 [CLS:CAboutDlg]

 Type=0

 HeaderFile=PumpKINDlg.h

 ImplementationFile=PumpKINDlg.cpp

 Filter=D

 BaseClass=CDialog

 VirtualFilter=dWC

 LastObject=CAboutDlg

 

 [DLG:IDD_ABOUTBOX]

 Type=1

 Class=CAboutDlg

 ControlCount=5

 Control1=IDC_STATIC,static,1342177283

 Control2=IDC_STATIC,static,1342308480

 Control3=IDC_STATIC,static,1342308352

 Control4=IDOK,button,1342373889

 Control5=IDC_KLEVERNET,button,1342242816

 

 [DLG:IDD_PUMPKIN_DIALOG]

 Type=1

 Class=CPumpKINDlg

 ControlCount=10

 Control1=IDC_CONNECTIONS,SysListView32,1350631681

 Control2=IDC_GET,button,1342259200

 Control3=IDC_PUT,button,1342259200

 Control4=IDC_ABORT,button,1342259200

 Control5=IDC_OPTIONS,button,1342259200

 Control6=IDC_EXIT,button,1342259200

 Control7=ID_HELP,button,1342259200

 Control8=IDC_LOG,listbox,1353728385

 Control9=IDCANCEL,button,1073741824

 Control10=IDC_LISTENING,button,1342275619

 

 [DLG:IDD_PROPS_SERVER]

 Type=1

 Class=CPropsServer

 ControlCount=18

 Control1=IDC_STATIC,button,1342177287

 Control2=IDC_TFTPROOT,edit,1350631552

 Control3=IDC_BROWSE,button,1342242880

 Control4=IDC_TFTPSUBDIRS,button,1342242819

 Control5=IDC_STATIC,button,1342177287

 Control6=IDC_RRQ_GIVEALL,button,1342324745

 Control7=IDC_RRQ_ALWAYSCONFIRM,button,1342193673

 Control8=IDC_RRQ_DENYALL,button,1342193673

 Control9=IDC_STATIC,button,1342308359

 Control10=IDC_WRQ_TAKEALL,button,1342308361

 Control11=IDC_WRQ_PROMPTEXISTING,button,1342177289

 Control12=IDC_WRQ_ALWAYSCONFIRM,button,1342177289

 Control13=IDC_WRQ_DENYALL,button,1342177289

 Control14=IDC_STATIC,static,1342308609

 Control15=IDC_PROMPTTIMEOUT,msctls_trackbar32,1342242823

 Control16=IDC_STATIC,button,1342177287

 Control17=IDC_LOGFILE,edit,1350631552

 Control18=IDC_LOGFILE_BROWSE,button,1342242880

 

 [DLG:IDD_PROPS_NETWORK]

 Type=1

 Class=CPropsNetwork

-ControlCount=15

+ControlCount=17

 Control1=IDC_STATIC,button,1342177287

 Control2=IDC_STATIC,static,1342308354

 Control3=IDC_LISTENPORT,edit,1350631552

 Control4=IDC_LISTENSPIN,msctls_updown32,1342177463

 Control5=IDC_STATIC,static,1342308354

 Control6=IDC_SPEAKPORT,edit,1350631552

 Control7=IDC_SPEAKSPIN,msctls_updown32,1342177463

 Control8=IDC_STATIC,static,1342308352

 Control9=IDC_TIMEOUT,edit,1350639744

 Control10=IDC_TIMESPIN,msctls_updown32,1342177463

 Control11=IDC_STATIC,static,1342308352

 Control12=IDC_STATIC,static,1342308352

 Control13=IDC_STATIC,static,1342308352

 Control14=IDC_BLOCKSIZE,edit,1350639744

 Control15=IDC_BSIZESPIN,msctls_updown32,1342177463

+Control16=IDC_STATIC,static,1342308354

+Control17=IDC_LISTENADDRESS,edit,1350631552

 

 [CLS:CPropsServer]

 Type=0

 HeaderFile=PropsServer.h

 ImplementationFile=PropsServer.cpp

 BaseClass=CPropertyPage

 Filter=D

 VirtualFilter=idWC

 LastObject=CPropsServer

 

 [CLS:CPropsNetwork]

 Type=0

 HeaderFile=PropsNetwork.h

 ImplementationFile=PropsNetwork.cpp

 BaseClass=CPropertyPage

 Filter=D

 VirtualFilter=idWC

-LastObject=IDC_BLOCKSIZE

+LastObject=IDC_LISTENADDRESS

 

 [DLG:IDD_CONFIRM_RRQ]

 Type=1

 Class=CConfirmRRQDlg

 ControlCount=9

 Control1=IDOK,button,1342242817

 Control2=IDCANCEL,button,1342242816

 Control3=IDC_STATIC,static,1342308352

 Control4=IDC_HOST,static,1350701313

 Control5=IDC_STATIC,static,1342308353

 Control6=IDC_FILE,static,1350701313

 Control7=IDC_STATIC,static,1342177296

 Control8=IDC_STATIC,static,1342177283

 Control9=IDC_STATIC,static,1342177283

 

 [DLG:IDD_CONFIRM_WRQ]

 Type=1

 Class=CConfirmWRQDlg

 ControlCount=11

 Control1=IDOK,button,1342242817

 Control2=IDC_RENAME,button,1342242816

 Control3=IDCANCEL,button,1342242816

 Control4=IDC_STATIC,static,1342308352

 Control5=IDC_HOST,static,1350701313

 Control6=IDC_STATIC,static,1342308353

 Control7=IDC_FILE,static,1350701313

 Control8=IDC_STATIC,static,1342177296

 Control9=IDC_STATIC,static,1342177283

 Control10=IDC_STATIC,static,1342177283

 Control11=IDC_RESUME,button,1342242816

 

 [CLS:CConfirmRRQDlg]

 Type=0

 HeaderFile=ConfirmRRQDlg.h

 ImplementationFile=ConfirmRRQDlg.cpp

 BaseClass=CDialog

 Filter=D

 VirtualFilter=dWC

 LastObject=CConfirmRRQDlg

 

 [CLS:CConfirmWRQDlg]

 Type=0

 HeaderFile=ConfirmWRQDlg.h

 ImplementationFile=ConfirmWRQDlg.cpp

 BaseClass=CDialog

 Filter=D

 VirtualFilter=dWC

 LastObject=IDC_RESUME

 

 [DLG:IDD_REQUEST]

 Type=1

 Class=CRequestDlg

 ControlCount=15

 Control1=IDC_STATIC,static,1342308608

 Control2=IDC_LOCALFILE,edit,1350631552

 Control3=IDC_BROWSE,button,1342242880

 Control4=IDC_STATIC,static,1342308608

 Control5=IDC_REMOTEFILE,edit,1350631552

 Control6=IDC_STATIC,static,1342308608

 Control7=IDC_TALKS,combobox,1344341313

 Control8=IDC_REFRESH,button,1342271232

 Control9=IDC_STATIC,static,1342308352

 Control10=IDC_TYPE,combobox,1344356418

 Control11=IDC_STATIC,static,1342308352

 Control12=IDC_BSIZE,combobox,1344339970

 Control13=IDOK,button,1342242817

 Control14=IDCANCEL,button,1342242816

 Control15=IDC_STATIC,static,1342177297

 

 [CLS:CRequestDlg]

 Type=0

 HeaderFile=RequestDlg.h

 ImplementationFile=RequestDlg.cpp

 BaseClass=CDialog

 Filter=W

 VirtualFilter=dWC

 LastObject=CRequestDlg

 

 [CLS:CResolver]

 Type=0

 HeaderFile=Resolver.h

 ImplementationFile=Resolver.cpp

 BaseClass=CWnd

 Filter=W

 LastObject=CResolver

 VirtualFilter=WC

 

 [MNU:IDM_POPUPS]

 Type=1

 Class=CPumpKINDlg

 Command1=ID_TRAY_SENDFILE

 Command2=ID_TRAY_FETCHFILE

 Command3=ID_TRAY_OPTIONS

 Command4=ID_TRAY_LISTEN

 Command5=ID_TRAY_SHOWPUMPKINWINDOW

 Command6=ID_TRAY_OPENFILESFOLDER

 Command7=ID_TRAY_HELP

 Command8=ID_TRAY_ABOUTPUMPKIN

 Command9=ID_TRAY_EXIT

 CommandCount=9

 

 [CLS:CRetrier]

 Type=0

 HeaderFile=Retrier.h

 ImplementationFile=Retrier.cpp

 BaseClass=CWnd

 Filter=W

 LastObject=CRetrier

 VirtualFilter=WC

 

 [CLS:CTrayer]

 Type=0

 HeaderFile=Trayer.h

 ImplementationFile=Trayer.cpp

 BaseClass=CWnd

 Filter=W

 LastObject=CTrayer

 VirtualFilter=WC

 

 [DLG:IDD_PROPS_SOUNDS]

 Type=1

 Class=CPropsSounds

 ControlCount=12

 Control1=IDC_STATIC,static,1342308352

 Control2=IDC_RING,combobox,1344340290

 Control3=IDC_RING_BROWSE,button,1342242880

 Control4=IDC_RING_PLAY,button,1342242880

 Control5=IDC_STATIC,static,1342308352

 Control6=IDC_FINISHED,combobox,1344340290

 Control7=IDC_FINISHED_BROWSE,button,1342242880

 Control8=IDC_FINISHED_PLAY,button,1342242880

 Control9=IDC_STATIC,static,1342308352

 Control10=IDC_ABORTED,combobox,1344340290

 Control11=IDC_ABORTED_BROWSE,button,1342242880

 Control12=IDC_ABORTED_PLAY,button,1342242880

 

 [CLS:CPropsSounds]

 Type=0

 HeaderFile=PropsSounds.h

 ImplementationFile=PropsSounds.cpp

 BaseClass=CPropertyPage

 Filter=D

 LastObject=CPropsSounds

 VirtualFilter=idWC

 

 [DLG:IDD_PROPS_ACL]

 Type=1

 Class=CPropsACL

 ControlCount=14

 Control1=IDC_ACL_LIST,SysListView32,1350631425

 Control2=IDC_ACL_UP,button,1342246720

 Control3=IDC_ACL_DOWN,button,1342246720

 Control4=IDC_ACL_REMOVE,button,1342246720

 Control5=IDC_STATIC,static,1342308352

 Control6=IDC_ACL_XFER,combobox,1344339971

 Control7=IDC_STATIC,static,1342308352

 Control8=IDC_ACL_ADDR,edit,1350631552

 Control9=IDC_STATIC,static,1342308352

 Control10=IDC_ACL_NETMASK,edit,1350631552

 Control11=IDC_STATIC,static,1342308352

 Control12=IDC_ACL_RULE,combobox,1344339971

 Control13=IDC_ACL_ADD,button,1342242816

 Control14=IDC_ACL_REPLACE,button,1342242816

 

 [CLS:CPropsACL]

 Type=0

 HeaderFile=PropsACL.h

 ImplementationFile=PropsACL.cpp

 BaseClass=CPropertyPage

 Filter=D

 LastObject=CPropsACL

 VirtualFilter=idWC

 

 [CLS:CACLTargetCombo]

 Type=0

 HeaderFile=ACLTargetCombo.h

 ImplementationFile=ACLTargetCombo.cpp

 BaseClass=CComboBox

 Filter=W

 LastObject=CACLTargetCombo

 

diff --git a/pumpkin.rc b/pumpkin.rc
index f52c4bd..babd066 100644..100755
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -1,384 +1,386 @@
 //Microsoft Developer Studio generated resource script.

 //

 #include "resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

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

 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

 #include "afxres.h"

 

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

 #undef APSTUDIO_READONLY_SYMBOLS

 

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

 // English (U.S.) resources

 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

 #ifdef _WIN32

 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

 #pragma code_page(1252)

 #endif //_WIN32

 

 #ifdef APSTUDIO_INVOKED

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

 //

 // TEXTINCLUDE

 //

 

 1 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "resource.h\0"

 END

 

 2 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "#include ""afxres.h""\r\n"

     "\0"

 END

 

 3 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

     "#define _AFX_NO_OLE_RESOURCES\r\n"

     "#define _AFX_NO_TRACKER_RESOURCES\r\n"

     "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

     "\r\n"

     "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

     "#ifdef _WIN32\r\n"

     "LANGUAGE 9, 1\r\n"

     "#pragma code_page(1252)\r\n"

     "#endif\r\n"

     "#include ""res\\PumpKIN.rc2""  // non-Microsoft Visual C++ edited resources\r\n"

     "#include ""afxres.rc""         // Standard components\r\n"

     "#endif\0"

 END

 

 #endif    // APSTUDIO_INVOKED

 

 

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

 //

 // Icon

 //

 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_RRQ                 ICON    DISCARDABLE     "res\\wrq.ico"

 IDI_WRQ                 ICON    DISCARDABLE     "res\\rrq.ico"

 IDI_BROWSE              ICON    DISCARDABLE     "shared-data/browse-icon.ico"

 IDR_MAINFRAME           ICON    DISCARDABLE     "res\\pumpkin.ico"

 IDI_PLAY                ICON    DISCARDABLE     "shared-data/play-icon.ico"

 IDI_UP                  ICON    DISCARDABLE     "res\\up.ico"

 IDI_DOWN                ICON    DISCARDABLE     "res\\down.ico"

 IDI_REMOVE              ICON    DISCARDABLE     "res\\remove.ico"

 

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

 //

 // Dialog

 //

 

 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 217, 74

 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "About PumpKIN"

 FONT 8, "MS Sans Serif"

 BEGIN

     ICON            IDR_MAINFRAME,IDC_STATIC,7,17,18,20

     LTEXT           "PumpKIN, Version 2.7.2",IDC_STATIC,40,15,119,8,

                     SS_NOPREFIX

     LTEXT           "Copyright © 1997-2006 Klever Group",IDC_STATIC,40,30,

                     170,8

     DEFPUSHBUTTON   "OK",IDOK,178,7,32,14,WS_GROUP

     PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14

 END

 

 IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 193

 STYLE DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW

 CAPTION "  PumpKIN"

 FONT 8, "MS Sans Serif", 0, 0, 0x1

 BEGIN

     CONTROL         "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT | 

                     LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,7,295,108,

                     WS_EX_DLGMODALFRAME

     PUSHBUTTON      "&Get File",IDC_GET,305,7,50,17,BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Put File",IDC_PUT,305,25,50,17,BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Abort xfer",IDC_ABORT,305,43,50,17,BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Options",IDC_OPTIONS,305,61,50,17,BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     PUSHBUTTON      "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE

     LISTBOX         IDC_LOG,7,115,348,64,LBS_USETABSTOPS | 

                     LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL | 

                     WS_HSCROLL,WS_EX_DLGMODALFRAME

     PUSHBUTTON      "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP

     CONTROL         "&Server is running",IDC_LISTENING,"Button",

                     BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_FLAT | WS_TABSTOP,286,

                     181,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE

 END

 

 IDD_PROPS_SERVER DIALOG DISCARDABLE  0, 0, 300, 201

 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

 CAPTION "Server"

 FONT 8, "MS Sans Serif"

 BEGIN

     GROUPBOX        "TFTP filesystem &root (download path)",IDC_STATIC,7,7,

                     286,38

     EDITTEXT        IDC_TFTPROOT,13,16,256,13,ES_AUTOHSCROLL

     PUSHBUTTON      "&B",IDC_BROWSE,274,16,13,13,BS_ICON

     CONTROL         "Allow access to &subdirectories",IDC_TFTPSUBDIRS,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,31,111,10

     GROUPBOX        "Read Request Behavior",IDC_STATIC,7,48,243,56

     CONTROL         "Give &all files",IDC_RRQ_GIVEALL,"Button",

                     BS_AUTORADIOBUTTON | BS_NOTIFY | WS_GROUP,13,63,53,10

     CONTROL         "&Prompt before giving file",IDC_RRQ_ALWAYSCONFIRM,

                     "Button",BS_AUTORADIOBUTTON | BS_NOTIFY,43,75,91,10

     CONTROL         "&Deny all requests",IDC_RRQ_DENYALL,"Button",

                     BS_AUTORADIOBUTTON | BS_NOTIFY,73,87,70,10

     GROUPBOX        "Write Request Behavior",IDC_STATIC,7,106,243,56,

                     WS_GROUP

     CONTROL         "Take a&ll files",IDC_WRQ_TAKEALL,"Button",

                     BS_AUTORADIOBUTTON | WS_GROUP,13,116,55,10

     CONTROL         "Prompt if file &exists",IDC_WRQ_PROMPTEXISTING,"Button",

                     BS_AUTORADIOBUTTON,43,126,73,10

     CONTROL         "Always pro&mpt before accepting file",

                     IDC_WRQ_ALWAYSCONFIRM,"Button",BS_AUTORADIOBUTTON,73,136,

                     139,10

     CONTROL         "D&eny all requests",IDC_WRQ_DENYALL,"Button",

                     BS_AUTORADIOBUTTON,103,146,70,10

     CTEXT           "Confirmation &timeout",IDC_STATIC,253,52,40,19,

                     SS_NOTIFY

     CONTROL         "Slider1",IDC_PROMPTTIMEOUT,"msctls_trackbar32",

                     TBS_AUTOTICKS | TBS_VERT | TBS_TOP | WS_TABSTOP,272,72,

                     21,90

     GROUPBOX        "Log file (leave empty to disable logging to file)",

                     IDC_STATIC,7,165,286,29

     EDITTEXT        IDC_LOGFILE,13,175,256,13,ES_AUTOHSCROLL

     PUSHBUTTON      "",IDC_LOGFILE_BROWSE,274,175,13,13,BS_ICON

 END

 

 IDD_PROPS_NETWORK DIALOG DISCARDABLE  0, 0, 300, 201

 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

 CAPTION "Network"

 FONT 8, "MS Sans Serif"

 BEGIN

-    GROUPBOX        "UDP Ports",IDC_STATIC,7,7,286,40

+    GROUPBOX        "UDP Ports",IDC_STATIC,7,7,286,55

     RTEXT           "Listen for &incoming requests on port:",IDC_STATIC,13,

                     18,135,8

-    EDITTEXT        IDC_LISTENPORT,154,16,40,13,ES_AUTOHSCROLL

+    EDITTEXT        IDC_LISTENPORT,154,16,61,13,ES_AUTOHSCROLL

     CONTROL         "Spin1",IDC_LISTENSPIN,"msctls_updown32",UDS_WRAP | 

                     UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 

-                    UDS_ARROWKEYS | UDS_NOTHOUSANDS,183,16,11,13

-    RTEXT           "Send &outging requests to port:",IDC_STATIC,13,31,135,8

-    EDITTEXT        IDC_SPEAKPORT,154,29,40,13,ES_AUTOHSCROLL

+                    UDS_ARROWKEYS | UDS_NOTHOUSANDS,204,16,11,13

+    RTEXT           "Send &outging requests to port:",IDC_STATIC,13,46,135,8

+    EDITTEXT        IDC_SPEAKPORT,154,44,61,13,ES_AUTOHSCROLL

     CONTROL         "Spin1",IDC_SPEAKSPIN,"msctls_updown32",UDS_WRAP | 

                     UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 

-                    UDS_ARROWKEYS | UDS_NOTHOUSANDS,183,29,11,13

-    LTEXT           "Default connection timeout:",IDC_STATIC,7,52,88,8

-    EDITTEXT        IDC_TIMEOUT,110,50,40,13,ES_AUTOHSCROLL | ES_NUMBER

+                    UDS_ARROWKEYS | UDS_NOTHOUSANDS,204,43,11,13

+    LTEXT           "Default connection timeout:",IDC_STATIC,7,66,88,8

+    EDITTEXT        IDC_TIMEOUT,110,64,40,13,ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "Spin3",IDC_TIMESPIN,"msctls_updown32",UDS_WRAP | 

                     UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 

-                    UDS_ARROWKEYS | UDS_NOTHOUSANDS,140,50,11,13

-    LTEXT           "Default block size:",IDC_STATIC,7,66,59,8

-    LTEXT           "seconds",IDC_STATIC,154,52,28,8

-    LTEXT           "bytes",IDC_STATIC,154,66,18,8

-    EDITTEXT        IDC_BLOCKSIZE,110,64,40,13,ES_AUTOHSCROLL | ES_NUMBER

+                    UDS_ARROWKEYS | UDS_NOTHOUSANDS,140,64,11,13

+    LTEXT           "Default block size:",IDC_STATIC,7,80,59,8

+    LTEXT           "seconds",IDC_STATIC,154,66,28,8

+    LTEXT           "bytes",IDC_STATIC,154,80,18,8

+    EDITTEXT        IDC_BLOCKSIZE,110,78,40,13,ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "Spin3",IDC_BSIZESPIN,"msctls_updown32",UDS_WRAP | 

                     UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 

-                    UDS_ARROWKEYS | UDS_NOTHOUSANDS,140,64,11,13

+                    UDS_ARROWKEYS | UDS_NOTHOUSANDS,140,78,11,13

+    RTEXT           "ip address:",IDC_STATIC,13,32,135,8

+    EDITTEXT        IDC_LISTENADDRESS,154,28,61,14,ES_AUTOHSCROLL

 END

 

 IDD_CONFIRM_RRQ DIALOGEX 0, 0, 181, 79

 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUP | 

     WS_CAPTION

 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE

 CAPTION "  PumpKIN - Confirm Read Request"

 FONT 8, "MS Sans Serif", 0, 0, 0x1

 BEGIN

     DEFPUSHBUTTON   "&Grant Access",IDOK,27,58,54,14

     PUSHBUTTON      "&Deny Access",IDCANCEL,97,58,54,14

     LTEXT           "The host",IDC_STATIC,77,7,29,8

     CTEXT           "255.255.255.255",IDC_HOST,57,15,68,14,SS_NOTIFY | 

                     SS_SUNKEN | WS_BORDER,WS_EX_DLGMODALFRAME | 

                     WS_EX_CLIENTEDGE

     CTEXT           "is requesting the file",IDC_STATIC,23,29,135,8

     CTEXT           "",IDC_FILE,23,37,135,14,SS_NOTIFY | SS_SUNKEN | 

                     WS_BORDER,WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE

     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,54,167,1

     ICON            IDR_MAINFRAME,IDC_STATIC,7,7,18,20

     ICON            IDR_MAINFRAME,IDC_STATIC,153,7,18,20

 END

 

 IDD_CONFIRM_WRQ DIALOGEX 0, 0, 201, 95

 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUP | WS_CAPTION

 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE

 CAPTION "  PumpKIN - Confirm Write Request"

 FONT 8, "MS Sans Serif", 0, 0, 0x1

 BEGIN

     DEFPUSHBUTTON   "&Accept",IDOK,7,58,59,14

     PUSHBUTTON      "&Rename",IDC_RENAME,71,58,59,14

     PUSHBUTTON      "&Deny Access",IDCANCEL,135,58,59,14

     LTEXT           "The host",IDC_STATIC,87,7,29,8

     CTEXT           "255.255.255.255",IDC_HOST,67,15,68,14,SS_NOTIFY | 

                     SS_SUNKEN | WS_BORDER,WS_EX_DLGMODALFRAME | 

                     WS_EX_CLIENTEDGE

     CTEXT           "is attempting to send you a file",IDC_STATIC,33,29,135,

                     8

     CTEXT           "",IDC_FILE,33,37,135,14,SS_NOTIFY | SS_SUNKEN | 

                     WS_BORDER,WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE

     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,54,187,1

     ICON            IDR_MAINFRAME,IDC_STATIC,7,7,21,20

     ICON            IDR_MAINFRAME,IDC_STATIC,173,7,21,20

     PUSHBUTTON      "Res&ume",IDC_RESUME,71,74,59,14

 END

 

 IDD_REQUEST DIALOGEX 0, 0, 191, 161

 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUP | WS_CAPTION | 

     WS_SYSMENU

 EXSTYLE WS_EX_CLIENTEDGE

 CAPTION "Request"

 FONT 8, "MS Sans Serif", 0, 0, 0x1

 BEGIN

     LTEXT           "&Local file:",IDC_STATIC,7,7,31,8,SS_NOTIFY

     EDITTEXT        IDC_LOCALFILE,7,16,157,14,ES_AUTOHSCROLL,

                     WS_EX_CLIENTEDGE | WS_EX_STATICEDGE

     PUSHBUTTON      "...",IDC_BROWSE,165,16,19,14,BS_ICON,WS_EX_STATICEDGE

     LTEXT           "&Remote file:",IDC_STATIC,7,34,38,8,SS_NOTIFY

     EDITTEXT        IDC_REMOTEFILE,7,44,177,14,ES_AUTOHSCROLL,

                     WS_EX_CLIENTEDGE | WS_EX_STATICEDGE

     LTEXT           "Remote &host:",IDC_STATIC,7,61,43,8,SS_NOTIFY

     COMBOBOX        IDC_TALKS,7,72,157,66,CBS_SIMPLE | CBS_AUTOHSCROLL | 

                     CBS_SORT | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | 

                     WS_TABSTOP,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE

     PUSHBUTTON      "R\nE\n&F\nR\nE\nS\nH",IDC_REFRESH,165,72,19,66,

                     BS_CENTER | BS_VCENTER | BS_MULTILINE | BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     LTEXT           "&Type:",IDC_STATIC,58,34,19,8

     COMBOBOX        IDC_TYPE,80,31,43,41,CBS_DROPDOWN | CBS_AUTOHSCROLL | 

                     CBS_LOWERCASE | WS_VSCROLL | WS_TABSTOP

     LTEXT           "&Block:",IDC_STATIC,127,34,21,8

     COMBOBOX        IDC_BSIZE,149,31,35,53,CBS_DROPDOWN | WS_VSCROLL | 

                     WS_TABSTOP

     DEFPUSHBUTTON   "OK",IDOK,35,140,50,14

     PUSHBUTTON      "Cancel",IDCANCEL,101,140,50,14

     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDVERT,52,32,1,11

 END

 

 IDD_PROPS_SOUNDS DIALOG DISCARDABLE  0, 0, 300, 201

 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

 CAPTION "Sounds"

 FONT 8, "MS Sans Serif"

 BEGIN

     LTEXT           "&Incoming request:",IDC_STATIC,7,9,57,8

     COMBOBOX        IDC_RING,70,7,188,100,CBS_DROPDOWN | CBS_AUTOHSCROLL | 

                     CBS_SORT | WS_VSCROLL | WS_TABSTOP

     PUSHBUTTON      "browse",IDC_RING_BROWSE,263,7,13,13,BS_ICON

     PUSHBUTTON      "play",IDC_RING_PLAY,280,7,13,13,BS_ICON

     LTEXT           "xfer &finished:",IDC_STATIC,7,25,57,8

     COMBOBOX        IDC_FINISHED,70,22,188,100,CBS_DROPDOWN | 

                     CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP

     PUSHBUTTON      "browse",IDC_FINISHED_BROWSE,263,22,13,13,BS_ICON

     PUSHBUTTON      "play",IDC_FINISHED_PLAY,280,22,13,13,BS_ICON

     LTEXT           "xfer &aborted:",IDC_STATIC,7,40,57,8

     COMBOBOX        IDC_ABORTED,70,37,188,100,CBS_DROPDOWN | CBS_AUTOHSCROLL | 

                     CBS_SORT | WS_VSCROLL | WS_TABSTOP

     PUSHBUTTON      "browse",IDC_ABORTED_BROWSE,263,37,13,13,BS_ICON

     PUSHBUTTON      "play",IDC_ABORTED_PLAY,280,37,13,13,BS_ICON

 END

 

 IDD_PROPS_ACL DIALOG DISCARDABLE  0, 0, 300, 201

 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

 CAPTION "Access Lists"

 FONT 8, "MS Sans Serif"

 BEGIN

     CONTROL         "List1",IDC_ACL_LIST,"SysListView32",LVS_REPORT | 

                     WS_BORDER | WS_TABSTOP,7,7,258,110

     PUSHBUTTON      "&Up",IDC_ACL_UP,273,7,20,30,BS_ICON | BS_CENTER | 

                     BS_VCENTER

     PUSHBUTTON      "&Down",IDC_ACL_DOWN,273,87,20,30,BS_ICON | BS_CENTER | 

                     BS_VCENTER

     PUSHBUTTON      "&Remove",IDC_ACL_REMOVE,273,47,20,30,BS_ICON | 

                     BS_CENTER | BS_VCENTER

     LTEXT           "If",IDC_STATIC,13,128,8,8

     COMBOBOX        IDC_ACL_XFER,21,125,48,67,CBS_DROPDOWNLIST | WS_VSCROLL | 

                     WS_TABSTOP

     LTEXT           "request comes from the address in the network",

                     IDC_STATIC,71,128,122,8

     EDITTEXT        IDC_ACL_ADDR,47,143,80,12,ES_AUTOHSCROLL

     LTEXT           "with netmask",IDC_STATIC,129,145,41,8

     EDITTEXT        IDC_ACL_NETMASK,173,143,80,12,ES_AUTOHSCROLL

     LTEXT           "then",IDC_STATIC,124,160,15,8

     COMBOBOX        IDC_ACL_RULE,143,158,123,117,CBS_DROPDOWNLIST | 

                     WS_VSCROLL | WS_TABSTOP

     PUSHBUTTON      "&Add new rule",IDC_ACL_ADD,7,178,130,16

     PUSHBUTTON      "&Replace rule",IDC_ACL_REPLACE,152,178,130,16

 END

 

 

 #ifndef _MAC

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

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION 2,7,2,0

  PRODUCTVERSION 2,7,2,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

  FILEOS 0x4L

  FILETYPE 0x1L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"

             VALUE "FileVersion", "2, 7, 2, 0\0"

             VALUE "InternalName", "PUMPKIN\0"

             VALUE "LegalCopyright", "Copyright © 1997-2006 Klever Group (http://www.klever.net)\0"

             VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"

             VALUE "OriginalFilename", "PUMPKIN.EXE\0"

             VALUE "ProductName", "PumpKIN\0"

             VALUE "ProductVersion", "2, 7, 2, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

 

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

 //

 // DESIGNINFO

 //

 

 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO DISCARDABLE 

 BEGIN

     IDD_ABOUTBOX, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 210

         TOPMARGIN, 7

         BOTTOMMARGIN, 67

     END

 

     IDD_PUMPKIN_DIALOG, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 355

diff --git a/resource.h b/resource.h
index 7961e5e..2c2fa02 100644..100755
--- a/resource.h
+++ b/resource.h
@@ -1,173 +1,174 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Developer Studio generated include file.

 // Used by PumpKIN.rc

 //

 #define IDM_ABOUTBOX                    0x0010

 #define IDD_ABOUTBOX                    100

 #define IDS_ABOUTBOX                    101

 #define IDC_TRAYICON                    101

 #define IDD_PUMPKIN_DIALOG              102

 #define IDS_FMT_BYTES                   102

 #define IDP_SOCKETS_INIT_FAILED         103

 #define IDS_TFTP_ERROR_ACCESS           104

 #define IDS_TFTP_ERROR_NOTFOUND         105

 #define IDS_TFTP_ERROR_DIRFULL          106

 #define IDD_PROPS_SERVER                106

 #define IDS_TFTP_ERROR_SHARING          107

 #define IDD_PROPS_NETWORK               107

 #define IDS_TFTP_ERROR_DISKFULL         108

 #define IDS_TFTP_ERROR_UNDEFINED        109

 #define IDS_LOG_START                   110

 #define IDS_LOG_LISTENRECEIVEERROR      111

 #define IDS_LOG_LISTENACCEPTERROR       112

 #define IDS_LOG_RRQSERVE                113

 #define IDS_LOG_LISTENOPCODE            114

 #define IDS_LOG_XFERUDPSEND             115

 #define IDS_LOG_XFERRECEIVE             116

 #define IDS_LOG_XFERSEND                117

 #define IDS_LOG_XFERUDPRECEIVE          118

 #define IDS_LOG_XFERSOURCETID           119

 #define IDS_LOG_SENTTFTPERROR           120

 #define IDS_LOG_GOTTFTPERROR            121

 #define IDS_LOG_XFEROPCODE              122

 #define IDS_LOG_XFERRRQFINISHED         123

 #define IDS_TITLE_OPTIONS               124

 #define IDS_LOG_WRQSERVE                125

 #define IDS_TFTP_ERROR_FAILEDTORENAME   126

 #define IDS_RENAME_TITLE                127

 #define IDR_MAINFRAME                   128

 #define IDS_LOG_TIMEDOUT                128

 #define IDS_CONFIRMEXIT_TITLE           129

 #define IDI_RRQ                         129

 #define IDS_CONFIRMEXIT_TEXT            130

 #define IDI_WRQ                         130

 #define IDD_CONFIRM_RRQ                 131

 #define IDS_LOG_XFERWRQFINISHED         131

 #define IDD_CONFIRM_WRQ                 132

 #define IDB_BACKGROUND                  132

 #define IDS_LOG_XFERABORTED             132

 #define IDS_TITLE_PUTREQUEST            133

 #define IDS_TITLE_GETREQUEST            134

 #define IDR_WAVE_RING                   135

 #define IDS_TALKHEADING                 135

 #define IDS_WTALKHEADING                135

 #define IDR_WAVE_FINISHED               136

 #define IDS_TITLE_BROWSEFILE            136

 #define IDD_REQUEST                     137

 #define IDS_LOG_RESOLVEFAILED           137

 #define IDS_LOG_FAILEDLOCALFILE         138

 #define IDD_PROPS_SOUNDS                138

 #define IDS_LOG_FAILEDTOOPEN            139

 #define IDM_POPUPS                      140

 #define IDS_OTALXHEADING                140

 #define IDS_REGISTRYKEY                 141

 #define IDS_KLEVERNET_URL               142

 #define IDR_WAVE_ABORTED                142

 #define IDS_LOGTIMEFORMAT               143

 #define IDS_DROPFILES_TITLE             144

 #define IDS_NOMULTIPLEDROP_TEXT         145

 #define IDI_BROWSE                      145

 #define IDS_LOG_REQUESTING              146

 #define IDS_LOG_SENDING                 147

 #define IDS_WTALKAT                     148

 #define IDS_OTALXAT                     149

 #define IDI_PLAY                        149

 #define IDS_TFTP_ERROR_TSIZE            150

 #define IDD_PROPS_ACL                   150

 #define IDS_TFTP_ERROR_BSIZE            151

 #define IDS_TFTP_ERROR_TOUT             152

 #define IDI_UP                          152

 #define IDS_SELECT_TFTPROOT             153

 #define IDI_DOWN                        153

 #define IDS_FILTER_WAV                  154

 #define IDI_REMOVE                      154

 #define IDS_TITLE_WAV                   155

 #define IDS_BOX_CANTBIND                156

 #define IDS_NO_XFER_OP                  157

 #define IDS_INVALID_IP                  158

 #define IDS_INVALID_NETMASK             159

 #define IDS_INVALID_RULE                160

 #define IDS_LOG_LOGERROR                161

 #define IDS_TFTP_ERROR_TOOBIG           162

 #define IDS_LOG_DENYING                 163

 #define IDC_KLEVERNET                   1000

 #define IDC_CONNECTIONS                 1001

 #define IDC_LOG                         1003

 #define IDC_GET                         1004

 #define IDC_PUT                         1005

 #define IDC_ABORT                       1006

 #define IDC_EXIT                        1007

 #define IDC_TFTPROOT                    1008

 #define IDC_TFTPSUBDIRS                 1009

 #define IDC_RRQ_GIVEALL                 1010

 #define IDC_RRQ_ALWAYSCONFIRM           1011

 #define IDC_RRQ_DENYALL                 1012

 #define IDC_WRQ_TAKEALL                 1013

 #define IDC_WRQ_PROMPTEXISTING          1014

 #define IDC_WRQ_ALWAYSCONFIRM           1015

 #define IDC_WRQ_DENYALL                 1016

 #define IDC_PROMPTTIMEOUT               1017

 #define IDC_LISTENPORT                  1018

 #define IDC_LISTENSPIN                  1019

 #define IDC_SPEAKPORT                   1020

 #define IDC_SPEAKSPIN                   1021

 #define IDC_MAXUDPSIZE                  1022

 #define IDC_MAXUDPSPIN                  1023

 #define IDC_TIMEOUT                     1024

 #define IDC_TIMESPIN                    1025

 #define IDC_OPTIONS                     1026

 #define IDC_BLOCKSIZE                   1026

 #define IDC_BSIZESPIN                   1027

 #define IDC_HOST                        1028

 #define IDC_FILE                        1029

 #define IDC_RENAME                      1030

 #define IDC_REMOTEFILE                  1030

 #define IDC_RESUME                      1031

 #define IDC_REFRESH                     1032

 #define IDC_BROWSE                      1034

 #define IDC_TALKS                       1035

 #define IDC_LOCALFILE                   1036

 #define IDC_TYPE                        1037

 #define IDC_BSIZE                       1039

 #define IDC_RING                        1041

 #define IDC_RING_BROWSE                 1042

 #define IDC_RING_PLAY                   1043

 #define IDC_ACL_LIST                    1043

 #define IDC_FINISHED                    1044

 #define IDC_ACL_UP                      1044

 #define IDC_FINISHED_BROWSE             1045

 #define IDC_ACL_DOWN                    1045

 #define IDC_FINISHED_PLAY               1046

 #define IDC_ACL_REMOVE                  1046

 #define IDC_ABORTED                     1047

 #define IDC_ACL_ADDR                    1047

 #define IDC_ABORTED_BROWSE              1048

 #define IDC_ACL_RULE                    1048

 #define IDC_ABORTED_PLAY                1049

 #define IDC_ACL_NETMASK                 1049

 #define IDC_ACL_ADD                     1050

 #define IDC_ACL_XFER                    1051

 #define IDC_ACL_REPLACE                 1052

 #define IDC_LISTENING                   1052

 #define IDC_LOGFILE                     1053

 #define IDC_LOGFILE_BROWSE              1054

+#define IDC_LISTENADDRESS               1055

 #define ID_TRAY_HELP                    32771

 #define ID_TRAY_ABOUTPUMPKIN            32772

 #define ID_TRAY_EXIT                    32773

 #define ID_TRAY_SENDFILE                32774

 #define ID_TRAY_FETCHFILE               32775

 #define ID_TRAY_OPTIONS                 32776

 #define ID_TRAY_SHOWPUMPKINWINDOW       32777

 #define ID_TRAY_OPENFILESFOLDER         32778

 #define ID_TRAY_LISTEN                  32780

 

 // Next default values for new objects

 // 

 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        155

+#define _APS_NEXT_RESOURCE_VALUE        156

 #define _APS_NEXT_COMMAND_VALUE         32781

-#define _APS_NEXT_CONTROL_VALUE         1055

+#define _APS_NEXT_CONTROL_VALUE         1056

 #define _APS_NEXT_SYMED_VALUE           102

 #endif

 #endif