invalid opcode during xfer message shows the opcode itself now.

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

2 files changed, 15 insertions, 7 deletions

diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index fc24596..b6b8a36 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -816,339 +816,347 @@ tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize));
 		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??

+		{

+			ASSERT(m_Daddy);

+			CString tmp;

+			tmp.Format(IDS_LOG_XFEROPCODE,p->Opcode());

+			m_Daddy->LogLine(tmp);

+			// *** Self destruct maybe??

+		}

 		break;

 	}

 	return rv;

 }

 

 BOOL CWRQSocket::OnTFTP(tftp* p)

 {

 	switch(p->Opcode()){

 	case tftp::opOACK:

 		ASSERT(state!=stateFinish);

 	{

 		if(m_bResume)

 			m_ACK=m_File.GetLength()/m_blkSize;

 		else

 			m_ACK=0;

 	tftp::tftpOptions o;

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

 		CString v;

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

 				m_blkSize=atoi(v);

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

 					Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);

 					return TRUE;

 				}

 			}

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

 				m_timeOut=atoi(v);

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

 					Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);

 					return TRUE;

 				}

 			}

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

 				m_xferSize=atoi(v);

 			}

 		}

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

-		m_Daddy->LogLine(IDS_LOG_XFEROPCODE);

-		// *** Self destruct maybe??

+		{

+			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::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)

 {

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

diff --git a/pumpkin.rc b/pumpkin.rc
index 7f3bbde..1bf0fd3 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -370,238 +370,238 @@ BEGIN
         RIGHTMARGIN, 174

         TOPMARGIN, 7

         BOTTOMMARGIN, 72

     END

 

     IDD_CONFIRM_WRQ, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 194

         TOPMARGIN, 7

         BOTTOMMARGIN, 88

     END

 

     IDD_REQUEST, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 184

         TOPMARGIN, 7

         BOTTOMMARGIN, 154

     END

 

     IDD_PROPS_SOUNDS, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 203

         TOPMARGIN, 7

         BOTTOMMARGIN, 147

     END

 END

 #endif    // APSTUDIO_INVOKED

 

 

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

 //

 // Bitmap

 //

 

 IDB_BACKGROUND          BITMAP  DISCARDABLE     "shared-data/klever-background.bmp"

 

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

 //

 // WAVE

 //

 

 IDR_WAVE_RING           WAVE    DISCARDABLE     "res\\ring.wav"

 IDR_WAVE_FINISHED       WAVE    DISCARDABLE     "res\\finished.wav"

 IDR_WAVE_ABORTED        WAVE    DISCARDABLE     "res\\failed.wav"

 

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

 //

 // Dialog Info

 //

 

 IDD_REQUEST DLGINIT

 BEGIN

     IDC_TYPE, 0x403, 6, 0

 0x636f, 0x6574, 0x0074, 

     IDC_TYPE, 0x403, 9, 0

 0x656e, 0x6174, 0x6373, 0x6969, "\000" 

     IDC_BSIZE, 0x403, 4, 0

 0x3135, 0x0032, 

     IDC_BSIZE, 0x403, 5, 0

 0x3031, 0x3432, "\000" 

     IDC_BSIZE, 0x403, 5, 0

 0x3032, 0x3834, "\000" 

     IDC_BSIZE, 0x403, 5, 0

 0x3034, 0x3639, "\000" 

     IDC_BSIZE, 0x403, 5, 0

 0x3138, 0x3239, "\000" 

     0

 END

 

 

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

 //

 // Menu

 //

 

 IDM_POPUPS MENU DISCARDABLE 

 BEGIN

     POPUP "&Tray"

     BEGIN

         MENUITEM "&Send File",                  ID_TRAY_SENDFILE

         MENUITEM "F&etch file",                 ID_TRAY_FETCHFILE

         MENUITEM "&Options",                    ID_TRAY_OPTIONS

         MENUITEM "Show &PumpKIN Window",        ID_TRAY_SHOWPUMPKINWINDOW

         MENUITEM "Open &Files Folder",          ID_TRAY_OPENFILESFOLDER

         MENUITEM SEPARATOR

         MENUITEM "&Help Topics",                ID_TRAY_HELP

         MENUITEM "&About PumpKIN",              ID_TRAY_ABOUTPUMPKIN

         MENUITEM SEPARATOR

         MENUITEM "E&xit",                       ID_TRAY_EXIT

     END

 END

 

 

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

 //

 // String Table

 //

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDS_ABOUTBOX            "&About PumpKIN..."

     IDS_FMT_BYTES           "%lu"

     IDP_SOCKETS_INIT_FAILED "Windows sockets initialization failed."

     IDS_TFTP_ERROR_ACCESS   "Access violation"

     IDS_TFTP_ERROR_NOTFOUND "File not found"

     IDS_TFTP_ERROR_DIRFULL  "Directory is full"

     IDS_TFTP_ERROR_SHARING  "Sharing violation"

     IDS_TFTP_ERROR_DISKFULL "Disk full"

     IDS_TFTP_ERROR_UNDEFINED "Undefined error"

     IDS_LOG_START           "PumpKIN started"

     IDS_LOG_LISTENRECEIVEERROR "Error listening for incoming connections"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDS_LOG_LISTENACCEPTERROR "Error accepting incoming connection"

     IDS_LOG_RRQSERVE        "'%s' of type '%s' is requested from %s"

     IDS_LOG_LISTENOPCODE    "Invalid opcode in initial connection request"

     IDS_LOG_XFERUDPSEND     "UDP packet send failed"

     IDS_LOG_XFERRECEIVE     "Error on xfer socket"

     IDS_LOG_XFERSEND        "Error on xfer socket"

     IDS_LOG_XFERUDPRECEIVE  "UDP packet receive failed"

     IDS_LOG_XFERSOURCETID   "Packet from unexpected source"

     IDS_LOG_SENTTFTPERROR   ":%u: %s"

     IDS_LOG_GOTTFTPERROR    "TFTP:%u: %s"

-    IDS_LOG_XFEROPCODE      "Invalid opcode during transfer received"

+    IDS_LOG_XFEROPCODE      "Invalid opcode (%u) during transfer received"

     IDS_LOG_XFERRRQFINISHED "Transfer of '%s' has successfully completed"

     IDS_TITLE_OPTIONS       "Options"

     IDS_LOG_WRQSERVE        "Writing of '%s' of type '%s' is requested by %s"

     IDS_TFTP_ERROR_FAILEDTORENAME "Too many clones of the file"

     IDS_RENAME_TITLE        "Save As"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDS_LOG_TIMEDOUT        "Transmission of '%s' is timed out"

     IDS_CONFIRMEXIT_TITLE   "Exit"

     IDS_CONFIRMEXIT_TEXT    "File transmission is currently in progress. Are you sure you want to exit?"

     IDS_LOG_XFERWRQFINISHED "Transfer of '%s' has successfully completed"

     IDS_LOG_XFERABORTED     "Transfer of '%s' was aborted"

     IDS_TITLE_PUTREQUEST    "Send file"

     IDS_TITLE_GETREQUEST    "Fetch file"

     IDS_WTALKHEADING        "Talk with "

     IDS_TITLE_BROWSEFILE    "Browse"

     IDS_LOG_RESOLVEFAILED   "Failed to resolve host address for '%s'"

     IDS_LOG_FAILEDLOCALFILE "Failed to open local file '%s'"

     IDS_LOG_FAILEDTOOPEN    "Failed to open '%s'"

     IDS_OTALXHEADING        "Open Talks: talking to "

     IDS_REGISTRYKEY         "Klever Group"

     IDS_KLEVERNET_URL       "http://www.klever.net/"

     IDS_LOGTIMEFORMAT       "%H:%M:%S %B %d"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     ID_TRAY_HELP            "Read the help on PumpKIN"

     ID_TRAY_ABOUTPUMPKIN    "Learn about PumpKIN and it's creator"

     ID_TRAY_EXIT            "Close PumpKIN"

     ID_TRAY_SENDFILE        "Send file over the network to your tete-a-tete"

     ID_TRAY_FETCHFILE       "Fetch file from remote computer"

     ID_TRAY_OPTIONS         "Set PumpKIN options"

     ID_TRAY_SHOWPUMPKINWINDOW "Show main window"

     ID_TRAY_OPENFILESFOLDER "Explore TFTP root folder"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDC_CONNECTIONS         "Active transfers"

     IDC_LOG                 "PumpKIN Activity Log"

     IDC_GET                 "Fetch file from remote server"

     IDC_PUT                 "Send file over the net"

     IDC_ABORT               "Abort transfer currently in progress"

     IDC_EXIT                "Close PumpKIN"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDC_OPTIONS             "Set PumpKIN options"

     IDC_REFRESH             "Refresh talks list"

     IDC_BROWSE              "Browse"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     ID_HELP                 "Read help on PumpKIN"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDS_DROPFILES_TITLE     "Drop Files"

     IDS_NOMULTIPLEDROP_TEXT "You can't drop more than one file here. Only the first one will be accepted"

     IDS_LOG_REQUESTING      "Requesting '%s' from '%s'"

     IDS_LOG_SENDING         "Sending '%s' to '%s'"

     IDS_WTALKAT             "@"

     IDS_OTALXAT             " at "

     IDS_TFTP_ERROR_TSIZE    "Invalid transfer size"

     IDS_TFTP_ERROR_BSIZE    "Invalid block size"

     IDS_TFTP_ERROR_TOUT     "Invalid timeout"

     IDS_SELECT_TFTPROOT     "Select TFTP filesystem root.."

     IDS_FILTER_WAV          "Sound Files (*.wav)|*.wav||"

     IDS_TITLE_WAV           "Select sound.."

     IDS_BOX_CANTBIND        "Failed to create listening socket. The port may be in use by another application."

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     AFX_IDS_APP_TITLE       "PUMPKIN"

 END

 

 #endif    // English (U.S.) resources

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

 

 

 

 #ifndef APSTUDIO_INVOKED

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

 //

 // Generated from the TEXTINCLUDE 3 resource.

 //

 #define _AFX_NO_SPLITTER_RESOURCES

 #define _AFX_NO_OLE_RESOURCES

 #define _AFX_NO_TRACKER_RESOURCES

 #define _AFX_NO_PROPERTY_RESOURCES

 

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

 #ifdef _WIN32

 LANGUAGE 9, 1

 #pragma code_page(1252)

 #endif

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

 #include "afxres.rc"         // Standard components

 #endif

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

 #endif    // not APSTUDIO_INVOKED