-rw-r--r-- | PumpKINDlg.cpp | 7 | ||||
-rw-r--r-- | pumpkin.rc | 5 | ||||
-rw-r--r-- | resource.h | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp index 2a01918..bb15211 100644 --- a/PumpKINDlg.cpp +++ b/PumpKINDlg.cpp | |||
@@ -749,64 +749,69 @@ CFileException e; | |||
749 | inAddr=inAddr.Mid(at+1); | 749 | inAddr=inAddr.Mid(at+1); |
750 | if((m_Peer.sin_addr.s_addr=inet_addr((LPCTSTR)inAddr))==INADDR_NONE){ | 750 | if((m_Peer.sin_addr.s_addr=inet_addr((LPCTSTR)inAddr))==INADDR_NONE){ |
751 | ASSERT(!m_wndResolver); | 751 | ASSERT(!m_wndResolver); |
752 | m_wndResolver = new CResolver(this); | 752 | m_wndResolver = new CResolver(this); |
753 | ASSERT(m_wndResolver); | 753 | ASSERT(m_wndResolver); |
754 | return m_wndResolver->Resolve(); | 754 | return m_wndResolver->Resolve(); |
755 | } | 755 | } |
756 | else | 756 | else |
757 | OnHostKnown(); | 757 | OnHostKnown(); |
758 | }else{ | 758 | }else{ |
759 | tftp::tftpOptions o; | 759 | tftp::tftpOptions o; |
760 | CString v; | 760 | CString v; |
761 | if(m_Options.Lookup(tftpoBSize,v)){ | 761 | if(m_Options.Lookup(tftpoBSize,v)){ |
762 | m__blkSize=atoi(v); | 762 | m__blkSize=atoi(v); |
763 | if(m__blkSize){ | 763 | if(m__blkSize){ |
764 | m_blkSize=m__blkSize; | 764 | m_blkSize=m__blkSize; |
765 | v.Format("%u",m_blkSize); | 765 | v.Format("%u",m_blkSize); |
766 | o[tftpoBSize]=v; | 766 | o[tftpoBSize]=v; |
767 | } | 767 | } |
768 | } | 768 | } |
769 | if(m_Options.Lookup(tftpoTSize,v)){ | 769 | if(m_Options.Lookup(tftpoTSize,v)){ |
770 | v.Format("%lu",m_xferSize); | 770 | v.Format("%lu",m_xferSize); |
771 | o[tftpoTSize]=v; | 771 | o[tftpoTSize]=v; |
772 | } | 772 | } |
773 | if(m_Options.Lookup(tftpoTOut,v)){ | 773 | if(m_Options.Lookup(tftpoTOut,v)){ |
774 | m__timeOut=atoi(v); | 774 | m__timeOut=atoi(v); |
775 | if(m__timeOut){ | 775 | if(m__timeOut){ |
776 | m_timeOut=m__timeOut; | 776 | m_timeOut=m__timeOut; |
777 | v.Format("%u",m_timeOut); | 777 | v.Format("%u",m_timeOut); |
778 | o[tftpoTOut]=v; | 778 | o[tftpoTOut]=v; |
779 | } | 779 | } |
780 | } | 780 | } |
781 | // XXX: see if we can enforce our preference regarding block size here. | ||
782 | if(m_xferSize >= (m_blkSize<<16)) { | ||
783 | Deny(tftp::errUndefined,IDS_TFTP_ERROR_TOOBIG); | ||
784 | return TRUE; | ||
785 | } | ||
781 | state = stateXfer; | 786 | state = stateXfer; |
782 | m_ACK=0; | 787 | m_ACK=0; |
783 | if(o.GetCount()){ | 788 | if(o.GetCount()){ |
784 | tftp *p = tftp::Allocate(tftp::tftpOACK::tftpSize(&o)); | 789 | tftp *p = tftp::Allocate(tftp::tftpOACK::tftpSize(&o)); |
785 | ASSERT(p); | 790 | ASSERT(p); |
786 | p->SetOpcode(tftp::opOACK); | 791 | p->SetOpcode(tftp::opOACK); |
787 | p->data.m_OACK.Set(&o); | 792 | p->data.m_OACK.Set(&o); |
788 | PostTFTP(p,TRUE); | 793 | PostTFTP(p,TRUE); |
789 | }else | 794 | }else |
790 | DoXfer(); | 795 | DoXfer(); |
791 | } | 796 | } |
792 | return TRUE; | 797 | return TRUE; |
793 | } | 798 | } |
794 | 799 | ||
795 | CRRQSocket::CRRQSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin) | 800 | CRRQSocket::CRRQSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin) |
796 | : CXferSocket(daddy,fileName,type,sin) | 801 | : CXferSocket(daddy,fileName,type,sin) |
797 | { | 802 | { |
798 | m_ACK=0; | 803 | m_ACK=0; |
799 | m_LastSlack=0; | 804 | m_LastSlack=0; |
800 | } | 805 | } |
801 | 806 | ||
802 | UINT tftp::tftpERROR::tftpSize(LPCTSTR msg) | 807 | UINT tftp::tftpERROR::tftpSize(LPCTSTR msg) |
803 | { | 808 | { |
804 | return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpERROR::tftpErrorCode)+strlen(msg)+1; | 809 | return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpERROR::tftpErrorCode)+strlen(msg)+1; |
805 | } | 810 | } |
806 | 811 | ||
807 | tftp* tftp::Allocate(UINT tftpSize) | 812 | tftp* tftp::Allocate(UINT tftpSize) |
808 | { | 813 | { |
809 | ASSERT(tftpSize); | 814 | ASSERT(tftpSize); |
810 | tftp* rv = (tftp*) new BYTE[tftpSlackSize+tftpSize]; | 815 | tftp* rv = (tftp*) new BYTE[tftpSlackSize+tftpSize]; |
811 | ASSERT(rv); | 816 | ASSERT(rv); |
812 | rv->length=tftpSize; | 817 | rv->length=tftpSize; |
@@ -849,69 +854,67 @@ tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize)); | |||
849 | TRY{ | 854 | TRY{ |
850 | m_File.Seek(m_ACK*m_blkSize,CFile::begin); | 855 | m_File.Seek(m_ACK*m_blkSize,CFile::begin); |
851 | int bytes = m_File.Read(p->data.m_DATA.data,m_blkSize); | 856 | int bytes = m_File.Read(p->data.m_DATA.data,m_blkSize); |
852 | p->data.m_DATA.SetBlock(m_ACK+1); | 857 | p->data.m_DATA.SetBlock(m_ACK+1); |
853 | p->length=p->length-m_blkSize+bytes; | 858 | p->length=p->length-m_blkSize+bytes; |
854 | m_LastSlack = m_blkSize-bytes; | 859 | m_LastSlack = m_blkSize-bytes; |
855 | PostTFTP(p); | 860 | PostTFTP(p); |
856 | if(bytes<m_blkSize){ | 861 | if(bytes<m_blkSize){ |
857 | state=stateClosing; m_ACKtoClose = m_ACK+1; | 862 | state=stateClosing; m_ACKtoClose = m_ACK+1; |
858 | } | 863 | } |
859 | }CATCH(CFileException,e){ | 864 | }CATCH(CFileException,e){ |
860 | Deny(e); | 865 | Deny(e); |
861 | }END_CATCH | 866 | }END_CATCH |
862 | } | 867 | } |
863 | 868 | ||
864 | UINT tftp::tftpDATA::tftpSize(UINT blkSize) | 869 | UINT tftp::tftpDATA::tftpSize(UINT blkSize) |
865 | { | 870 | { |
866 | return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpDATA) | 871 | return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpDATA) |
867 | -sizeof(BYTE)+blkSize; | 872 | -sizeof(BYTE)+blkSize; |
868 | } | 873 | } |
869 | 874 | ||
870 | void CXferSocket::Deny(CFileException* e) | 875 | void CXferSocket::Deny(CFileException* e) |
871 | { | 876 | { |
872 | PostError(e); | 877 | PostError(e); |
873 | state=stateDeny; | 878 | state=stateDeny; |
874 | } | 879 | } |
875 | 880 | ||
876 | void CXferSocket::PostError(UINT errCode,UINT errID) | 881 | void CXferSocket::PostError(UINT errCode,UINT errID) |
877 | { | 882 | { |
878 | CString msg; | 883 | CString msg; |
879 | msg.LoadString(errID); | 884 | msg.LoadString(errID); |
880 | ASSERT(m_Daddy); | 885 | ASSERT(m_Daddy); |
881 | /*// *** | ||
882 | CString tmp; | 886 | CString tmp; |
883 | tmp.Format(IDS_LOG_SENTTFTPERROR,errCode,(LPCTSTR)msg); | 887 | tmp.Format(IDS_LOG_SENTTFTPERROR,errCode,(LPCTSTR)msg); |
884 | m_Daddy->LogLine(tmp); | 888 | m_Daddy->LogLine(tmp); |
885 | */ | ||
886 | tftp* err = tftp::Allocate(tftp::tftpERROR::tftpSize(msg)); | 889 | tftp* err = tftp::Allocate(tftp::tftpERROR::tftpSize(msg)); |
887 | err->SetOpcode(tftp::opERROR); | 890 | err->SetOpcode(tftp::opERROR); |
888 | err->errSet(errCode,msg); | 891 | err->errSet(errCode,msg); |
889 | PostTFTP(err); | 892 | PostTFTP(err); |
890 | } | 893 | } |
891 | 894 | ||
892 | void CXferSocket::PostError(CFileException* e) | 895 | void CXferSocket::PostError(CFileException* e) |
893 | { | 896 | { |
894 | UINT eCode; | 897 | UINT eCode; |
895 | UINT eMsgID; | 898 | UINT eMsgID; |
896 | switch(e->m_cause){ | 899 | switch(e->m_cause){ |
897 | case CFileException::fileNotFound: | 900 | case CFileException::fileNotFound: |
898 | eCode=tftp::errNotFound; | 901 | eCode=tftp::errNotFound; |
899 | eMsgID=IDS_TFTP_ERROR_NOTFOUND; | 902 | eMsgID=IDS_TFTP_ERROR_NOTFOUND; |
900 | break; | 903 | break; |
901 | case CFileException::accessDenied: | 904 | case CFileException::accessDenied: |
902 | eCode=tftp::errAccessViolation; | 905 | eCode=tftp::errAccessViolation; |
903 | eMsgID=IDS_TFTP_ERROR_ACCESS; | 906 | eMsgID=IDS_TFTP_ERROR_ACCESS; |
904 | break; | 907 | break; |
905 | case CFileException::directoryFull: | 908 | case CFileException::directoryFull: |
906 | eCode=tftp::errDiskFull; | 909 | eCode=tftp::errDiskFull; |
907 | eMsgID=IDS_TFTP_ERROR_DIRFULL; | 910 | eMsgID=IDS_TFTP_ERROR_DIRFULL; |
908 | break; | 911 | break; |
909 | case CFileException::sharingViolation: | 912 | case CFileException::sharingViolation: |
910 | eCode=tftp::errAccessViolation; | 913 | eCode=tftp::errAccessViolation; |
911 | eMsgID=IDS_TFTP_ERROR_SHARING; | 914 | eMsgID=IDS_TFTP_ERROR_SHARING; |
912 | break; | 915 | break; |
913 | case CFileException::diskFull: | 916 | case CFileException::diskFull: |
914 | eCode=tftp::errDiskFull; | 917 | eCode=tftp::errDiskFull; |
915 | eMsgID=IDS_TFTP_ERROR_DISKFULL; | 918 | eMsgID=IDS_TFTP_ERROR_DISKFULL; |
916 | break; | 919 | break; |
917 | default: | 920 | default: |
@@ -68,65 +68,65 @@ END | |||
68 | IDI_RRQ ICON DISCARDABLE "res\\wrq.ico" | 68 | IDI_RRQ ICON DISCARDABLE "res\\wrq.ico" |
69 | IDI_WRQ ICON DISCARDABLE "res\\rrq.ico" | 69 | IDI_WRQ ICON DISCARDABLE "res\\rrq.ico" |
70 | IDI_BROWSE ICON DISCARDABLE "shared-data/browse-icon.ico" | 70 | IDI_BROWSE ICON DISCARDABLE "shared-data/browse-icon.ico" |
71 | IDR_MAINFRAME ICON DISCARDABLE "res\\pumpkin.ico" | 71 | IDR_MAINFRAME ICON DISCARDABLE "res\\pumpkin.ico" |
72 | IDI_PLAY ICON DISCARDABLE "shared-data/play-icon.ico" | 72 | IDI_PLAY ICON DISCARDABLE "shared-data/play-icon.ico" |
73 | IDI_UP ICON DISCARDABLE "res\\up.ico" | 73 | IDI_UP ICON DISCARDABLE "res\\up.ico" |
74 | IDI_DOWN ICON DISCARDABLE "res\\down.ico" | 74 | IDI_DOWN ICON DISCARDABLE "res\\down.ico" |
75 | IDI_REMOVE ICON DISCARDABLE "res\\remove.ico" | 75 | IDI_REMOVE ICON DISCARDABLE "res\\remove.ico" |
76 | 76 | ||
77 | ///////////////////////////////////////////////////////////////////////////// | 77 | ///////////////////////////////////////////////////////////////////////////// |
78 | // | 78 | // |
79 | // Dialog | 79 | // Dialog |
80 | // | 80 | // |
81 | 81 | ||
82 | IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 74 | 82 | IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 74 |
83 | STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | 83 | STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU |
84 | CAPTION "About PumpKIN" | 84 | CAPTION "About PumpKIN" |
85 | FONT 8, "MS Sans Serif" | 85 | FONT 8, "MS Sans Serif" |
86 | BEGIN | 86 | BEGIN |
87 | ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20 | 87 | ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20 |
88 | LTEXT "PumpKIN, Version 2.7.1",IDC_STATIC,40,15,119,8, | 88 | LTEXT "PumpKIN, Version 2.7.1",IDC_STATIC,40,15,119,8, |
89 | SS_NOPREFIX | 89 | SS_NOPREFIX |
90 | LTEXT "Copyright © 1997-2006 Klever Group",IDC_STATIC,40,30, | 90 | LTEXT "Copyright © 1997-2006 Klever Group",IDC_STATIC,40,30, |
91 | 170,8 | 91 | 170,8 |
92 | DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP | 92 | DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP |
93 | PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14 | 93 | PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14 |
94 | END | 94 | END |
95 | 95 | ||
96 | IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 193 | 96 | IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 193 |
97 | STYLE DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | 97 | STYLE DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME |
98 | EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW | 98 | EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW |
99 | CAPTION " PumpKIN" | 99 | CAPTION " PumpKIN" |
100 | FONT 8, "MS Sans Serif" | 100 | FONT 8, "MS Sans Serif", 0, 0, 0x1 |
101 | BEGIN | 101 | BEGIN |
102 | CONTROL "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT | | 102 | CONTROL "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT | |
103 | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,7,295,108, | 103 | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,7,295,108, |
104 | WS_EX_DLGMODALFRAME | 104 | WS_EX_DLGMODALFRAME |
105 | PUSHBUTTON "&Get File",IDC_GET,305,7,50,17,BS_NOTIFY, | 105 | PUSHBUTTON "&Get File",IDC_GET,305,7,50,17,BS_NOTIFY, |
106 | WS_EX_CLIENTEDGE | 106 | WS_EX_CLIENTEDGE |
107 | PUSHBUTTON "&Put File",IDC_PUT,305,25,50,17,BS_NOTIFY, | 107 | PUSHBUTTON "&Put File",IDC_PUT,305,25,50,17,BS_NOTIFY, |
108 | WS_EX_CLIENTEDGE | 108 | WS_EX_CLIENTEDGE |
109 | PUSHBUTTON "&Abort xfer",IDC_ABORT,305,43,50,17,BS_NOTIFY, | 109 | PUSHBUTTON "&Abort xfer",IDC_ABORT,305,43,50,17,BS_NOTIFY, |
110 | WS_EX_CLIENTEDGE | 110 | WS_EX_CLIENTEDGE |
111 | PUSHBUTTON "&Options",IDC_OPTIONS,305,61,50,17,BS_NOTIFY, | 111 | PUSHBUTTON "&Options",IDC_OPTIONS,305,61,50,17,BS_NOTIFY, |
112 | WS_EX_CLIENTEDGE | 112 | WS_EX_CLIENTEDGE |
113 | PUSHBUTTON "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE | 113 | PUSHBUTTON "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE |
114 | PUSHBUTTON "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE | 114 | PUSHBUTTON "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE |
115 | LISTBOX IDC_LOG,7,115,348,64,LBS_USETABSTOPS | | 115 | LISTBOX IDC_LOG,7,115,348,64,LBS_USETABSTOPS | |
116 | LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL | | 116 | LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL | |
117 | WS_HSCROLL,WS_EX_DLGMODALFRAME | 117 | WS_HSCROLL,WS_EX_DLGMODALFRAME |
118 | PUSHBUTTON "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP | 118 | PUSHBUTTON "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP |
119 | CONTROL "&Server is running",IDC_LISTENING,"Button", | 119 | CONTROL "&Server is running",IDC_LISTENING,"Button", |
120 | BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_FLAT | WS_TABSTOP,286, | 120 | BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_FLAT | WS_TABSTOP,286, |
121 | 181,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE | 121 | 181,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE |
122 | END | 122 | END |
123 | 123 | ||
124 | IDD_PROPS_SERVER DIALOG DISCARDABLE 0, 0, 300, 201 | 124 | IDD_PROPS_SERVER DIALOG DISCARDABLE 0, 0, 300, 201 |
125 | STYLE WS_CHILD | WS_DISABLED | WS_CAPTION | 125 | STYLE WS_CHILD | WS_DISABLED | WS_CAPTION |
126 | CAPTION "Server" | 126 | CAPTION "Server" |
127 | FONT 8, "MS Sans Serif" | 127 | FONT 8, "MS Sans Serif" |
128 | BEGIN | 128 | BEGIN |
129 | GROUPBOX "TFTP filesystem &root (download path)",IDC_STATIC,7,7, | 129 | GROUPBOX "TFTP filesystem &root (download path)",IDC_STATIC,7,7, |
130 | 286,38 | 130 | 286,38 |
131 | EDITTEXT IDC_TFTPROOT,13,16,256,13,ES_AUTOHSCROLL | 131 | EDITTEXT IDC_TFTPROOT,13,16,256,13,ES_AUTOHSCROLL |
132 | PUSHBUTTON "&B",IDC_BROWSE,274,16,13,13,BS_ICON | 132 | PUSHBUTTON "&B",IDC_BROWSE,274,16,13,13,BS_ICON |
@@ -533,65 +533,65 @@ END | |||
533 | 533 | ||
534 | 534 | ||
535 | ///////////////////////////////////////////////////////////////////////////// | 535 | ///////////////////////////////////////////////////////////////////////////// |
536 | // | 536 | // |
537 | // String Table | 537 | // String Table |
538 | // | 538 | // |
539 | 539 | ||
540 | STRINGTABLE DISCARDABLE | 540 | STRINGTABLE DISCARDABLE |
541 | BEGIN | 541 | BEGIN |
542 | IDS_ABOUTBOX "&About PumpKIN..." | 542 | IDS_ABOUTBOX "&About PumpKIN..." |
543 | IDS_FMT_BYTES "%lu" | 543 | IDS_FMT_BYTES "%lu" |
544 | IDP_SOCKETS_INIT_FAILED "Windows sockets initialization failed." | 544 | IDP_SOCKETS_INIT_FAILED "Windows sockets initialization failed." |
545 | IDS_TFTP_ERROR_ACCESS "Access violation" | 545 | IDS_TFTP_ERROR_ACCESS "Access violation" |
546 | IDS_TFTP_ERROR_NOTFOUND "File not found" | 546 | IDS_TFTP_ERROR_NOTFOUND "File not found" |
547 | IDS_TFTP_ERROR_DIRFULL "Directory is full" | 547 | IDS_TFTP_ERROR_DIRFULL "Directory is full" |
548 | IDS_TFTP_ERROR_SHARING "Sharing violation" | 548 | IDS_TFTP_ERROR_SHARING "Sharing violation" |
549 | IDS_TFTP_ERROR_DISKFULL "Disk full" | 549 | IDS_TFTP_ERROR_DISKFULL "Disk full" |
550 | IDS_TFTP_ERROR_UNDEFINED "Undefined error" | 550 | IDS_TFTP_ERROR_UNDEFINED "Undefined error" |
551 | IDS_LOG_START "PumpKIN started" | 551 | IDS_LOG_START "PumpKIN started" |
552 | IDS_LOG_LISTENRECEIVEERROR "Error listening for incoming connections" | 552 | IDS_LOG_LISTENRECEIVEERROR "Error listening for incoming connections" |
553 | END | 553 | END |
554 | 554 | ||
555 | STRINGTABLE DISCARDABLE | 555 | STRINGTABLE DISCARDABLE |
556 | BEGIN | 556 | BEGIN |
557 | IDS_LOG_LISTENACCEPTERROR "Error accepting incoming connection" | 557 | IDS_LOG_LISTENACCEPTERROR "Error accepting incoming connection" |
558 | IDS_LOG_RRQSERVE "'%s' of type '%s' is requested from %s" | 558 | IDS_LOG_RRQSERVE "'%s' of type '%s' is requested from %s" |
559 | IDS_LOG_LISTENOPCODE "Invalid opcode in initial connection request" | 559 | IDS_LOG_LISTENOPCODE "Invalid opcode in initial connection request" |
560 | IDS_LOG_XFERUDPSEND "UDP packet send failed" | 560 | IDS_LOG_XFERUDPSEND "UDP packet send failed" |
561 | IDS_LOG_XFERRECEIVE "Error on xfer socket" | 561 | IDS_LOG_XFERRECEIVE "Error on xfer socket" |
562 | IDS_LOG_XFERSEND "Error on xfer socket" | 562 | IDS_LOG_XFERSEND "Error on xfer socket" |
563 | IDS_LOG_XFERUDPRECEIVE "UDP packet receive failed" | 563 | IDS_LOG_XFERUDPRECEIVE "UDP packet receive failed" |
564 | IDS_LOG_XFERSOURCETID "Packet from unexpected source" | 564 | IDS_LOG_XFERSOURCETID "Packet from unexpected source" |
565 | IDS_LOG_SENTTFTPERROR ":%u: %s" | 565 | IDS_LOG_SENTTFTPERROR ">> %u: %s" |
566 | IDS_LOG_GOTTFTPERROR "TFTP:%u: %s" | 566 | IDS_LOG_GOTTFTPERROR "TFTP:%u: %s" |
567 | IDS_LOG_XFEROPCODE "Invalid opcode (%u) during transfer received" | 567 | IDS_LOG_XFEROPCODE "Invalid opcode (%u) during transfer received" |
568 | IDS_LOG_XFERRRQFINISHED "Transfer of '%s' has successfully completed" | 568 | IDS_LOG_XFERRRQFINISHED "Transfer of '%s' has successfully completed" |
569 | IDS_TITLE_OPTIONS "Options" | 569 | IDS_TITLE_OPTIONS "Options" |
570 | IDS_LOG_WRQSERVE "Writing of '%s' of type '%s' is requested by %s" | 570 | IDS_LOG_WRQSERVE "Writing of '%s' of type '%s' is requested by %s" |
571 | IDS_TFTP_ERROR_FAILEDTORENAME "Too many clones of the file" | 571 | IDS_TFTP_ERROR_FAILEDTORENAME "Too many clones of the file" |
572 | IDS_RENAME_TITLE "Save As" | 572 | IDS_RENAME_TITLE "Save As" |
573 | END | 573 | END |
574 | 574 | ||
575 | STRINGTABLE DISCARDABLE | 575 | STRINGTABLE DISCARDABLE |
576 | BEGIN | 576 | BEGIN |
577 | IDS_LOG_TIMEDOUT "Transmission of '%s' is timed out" | 577 | IDS_LOG_TIMEDOUT "Transmission of '%s' is timed out" |
578 | IDS_CONFIRMEXIT_TITLE "Exit" | 578 | IDS_CONFIRMEXIT_TITLE "Exit" |
579 | IDS_CONFIRMEXIT_TEXT "File transmission is currently in progress. Are you sure you want to exit?" | 579 | IDS_CONFIRMEXIT_TEXT "File transmission is currently in progress. Are you sure you want to exit?" |
580 | IDS_LOG_XFERWRQFINISHED "Transfer of '%s' has successfully completed" | 580 | IDS_LOG_XFERWRQFINISHED "Transfer of '%s' has successfully completed" |
581 | IDS_LOG_XFERABORTED "Transfer of '%s' was aborted" | 581 | IDS_LOG_XFERABORTED "Transfer of '%s' was aborted" |
582 | IDS_TITLE_PUTREQUEST "Send file" | 582 | IDS_TITLE_PUTREQUEST "Send file" |
583 | IDS_TITLE_GETREQUEST "Fetch file" | 583 | IDS_TITLE_GETREQUEST "Fetch file" |
584 | IDS_WTALKHEADING "Talk with " | 584 | IDS_WTALKHEADING "Talk with " |
585 | IDS_TITLE_BROWSEFILE "Browse" | 585 | IDS_TITLE_BROWSEFILE "Browse" |
586 | IDS_LOG_RESOLVEFAILED "Failed to resolve host address for '%s'" | 586 | IDS_LOG_RESOLVEFAILED "Failed to resolve host address for '%s'" |
587 | IDS_LOG_FAILEDLOCALFILE "Failed to open local file '%s'" | 587 | IDS_LOG_FAILEDLOCALFILE "Failed to open local file '%s'" |
588 | IDS_LOG_FAILEDTOOPEN "Failed to open '%s'" | 588 | IDS_LOG_FAILEDTOOPEN "Failed to open '%s'" |
589 | IDS_OTALXHEADING "Open Talks: talking to " | 589 | IDS_OTALXHEADING "Open Talks: talking to " |
590 | IDS_REGISTRYKEY "Klever Group" | 590 | IDS_REGISTRYKEY "Klever Group" |
591 | IDS_KLEVERNET_URL "http://www.klever.net/" | 591 | IDS_KLEVERNET_URL "http://www.klever.net/" |
592 | IDS_LOGTIMEFORMAT "%H:%M:%S %B %d" | 592 | IDS_LOGTIMEFORMAT "%H:%M:%S %B %d" |
593 | END | 593 | END |
594 | 594 | ||
595 | STRINGTABLE DISCARDABLE | 595 | STRINGTABLE DISCARDABLE |
596 | BEGIN | 596 | BEGIN |
597 | ID_TRAY_HELP "Read the help on PumpKIN" | 597 | ID_TRAY_HELP "Read the help on PumpKIN" |
@@ -627,60 +627,61 @@ BEGIN | |||
627 | ID_HELP "Read help on PumpKIN" | 627 | ID_HELP "Read help on PumpKIN" |
628 | END | 628 | END |
629 | 629 | ||
630 | STRINGTABLE DISCARDABLE | 630 | STRINGTABLE DISCARDABLE |
631 | BEGIN | 631 | BEGIN |
632 | IDS_DROPFILES_TITLE "Drop Files" | 632 | IDS_DROPFILES_TITLE "Drop Files" |
633 | IDS_NOMULTIPLEDROP_TEXT "You can't drop more than one file here. Only the first one will be accepted" | 633 | IDS_NOMULTIPLEDROP_TEXT "You can't drop more than one file here. Only the first one will be accepted" |
634 | IDS_LOG_REQUESTING "Requesting '%s' from '%s'" | 634 | IDS_LOG_REQUESTING "Requesting '%s' from '%s'" |
635 | IDS_LOG_SENDING "Sending '%s' to '%s'" | 635 | IDS_LOG_SENDING "Sending '%s' to '%s'" |
636 | IDS_WTALKAT "@" | 636 | IDS_WTALKAT "@" |
637 | IDS_OTALXAT " at " | 637 | IDS_OTALXAT " at " |
638 | IDS_TFTP_ERROR_TSIZE "Invalid transfer size" | 638 | IDS_TFTP_ERROR_TSIZE "Invalid transfer size" |
639 | IDS_TFTP_ERROR_BSIZE "Invalid block size" | 639 | IDS_TFTP_ERROR_BSIZE "Invalid block size" |
640 | IDS_TFTP_ERROR_TOUT "Invalid timeout" | 640 | IDS_TFTP_ERROR_TOUT "Invalid timeout" |
641 | IDS_SELECT_TFTPROOT "Select TFTP filesystem root.." | 641 | IDS_SELECT_TFTPROOT "Select TFTP filesystem root.." |
642 | IDS_FILTER_WAV "Sound Files (*.wav)|*.wav||" | 642 | IDS_FILTER_WAV "Sound Files (*.wav)|*.wav||" |
643 | IDS_TITLE_WAV "Select sound.." | 643 | IDS_TITLE_WAV "Select sound.." |
644 | IDS_BOX_CANTBIND "Failed to create listening socket. The port may be in use by another application." | 644 | IDS_BOX_CANTBIND "Failed to create listening socket. The port may be in use by another application." |
645 | IDS_NO_XFER_OP "No request type specified." | 645 | IDS_NO_XFER_OP "No request type specified." |
646 | IDS_INVALID_IP "Invalid IP address." | 646 | IDS_INVALID_IP "Invalid IP address." |
647 | IDS_INVALID_NETMASK "Invalid netmask." | 647 | IDS_INVALID_NETMASK "Invalid netmask." |
648 | END | 648 | END |
649 | 649 | ||
650 | STRINGTABLE DISCARDABLE | 650 | STRINGTABLE DISCARDABLE |
651 | BEGIN | 651 | BEGIN |
652 | AFX_IDS_APP_TITLE "PUMPKIN" | 652 | AFX_IDS_APP_TITLE "PUMPKIN" |
653 | END | 653 | END |
654 | 654 | ||
655 | STRINGTABLE DISCARDABLE | 655 | STRINGTABLE DISCARDABLE |
656 | BEGIN | 656 | BEGIN |
657 | IDS_INVALID_RULE "Invalid access rule." | 657 | IDS_INVALID_RULE "Invalid access rule." |
658 | IDS_LOG_LOGERROR "Error logging to '%s'" | 658 | IDS_LOG_LOGERROR "Error logging to '%s'" |
659 | IDS_TFTP_ERROR_TOOBIG "File is too big, try increasing block size" | ||
659 | END | 660 | END |
660 | 661 | ||
661 | #endif // English (U.S.) resources | 662 | #endif // English (U.S.) resources |
662 | ///////////////////////////////////////////////////////////////////////////// | 663 | ///////////////////////////////////////////////////////////////////////////// |
663 | 664 | ||
664 | 665 | ||
665 | 666 | ||
666 | #ifndef APSTUDIO_INVOKED | 667 | #ifndef APSTUDIO_INVOKED |
667 | ///////////////////////////////////////////////////////////////////////////// | 668 | ///////////////////////////////////////////////////////////////////////////// |
668 | // | 669 | // |
669 | // Generated from the TEXTINCLUDE 3 resource. | 670 | // Generated from the TEXTINCLUDE 3 resource. |
670 | // | 671 | // |
671 | #define _AFX_NO_SPLITTER_RESOURCES | 672 | #define _AFX_NO_SPLITTER_RESOURCES |
672 | #define _AFX_NO_OLE_RESOURCES | 673 | #define _AFX_NO_OLE_RESOURCES |
673 | #define _AFX_NO_TRACKER_RESOURCES | 674 | #define _AFX_NO_TRACKER_RESOURCES |
674 | #define _AFX_NO_PROPERTY_RESOURCES | 675 | #define _AFX_NO_PROPERTY_RESOURCES |
675 | 676 | ||
676 | #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) | 677 | #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) |
677 | #ifdef _WIN32 | 678 | #ifdef _WIN32 |
678 | LANGUAGE 9, 1 | 679 | LANGUAGE 9, 1 |
679 | #pragma code_page(1252) | 680 | #pragma code_page(1252) |
680 | #endif | 681 | #endif |
681 | #include "res\PumpKIN.rc2" // non-Microsoft Visual C++ edited resources | 682 | #include "res\PumpKIN.rc2" // non-Microsoft Visual C++ edited resources |
682 | #include "afxres.rc" // Standard components | 683 | #include "afxres.rc" // Standard components |
683 | #endif | 684 | #endif |
684 | ///////////////////////////////////////////////////////////////////////////// | 685 | ///////////////////////////////////////////////////////////////////////////// |
685 | #endif // not APSTUDIO_INVOKED | 686 | #endif // not APSTUDIO_INVOKED |
686 | 687 | ||
@@ -59,64 +59,66 @@ | |||
59 | #define IDD_PROPS_SOUNDS 138 | 59 | #define IDD_PROPS_SOUNDS 138 |
60 | #define IDS_LOG_FAILEDTOOPEN 139 | 60 | #define IDS_LOG_FAILEDTOOPEN 139 |
61 | #define IDM_POPUPS 140 | 61 | #define IDM_POPUPS 140 |
62 | #define IDS_OTALXHEADING 140 | 62 | #define IDS_OTALXHEADING 140 |
63 | #define IDS_REGISTRYKEY 141 | 63 | #define IDS_REGISTRYKEY 141 |
64 | #define IDS_KLEVERNET_URL 142 | 64 | #define IDS_KLEVERNET_URL 142 |
65 | #define IDR_WAVE_ABORTED 142 | 65 | #define IDR_WAVE_ABORTED 142 |
66 | #define IDS_LOGTIMEFORMAT 143 | 66 | #define IDS_LOGTIMEFORMAT 143 |
67 | #define IDS_DROPFILES_TITLE 144 | 67 | #define IDS_DROPFILES_TITLE 144 |
68 | #define IDS_NOMULTIPLEDROP_TEXT 145 | 68 | #define IDS_NOMULTIPLEDROP_TEXT 145 |
69 | #define IDI_BROWSE 145 | 69 | #define IDI_BROWSE 145 |
70 | #define IDS_LOG_REQUESTING 146 | 70 | #define IDS_LOG_REQUESTING 146 |
71 | #define IDS_LOG_SENDING 147 | 71 | #define IDS_LOG_SENDING 147 |
72 | #define IDS_WTALKAT 148 | 72 | #define IDS_WTALKAT 148 |
73 | #define IDS_OTALXAT 149 | 73 | #define IDS_OTALXAT 149 |
74 | #define IDI_PLAY 149 | 74 | #define IDI_PLAY 149 |
75 | #define IDS_TFTP_ERROR_TSIZE 150 | 75 | #define IDS_TFTP_ERROR_TSIZE 150 |
76 | #define IDD_PROPS_ACL 150 | 76 | #define IDD_PROPS_ACL 150 |
77 | #define IDS_TFTP_ERROR_BSIZE 151 | 77 | #define IDS_TFTP_ERROR_BSIZE 151 |
78 | #define IDS_TFTP_ERROR_TOUT 152 | 78 | #define IDS_TFTP_ERROR_TOUT 152 |
79 | #define IDI_UP 152 | 79 | #define IDI_UP 152 |
80 | #define IDS_SELECT_TFTPROOT 153 | 80 | #define IDS_SELECT_TFTPROOT 153 |
81 | #define IDI_DOWN 153 | 81 | #define IDI_DOWN 153 |
82 | #define IDS_FILTER_WAV 154 | 82 | #define IDS_FILTER_WAV 154 |
83 | #define IDI_REMOVE 154 | 83 | #define IDI_REMOVE 154 |
84 | #define IDS_TITLE_WAV 155 | 84 | #define IDS_TITLE_WAV 155 |
85 | #define IDS_BOX_CANTBIND 156 | 85 | #define IDS_BOX_CANTBIND 156 |
86 | #define IDS_NO_XFER_OP 157 | 86 | #define IDS_NO_XFER_OP 157 |
87 | #define IDS_INVALID_IP 158 | 87 | #define IDS_INVALID_IP 158 |
88 | #define IDS_INVALID_NETMASK 159 | 88 | #define IDS_INVALID_NETMASK 159 |
89 | #define IDS_INVALID_RULE 160 | 89 | #define IDS_INVALID_RULE 160 |
90 | #define IDS_LOG_LOGERROR 161 | 90 | #define IDS_LOG_LOGERROR 161 |
91 | #define IDS_TFTP_ERROR_TOOBIG 162 | ||
92 | #define IDS_LOG_DENYING 163 | ||
91 | #define IDC_KLEVERNET 1000 | 93 | #define IDC_KLEVERNET 1000 |
92 | #define IDC_CONNECTIONS 1001 | 94 | #define IDC_CONNECTIONS 1001 |
93 | #define IDC_LOG 1003 | 95 | #define IDC_LOG 1003 |
94 | #define IDC_GET 1004 | 96 | #define IDC_GET 1004 |
95 | #define IDC_PUT 1005 | 97 | #define IDC_PUT 1005 |
96 | #define IDC_ABORT 1006 | 98 | #define IDC_ABORT 1006 |
97 | #define IDC_EXIT 1007 | 99 | #define IDC_EXIT 1007 |
98 | #define IDC_TFTPROOT 1008 | 100 | #define IDC_TFTPROOT 1008 |
99 | #define IDC_TFTPSUBDIRS 1009 | 101 | #define IDC_TFTPSUBDIRS 1009 |
100 | #define IDC_RRQ_GIVEALL 1010 | 102 | #define IDC_RRQ_GIVEALL 1010 |
101 | #define IDC_RRQ_ALWAYSCONFIRM 1011 | 103 | #define IDC_RRQ_ALWAYSCONFIRM 1011 |
102 | #define IDC_RRQ_DENYALL 1012 | 104 | #define IDC_RRQ_DENYALL 1012 |
103 | #define IDC_WRQ_TAKEALL 1013 | 105 | #define IDC_WRQ_TAKEALL 1013 |
104 | #define IDC_WRQ_PROMPTEXISTING 1014 | 106 | #define IDC_WRQ_PROMPTEXISTING 1014 |
105 | #define IDC_WRQ_ALWAYSCONFIRM 1015 | 107 | #define IDC_WRQ_ALWAYSCONFIRM 1015 |
106 | #define IDC_WRQ_DENYALL 1016 | 108 | #define IDC_WRQ_DENYALL 1016 |
107 | #define IDC_PROMPTTIMEOUT 1017 | 109 | #define IDC_PROMPTTIMEOUT 1017 |
108 | #define IDC_LISTENPORT 1018 | 110 | #define IDC_LISTENPORT 1018 |
109 | #define IDC_LISTENSPIN 1019 | 111 | #define IDC_LISTENSPIN 1019 |
110 | #define IDC_SPEAKPORT 1020 | 112 | #define IDC_SPEAKPORT 1020 |
111 | #define IDC_SPEAKSPIN 1021 | 113 | #define IDC_SPEAKSPIN 1021 |
112 | #define IDC_MAXUDPSIZE 1022 | 114 | #define IDC_MAXUDPSIZE 1022 |
113 | #define IDC_MAXUDPSPIN 1023 | 115 | #define IDC_MAXUDPSPIN 1023 |
114 | #define IDC_TIMEOUT 1024 | 116 | #define IDC_TIMEOUT 1024 |
115 | #define IDC_TIMESPIN 1025 | 117 | #define IDC_TIMESPIN 1025 |
116 | #define IDC_OPTIONS 1026 | 118 | #define IDC_OPTIONS 1026 |
117 | #define IDC_BLOCKSIZE 1026 | 119 | #define IDC_BLOCKSIZE 1026 |
118 | #define IDC_BSIZESPIN 1027 | 120 | #define IDC_BSIZESPIN 1027 |
119 | #define IDC_HOST 1028 | 121 | #define IDC_HOST 1028 |
120 | #define IDC_FILE 1029 | 122 | #define IDC_FILE 1029 |
121 | #define IDC_RENAME 1030 | 123 | #define IDC_RENAME 1030 |
122 | #define IDC_REMOTEFILE 1030 | 124 | #define IDC_REMOTEFILE 1030 |