quick fix to the backslash conversion problem.

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

1 files changed, 6 insertions, 2 deletions

diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 1e6d03f..0b3bf41 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -709,1027 +709,1031 @@ CFileException e;
                         ASSERT(m_wndResolver);

                         return m_wndResolver->Resolve();

                 }

                 else

                         OnHostKnown();

         }else{

         tftp::tftpOptions o;

         CString v;

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

                         m__blkSize=atoi(v);

                         if(m__blkSize){

                                 m_blkSize=m__blkSize;

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

                                 o[tftpoBSize]=v;

                         }

                 }

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

                         v.Format("%lu",m_xferSize);

                         o[tftpoTSize]=v;

                 }

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

                         m__timeOut=atoi(v);

                         if(m__timeOut){

                                 m_timeOut=m__timeOut;

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

                                 o[tftpoTOut]=v;

                         }

                 }

                 state = stateXfer;

                 m_ACK=0;

                 if(o.GetCount()){

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

                         ASSERT(p);

                         p->SetOpcode(tftp::opOACK);

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

                         PostTFTP(p,TRUE);

                 }else

                         DoXfer();

         }

         return TRUE;

 }

 

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

         : CXferSocket(daddy,fileName,type,sin)

 {

         m_ACK=0;

         m_LastSlack=0;

 }

 

 UINT tftp::tftpERROR::tftpSize(LPCTSTR msg)

 {

         return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpERROR::tftpErrorCode)+strlen(msg)+1;

 }

 

 tftp* tftp::Allocate(UINT tftpSize)

 {

         ASSERT(tftpSize);

 tftp* rv = (tftp*) new BYTE[tftpSlackSize+tftpSize];

         ASSERT(rv);

         rv->length=tftpSize;

         return rv;

 }

 

 void tftp::errSet(UINT code,LPCTSTR msg)

 {

         ASSERT(this);

         ASSERT(length>=data.m_ERROR.tftpSize(msg));

         strcpy((char*)data.m_ERROR.data,msg);

         data.m_ERROR.SetCode(code);

 }

 

 void CXferSocket::PostTFTP(tftp* p,BOOL retryable)

 {

         ASSERT(p);

         m_Queue.AddTail(p);

         DoSelect();

         if(!m_bRetry){

                 if(retryable)

                         SetTry(p);

                 else

                         SetTry();

         }

         ResetTimeout();

 }

 

 void CXferSocket::Deny(UINT errCode,UINT errID)

 {

         PostError(errCode,errID);

         state=stateDeny;

 }

 

 void CRRQSocket::DoXfer()

 {

 tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize));

         ASSERT(p);

         p->SetOpcode(tftp::opDATA);

         TRY{

                 m_File.Seek(m_ACK*m_blkSize,CFile::begin);

         int bytes = m_File.Read(p->data.m_DATA.data,m_blkSize);

                 p->data.m_DATA.SetBlock(m_ACK+1);

                 p->length=p->length-m_blkSize+bytes;

                 m_LastSlack = m_blkSize-bytes;

                 PostTFTP(p);

                 if(bytes<m_blkSize){

                         state=stateFinish;

                         ASSERT(m_Daddy);

                 CString tmp;

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

                         m_Daddy->LogLine(tmp);

                 }

         }CATCH(CFileException,e){

                 Deny(e);

         }END_CATCH

 }

 

 UINT tftp::tftpDATA::tftpSize(UINT blkSize)

 {

         return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpDATA)

                 -sizeof(BYTE)+blkSize;

 }

 

 void CXferSocket::Deny(CFileException* e)

 {

         PostError(e);

         state=stateDeny;

 }

 

 void CXferSocket::PostError(UINT errCode,UINT errID)

 {

 CString msg;

         msg.LoadString(errID);

         ASSERT(m_Daddy);

         /*// ***

 CString tmp;

         tmp.Format(IDS_LOG_SENTTFTPERROR,errCode,(LPCTSTR)msg);

         m_Daddy->LogLine(tmp);

  */

 tftp* err = tftp::Allocate(tftp::tftpERROR::tftpSize(msg));

 err->SetOpcode(tftp::opERROR);

         err->errSet(errCode,msg);

         PostTFTP(err);

 }

 

 void CXferSocket::PostError(CFileException* e)

 {

 UINT eCode;

 UINT eMsgID;

         switch(e->m_cause){

         case CFileException::fileNotFound:

                 eCode=tftp::errNotFound;

                 eMsgID=IDS_TFTP_ERROR_NOTFOUND;

                 break;

         case CFileException::accessDenied:

                 eCode=tftp::errAccessViolation;

                 eMsgID=IDS_TFTP_ERROR_ACCESS;

                 break;

         case CFileException::directoryFull:

                 eCode=tftp::errDiskFull;

                 eMsgID=IDS_TFTP_ERROR_DIRFULL;

                 break;

         case CFileException::sharingViolation:

                 eCode=tftp::errAccessViolation;

                 eMsgID=IDS_TFTP_ERROR_SHARING;

                 break;

         case CFileException::diskFull:

                 eCode=tftp::errDiskFull;

                 eMsgID=IDS_TFTP_ERROR_DISKFULL;

                 break;

         default:

                 eCode=tftp::errUndefined;

                 eMsgID=IDS_TFTP_ERROR_UNDEFINED;

                 break;

         }

         PostError(eCode,eMsgID);

 }

 

 ULONG CRRQSocket::GetACK(void)

 {

         return (m_ACK*m_blkSize)-m_LastSlack;

 }

 

 BOOL CRRQSocket::OnTFTP(tftp* p)

 {

 BOOL rv = TRUE;

         switch(p->Opcode()){

         case tftp::opOACK:

                 m_ACK=0;

                 ASSERT(state!=stateFinish);

         {

         tftp::tftpOptions o;

                 if(p->GetOptions(&o)){

                 CString v;

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

                                 m_blkSize=atoi(v);

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

                                         Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);

                                         rv = TRUE;

                                         break;

                                 }

                         }

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

                                 m_timeOut=atoi(v);

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

                                         Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);

                                         rv = TRUE;

                                         break;

                                 }

                         }

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

                                 m_ACK=atoi(v);

                         }

                 }

                 UpdateList();

                 DoXfer();

         }

                 break;

         case tftp::opACK:

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

                 if(state!=stateFinish){

                         UpdateList();

                         DoXfer();

                 }

                 break;

         case tftp::opERROR:

                 {

                         ASSERT(m_Daddy);

                 CString tmp;

                         tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage());

                         m_Daddy->LogLine(tmp);

                 }

                 Destroy(FALSE);

                 rv = FALSE;

                 break;

         default:

                 ASSERT(m_Daddy);

                 m_Daddy->LogLine(IDS_LOG_XFEROPCODE);

                 // *** Self destruct maybe??

                 break;

         }

         return rv;

 }

 

 BOOL CWRQSocket::OnTFTP(tftp* p)

 {

         switch(p->Opcode()){

         case tftp::opOACK:

                 ASSERT(state!=stateFinish);

         {

                 if(m_bResume)

                         m_ACK=m_File.GetLength()/m_blkSize;

                 else

                         m_ACK=0;

         tftp::tftpOptions o;

                 if(p->GetOptions(&o)){

                 CString v;

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

                                 m_blkSize=atoi(v);

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

                                         Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);

                                         return TRUE;

                                 }

                         }

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

                                 m_timeOut=atoi(v);

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

                                         Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);

                                         return TRUE;

                                 }

                         }

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

                                 m_xferSize=atoi(v);

                         }

                 }

                 UpdateList();

                 DoXfer();

         }

                 break;

         case tftp::opDATA:

                 {

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

                 m_Daddy->LogLine(IDS_LOG_XFEROPCODE);

                 // *** 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::LogLine(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)

 {

         ints = 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;

 

         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;

 

         network.m_ListenPort=m_ListenPort;

         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;

 

         cps.AddPage(&server);

         cps.AddPage(&network);

         cps.AddPage(&sounds);

         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_ListenPort=network.m_ListenPort;

                 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;

         }

 }

 

 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;

-        TurnSlashes(m_FileName,TRUE);

         UpdateList();

-CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(m_FileName);

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

                 // *** m_WRQMode only if server transfer

                 switch(m_Daddy->m_WRQMode){

                 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;

                         }

                 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;

         state=stateXfer;

         if(oack.GetCount()){

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

                 ASSERT(p);

                 p->SetOpcode(tftp::opOACK);

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

                 PostTFTP(p,TRUE);

         }else

                 DoXfer();

         return TRUE;

 }

 

 BOOL CWRQSocket::ConfirmRequest()

 {

 CConfirmWRQDlg cd(NULL);

         cd.m_Daddy=this;

         cd.m_File=m_FileName;

         cd.m_Host=inet_ntoa(m_Peer.sin_addr);

         switch(cd.DoModal()){

         case IDOK:

                 m_Rename=FALSE;

                 m_bResume=FALSE;

                 return TRUE;

         case IDC_RENAME:

                 m_bResume=FALSE;

                 m_Rename=TRUE;

                 return TRUE;

         case IDC_RESUME:

                 m_Rename=FALSE;

                 m_bResume=TRUE;

                 return TRUE;

         case IDCANCEL:

                 return FALSE;

         }

         return FALSE;

 }

 

 BOOL CWRQSocket::RenameFile(CString& fn)

 {

 CString renamed = fn;

         if(fn.IsEmpty())

                 return FALSE;

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

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

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

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

                                 renamed = renamed.Left(op-1);

                 }

         }

 CString testFN;

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

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

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

                         continue;

                 fn=testFN;

                 return TRUE;

         }

         return FALSE;

 }

 

 BOOL CWRQSocket::SaveAs(CString& fn)

 {

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

 CString title;

         title.LoadString(IDS_RENAME_TITLE);

         cfd.m_ofn.lpstrTitle=(LPCTSTR)title;

         if(cfd.DoModal()!=IDOK)

                 return FALSE;

         fn = cfd.GetPathName();

         return TRUE;

 }

 

 void CWRQSocket::DoXfer()

 {

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

         ASSERT(p);

         p->SetOpcode(tftp::opACK);

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

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

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

 }

 

 UINT tftp::tftpACK::tftpSize()

 {

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

 }

 

 ULONG CWRQSocket::GetACK()

 {

         return (m_ACK*m_blkSize)-m_LastSlack;

 }

 

 void CXferSocket::ResetTimeout()

 {

         ASSERT(m_Daddy);

         m_Daddy->m_Retrier->KillTimer(m_hSocket);

         if(m_Retry)

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

         if(!m_bRetry){

                 m_Daddy->KillTimer(m_hSocket);

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

         }

 }

 

 void CXferSocket::Abort()

 {

         ASSERT(m_Daddy);

 CString tmp;

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

         m_Daddy->LogLine(tmp);

         Destroy(FALSE);

 }

 

 void CPumpKINDlg::OnTimer(UINT nIDEvent) 

 {

 CXferSocket *socket;

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

         CString tmp;

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

                 LogLine(tmp);

                 socket->Abort();

         }else{

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

         }

         CDialog::OnTimer(nIDEvent);

 }

 

 void CPumpKINDlg::OnExit() 

 {

         if(!m_Xfers.IsEmpty()){

         CString title,text;

                 title.LoadString(IDS_CONFIRMEXIT_TITLE);

                 text.LoadString(IDS_CONFIRMEXIT_TEXT);

                 if(MessageBox(text,title,MB_ICONQUESTION|MB_YESNO)!=IDYES)

                         return;

         }

         m_bExiting=TRUE;

         EndDialog(IDOK);

 }

 

 void CPumpKINDlg::OnPut() 

 {

 CRequestDlg crd(NULL);

         crd.m_Put=TRUE;

         crd.m_BSize=m_BlockSize;

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

         }

 }

 

 void CPumpKINDlg::OnGet() 

 {

 CRequestDlg crd(NULL);

         crd.m_Put=FALSE;

         crd.m_BSize=m_BlockSize;

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

         CWRQSocket *socket = new CWRQSocket(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();

         }

 }

 

 void CPumpKINDlg::SetupButtons()

 {

         m_AbortCtl.EnableWindow(m_List.GetSelectedCount()>0);

 }

 

 void CPumpKINDlg::OnDeleteallitemsConnections(NMHDR* pNMHDR, LRESULT* pResult) 

 {

         NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;

         SetupButtons();

         *pResult = 0;

 }

 

 void CPumpKINDlg::OnDeleteitemConnections(NMHDR* pNMHDR, LRESULT* pResult) 

 {

         NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;

         SetupButtons();

         *pResult = 0;

 }

 

 void CPumpKINDlg::OnInsertitemConnections(NMHDR* pNMHDR, LRESULT* pResult) 

 {

         NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;

         SetupButtons();

         *pResult = 0;

 }

 

 void CPumpKINDlg::OnItemchangedConnections(NMHDR* pNMHDR, LRESULT* pResult) 

 {

         NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;

         SetupButtons();

         *pResult = 0;

 }

 

 void CPumpKINDlg::OnAbort() 

 {

         if(!m_List.GetSelectedCount())

                 return;

         intitems = m_List.GetItemCount();

         for(int tmp=0;tmp<items;tmp++){

                 if(!(m_List.GetItemState(tmp,LVIS_SELECTED)&LVIS_SELECTED))

                         continue;

         CXferSocket *xfer = (CXferSocket*) m_List.GetItemData(tmp);

                 ASSERT(xfer);

                 xfer->Abort();

         }

 }

 

 void CXferSocket::OnFailedToResolve()

 {

         TRACE0("Resolve failed\n");

         delete m_wndResolver;

         m_wndResolver=NULL;

         ASSERT(m_Daddy);

 CString tmp;

         tmp.Format(IDS_LOG_RESOLVEFAILED,m_HostName);

         m_Daddy->LogLine(tmp);

         Abort();

 }

 

 void CXferSocket::OnResolved()

 {

         delete m_wndResolver;

         m_wndResolver=NULL;

         TRACE0("Resolved\n");

         m_Peer.sin_addr.s_addr = *(DWORD*)(((hostent*)m_ResolveBuff)->h_addr);

 }

 

 void CRRQSocket::OnResolved()

 {

         CXferSocket::OnResolved();

         OnHostKnown();

 }

 

 void CRRQSocket::OnHostKnown()

 {

         ASSERT(m_Daddy);

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

 tftp::tftpOptions o;

 CString v;

         ASSERT(m_xferSize>=0);

         v.Format("%lu",m_xferSize);

         o[tftpoTSize] = v;

         ASSERT(m__blkSize);

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

         o[tftpoBSize] = v;

         ASSERT(m__timeOut);

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

         o[tftpoTOut] = v;

         o[tftpoXResume] = "0";

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

         ASSERT(p);

         p->SetOpcode(tftp::opWRQ);

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

         PostTFTP(p,TRUE);

         state=stateInit;

         UpdateList();

 }

 

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

 }