author | Michael Krelin <hacker@klever.net> | 2004-11-04 20:04:19 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2004-11-04 20:04:19 (UTC) |
commit | a494b6d595059d6fb6464935e429176a714d490d (patch) (unidiff) | |
tree | 20b82b6d6512ace8abcc7774d0a9c9d7c0bcfbb2 | |
parent | 5f552506513653f08acc6921b8c158489a7ebbbb (diff) | |
download | pumpkin-a494b6d595059d6fb6464935e429176a714d490d.zip pumpkin-a494b6d595059d6fb6464935e429176a714d490d.tar.gz pumpkin-a494b6d595059d6fb6464935e429176a714d490d.tar.bz2 |
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
-rw-r--r-- | PumpKINDlg.cpp | 12 | ||||
-rw-r--r-- | pumpkin.rc | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp index fc24596..b6b8a36 100644 --- a/PumpKINDlg.cpp +++ b/PumpKINDlg.cpp | |||
@@ -932,27 +932,31 @@ BOOL rv = TRUE; | |||
932 | break; | 932 | break; |
933 | case tftp::opERROR: | 933 | case tftp::opERROR: |
934 | { | 934 | { |
935 | ASSERT(m_Daddy); | 935 | ASSERT(m_Daddy); |
936 | CString tmp; | 936 | CString tmp; |
937 | tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage()); | 937 | tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage()); |
938 | m_Daddy->LogLine(tmp); | 938 | m_Daddy->LogLine(tmp); |
939 | } | 939 | } |
940 | Destroy(FALSE); | 940 | Destroy(FALSE); |
941 | rv = FALSE; | 941 | rv = FALSE; |
942 | break; | 942 | break; |
943 | default: | 943 | default: |
944 | { | ||
944 | ASSERT(m_Daddy); | 945 | ASSERT(m_Daddy); |
945 | m_Daddy->LogLine(IDS_LOG_XFEROPCODE); | 946 | CString tmp; |
947 | tmp.Format(IDS_LOG_XFEROPCODE,p->Opcode()); | ||
948 | m_Daddy->LogLine(tmp); | ||
946 | // *** Self destruct maybe?? | 949 | // *** Self destruct maybe?? |
950 | } | ||
947 | break; | 951 | break; |
948 | } | 952 | } |
949 | return rv; | 953 | return rv; |
950 | } | 954 | } |
951 | 955 | ||
952 | BOOL CWRQSocket::OnTFTP(tftp* p) | 956 | BOOL CWRQSocket::OnTFTP(tftp* p) |
953 | { | 957 | { |
954 | switch(p->Opcode()){ | 958 | switch(p->Opcode()){ |
955 | case tftp::opOACK: | 959 | case tftp::opOACK: |
956 | ASSERT(state!=stateFinish); | 960 | ASSERT(state!=stateFinish); |
957 | { | 961 | { |
958 | if(m_bResume) | 962 | if(m_bResume) |
@@ -1012,27 +1016,31 @@ BOOL CWRQSocket::OnTFTP(tftp* p) | |||
1012 | } | 1016 | } |
1013 | break; | 1017 | break; |
1014 | case tftp::opERROR: | 1018 | case tftp::opERROR: |
1015 | { | 1019 | { |
1016 | ASSERT(m_Daddy); | 1020 | ASSERT(m_Daddy); |
1017 | CString tmp; | 1021 | CString tmp; |
1018 | tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage()); | 1022 | tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage()); |
1019 | m_Daddy->LogLine(tmp); | 1023 | m_Daddy->LogLine(tmp); |
1020 | } | 1024 | } |
1021 | Destroy(FALSE); | 1025 | Destroy(FALSE); |
1022 | return FALSE; | 1026 | return FALSE; |
1023 | default: | 1027 | default: |
1028 | { | ||
1024 | ASSERT(m_Daddy); | 1029 | ASSERT(m_Daddy); |
1025 | m_Daddy->LogLine(IDS_LOG_XFEROPCODE); | 1030 | CString tmp; |
1031 | tmp.Format(IDS_LOG_XFEROPCODE,p->Opcode()); | ||
1032 | m_Daddy->LogLine(tmp); | ||
1026 | // *** Self destruct maybe?? | 1033 | // *** Self destruct maybe?? |
1034 | } | ||
1027 | break; | 1035 | break; |
1028 | } | 1036 | } |
1029 | return TRUE; | 1037 | return TRUE; |
1030 | } | 1038 | } |
1031 | 1039 | ||
1032 | void tftp::SetOpcode(WORD op) | 1040 | void tftp::SetOpcode(WORD op) |
1033 | { | 1041 | { |
1034 | opcode = REVERSEBYTES(op); | 1042 | opcode = REVERSEBYTES(op); |
1035 | } | 1043 | } |
1036 | void tftp::tftpDATA::SetBlock(WORD b) | 1044 | void tftp::tftpDATA::SetBlock(WORD b) |
1037 | { | 1045 | { |
1038 | block=REVERSEBYTES(b); | 1046 | block=REVERSEBYTES(b); |
@@ -486,25 +486,25 @@ END | |||
486 | STRINGTABLE DISCARDABLE | 486 | STRINGTABLE DISCARDABLE |
487 | BEGIN | 487 | BEGIN |
488 | IDS_LOG_LISTENACCEPTERROR "Error accepting incoming connection" | 488 | IDS_LOG_LISTENACCEPTERROR "Error accepting incoming connection" |
489 | IDS_LOG_RRQSERVE "'%s' of type '%s' is requested from %s" | 489 | IDS_LOG_RRQSERVE "'%s' of type '%s' is requested from %s" |
490 | IDS_LOG_LISTENOPCODE "Invalid opcode in initial connection request" | 490 | IDS_LOG_LISTENOPCODE "Invalid opcode in initial connection request" |
491 | IDS_LOG_XFERUDPSEND "UDP packet send failed" | 491 | IDS_LOG_XFERUDPSEND "UDP packet send failed" |
492 | IDS_LOG_XFERRECEIVE "Error on xfer socket" | 492 | IDS_LOG_XFERRECEIVE "Error on xfer socket" |
493 | IDS_LOG_XFERSEND "Error on xfer socket" | 493 | IDS_LOG_XFERSEND "Error on xfer socket" |
494 | IDS_LOG_XFERUDPRECEIVE "UDP packet receive failed" | 494 | IDS_LOG_XFERUDPRECEIVE "UDP packet receive failed" |
495 | IDS_LOG_XFERSOURCETID "Packet from unexpected source" | 495 | IDS_LOG_XFERSOURCETID "Packet from unexpected source" |
496 | IDS_LOG_SENTTFTPERROR ":%u: %s" | 496 | IDS_LOG_SENTTFTPERROR ":%u: %s" |
497 | IDS_LOG_GOTTFTPERROR "TFTP:%u: %s" | 497 | IDS_LOG_GOTTFTPERROR "TFTP:%u: %s" |
498 | IDS_LOG_XFEROPCODE "Invalid opcode during transfer received" | 498 | IDS_LOG_XFEROPCODE "Invalid opcode (%u) during transfer received" |
499 | IDS_LOG_XFERRRQFINISHED "Transfer of '%s' has successfully completed" | 499 | IDS_LOG_XFERRRQFINISHED "Transfer of '%s' has successfully completed" |
500 | IDS_TITLE_OPTIONS "Options" | 500 | IDS_TITLE_OPTIONS "Options" |
501 | IDS_LOG_WRQSERVE "Writing of '%s' of type '%s' is requested by %s" | 501 | IDS_LOG_WRQSERVE "Writing of '%s' of type '%s' is requested by %s" |
502 | IDS_TFTP_ERROR_FAILEDTORENAME "Too many clones of the file" | 502 | IDS_TFTP_ERROR_FAILEDTORENAME "Too many clones of the file" |
503 | IDS_RENAME_TITLE "Save As" | 503 | IDS_RENAME_TITLE "Save As" |
504 | END | 504 | END |
505 | 505 | ||
506 | STRINGTABLE DISCARDABLE | 506 | STRINGTABLE DISCARDABLE |
507 | BEGIN | 507 | BEGIN |
508 | IDS_LOG_TIMEDOUT "Transmission of '%s' is timed out" | 508 | IDS_LOG_TIMEDOUT "Transmission of '%s' is timed out" |
509 | IDS_CONFIRMEXIT_TITLE "Exit" | 509 | IDS_CONFIRMEXIT_TITLE "Exit" |
510 | IDS_CONFIRMEXIT_TEXT "File transmission is currently in progress. Are you sure you want to exit?" | 510 | IDS_CONFIRMEXIT_TEXT "File transmission is currently in progress. Are you sure you want to exit?" |