fix for misleading error message about unexpected source

along with a double-freeing offense. When I fail to receive packet not only
I diagnose this unfortunate development, but also start talking about
packet from unexpected source which is kinda weird considering there's
no packet at all.

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

1 files changed, 1 insertions, 0 deletions

diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index f41b69f..3ff1500 100644..100755
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -540,128 +540,129 @@ tftp::tftp()
 }

 

 

 void CXferSocket::OnSend(int nErrorCode)

 {

         if(nErrorCode){

                 ASSERT(m_Daddy);

                 m_Daddy->LogLine(IDS_LOG_XFERSEND);

                 return;

         }

         if(!m_Queue.IsEmpty()){

         tftp *p = m_Queue.GetHead();

                 ASSERT(p);

                 m_Queue.RemoveHead();

                 if(!p->Send(this,&m_Peer)){

                         ASSERT(m_Daddy);

                         m_Daddy->LogLine(IDS_LOG_XFERUDPSEND);

                 }

                 delete p;

         }

         DoSelect();

         if(m_Queue.IsEmpty()){

                 switch(state){

                 case stateDeny:

                         Destroy(FALSE);

                         break;

                 case stateFinish:

                         Destroy(TRUE);

                         break;

                 }

         }

 }

 

 BOOL tftp::Send(CAsyncSocket *socket,SOCKADDR_IN* saddr)

 {

         ASSERT(socket);

 int rv = socket->SendTo(udpBase(),length,(SOCKADDR*)saddr,sizeof(SOCKADDR_IN));

         if(rv!=length)

                 return FALSE;

         return TRUE;

 }

 

 void CXferSocket::DoSelect(BOOL do_select)

 {

         if(m_Peer.sin_addr.s_addr!=INADDR_NONE)

                 AsyncSelect(FD_CLOSE|FD_READ|((m_Queue.IsEmpty()&&!do_select)?0:FD_WRITE));

 }

 

 void CXferSocket::OnReceive(int nErrorCode)

 {

         if(nErrorCode){

                 ASSERT(m_Daddy);

                 m_Daddy->LogLine(IDS_LOG_XFERRECEIVE);

                 return;

         }

         ASSERT(m_Daddy);

 DWORD fionread = 0;

         VERIFY(IOCtl(FIONREAD,&fionread));

 tftp *p = tftp::Allocate(fionread);

         ASSERT(p);

 SOCKADDR_IN sin;

         if(!p->Receive(this,fionread,&sin)){

                 m_Daddy->LogLine(IDS_LOG_XFERUDPRECEIVE);

                 delete p;

+                return;

         }else

                 if(m_Peer.sin_addr.s_addr==INADDR_NONE){

                         m_Peer.sin_addr=sin.sin_addr;

                         m_Peer.sin_port=sin.sin_port;

         }

 BOOL alive = TRUE;

         if(state==stateInit){

                 state=stateXfer;

                 m_Peer.sin_port=sin.sin_port;

                 UpdateList();

         }

         if(sin.sin_addr.s_addr!=m_Peer.sin_addr.s_addr || sin.sin_port!=m_Peer.sin_port){

                 m_Daddy->LogLine(IDS_LOG_XFERSOURCETID);

                 // *** Bounce it!

         }else{

                 alive = OnTFTP(p);

         }

         delete p;

         if(alive){

                 DoSelect();

                 ResetTimeout();

         }

 }

 

 void CXferSocket::SetPeer(SOCKADDR_IN *sin)

 {

         ASSERT(sin);

         memmove(&m_Peer,sin,sizeof(m_Peer));

 }

 

 void CXferSocket::UpdateList()

 {

         ASSERT(m_Daddy);

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

                 ASSERT(IsKindOf(RUNTIME_CLASS(CRRQSocket)) || IsKindOf(RUNTIME_CLASS(CWRQSocket)));

                 i=m_Daddy->m_List.InsertItem(0,m_FileName,IsKindOf(RUNTIME_CLASS(CRRQSocket))?m_Daddy->m_iRRQ:m_Daddy->m_iWRQ);

                 ASSERT(!(i<0));

                 m_Daddy->m_List.SetItemData(i,(DWORD)this);

         }

         m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemFile,m_FileName);

         m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemType,m_Type);

         m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemPeer,inet_ntoa(m_Peer.sin_addr));

 CString tmp;

         tmp.Format(IDS_FMT_BYTES,GetACK());

         m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemBytes,tmp);

         if(m_xferSize>=0){

                 tmp.Format(IDS_FMT_BYTES,m_xferSize);

                 m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemTSize,tmp);

         }

 }

 

 CXferSocket::CXferSocket()

         : m_wndResolver(NULL), m_Retry(NULL), m_bRetry(FALSE),

         m_blkSize(512), m_timeOut(30), m_xferSize(-1),

         m__blkSize(512), m__timeOut(30)

 {

         m_Daddy=NULL;

         m_Peer.sin_addr.s_addr=INADDR_NONE;

         m_Peer.sin_family=AF_INET;