| author | Michael Krelin <hacker@klever.net> | 2006-10-13 19:13:18 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2006-10-13 19:13:18 (UTC) |
| commit | 325e7fc43721df3efaa8539190fada6e6e3aa8fa (patch) (side-by-side diff) | |
| tree | ec03bf74e17eb497e0fcd31b521192b0b14bd83e /PumpKINDlg.cpp | |
| parent | 577427e68ef10a4d2b75d28e42b22952ae3bcf23 (diff) | |
| download | pumpkin-325e7fc43721df3efaa8539190fada6e6e3aa8fa.zip pumpkin-325e7fc43721df3efaa8539190fada6e6e3aa8fa.tar.gz pumpkin-325e7fc43721df3efaa8539190fada6e6e3aa8fa.tar.bz2 | |
Enabled logging of outgoing errors, added reject with explicit error message
when file is too large for the block size set.
git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@192 fe716a7a-6dde-0310-88d9-d003556173a8
| -rw-r--r-- | PumpKINDlg.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp index 2a01918..bb15211 100644 --- a/PumpKINDlg.cpp +++ b/PumpKINDlg.cpp @@ -778,6 +778,11 @@ CFileException e; o[tftpoTOut]=v;
}
}
+ // XXX: see if we can enforce our preference regarding block size here.
+ if(m_xferSize >= (m_blkSize<<16)) {
+ Deny(tftp::errUndefined,IDS_TFTP_ERROR_TOOBIG);
+ return TRUE;
+ }
state = stateXfer;
m_ACK=0;
if(o.GetCount()){
@@ -878,11 +883,9 @@ 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);
|