summaryrefslogtreecommitdiffabout
path: root/PumpKINDlg.cpp
authorMichael Krelin <hacker@klever.net>2011-04-27 10:10:00 (UTC)
committer Michael Krelin <hacker@klever.net>2011-04-27 10:10:00 (UTC)
commitd097b824b7fcad001c9581fb2e322bf3e3e5961d (patch) (unidiff)
tree5a1c55e82c4b0ff4acca276b8e1122547530cc0b /PumpKINDlg.cpp
parent65981784977659461f08b48f537be9f9f77a2112 (diff)
downloadpumpkin-d097b824b7fcad001c9581fb2e322bf3e3e5961d.zip
pumpkin-d097b824b7fcad001c9581fb2e322bf3e3e5961d.tar.gz
pumpkin-d097b824b7fcad001c9581fb2e322bf3e3e5961d.tar.bz2
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>
Diffstat (limited to 'PumpKINDlg.cpp') (more/less context) (ignore whitespace changes)
-rwxr-xr-x[-rw-r--r--]PumpKINDlg.cpp1
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
@@ -1,1627 +1,1628 @@
1// PumpKINDlg.cpp : implementation file 1// PumpKINDlg.cpp : implementation file
2// 2//
3 3
4#include "stdafx.h" 4#include "stdafx.h"
5#include "PumpKIN.h" 5#include "PumpKIN.h"
6#include "PumpKINDlg.h" 6#include "PumpKINDlg.h"
7 7
8#include "ACLTargetCombo.h" 8#include "ACLTargetCombo.h"
9#include "PropsServer.h" 9#include "PropsServer.h"
10#include "PropsNetwork.h" 10#include "PropsNetwork.h"
11#include "PropsSounds.h" 11#include "PropsSounds.h"
12#include "PropsACL.h" 12#include "PropsACL.h"
13#include "ConfirmRRQDlg.h" 13#include "ConfirmRRQDlg.h"
14#include "ConfirmWRQDlg.h" 14#include "ConfirmWRQDlg.h"
15#include "RequestDlg.h" 15#include "RequestDlg.h"
16#include "Resolver.h" 16#include "Resolver.h"
17#include "Retrier.h" 17#include "Retrier.h"
18#include "Trayer.h" 18#include "Trayer.h"
19 19
20#include <io.h> 20#include <io.h>
21 21
22#ifdef _DEBUG 22#ifdef _DEBUG
23#define new DEBUG_NEW 23#define new DEBUG_NEW
24#undef THIS_FILE 24#undef THIS_FILE
25static char THIS_FILE[] = __FILE__; 25static char THIS_FILE[] = __FILE__;
26#endif 26#endif
27 27
28IMPLEMENT_DYNAMIC(CXferSocket, CAsyncSocket) 28IMPLEMENT_DYNAMIC(CXferSocket, CAsyncSocket)
29IMPLEMENT_DYNAMIC(CWRQSocket, CXferSocket) 29IMPLEMENT_DYNAMIC(CWRQSocket, CXferSocket)
30IMPLEMENT_DYNAMIC(CRRQSocket, CXferSocket) 30IMPLEMENT_DYNAMIC(CRRQSocket, CXferSocket)
31 31
32///////////////////////////////////////////////////////////////////////////// 32/////////////////////////////////////////////////////////////////////////////
33// CAboutDlg dialog used for App About 33// CAboutDlg dialog used for App About
34 34
35class CAboutDlg : public CDialog 35class CAboutDlg : public CDialog
36{ 36{
37public: 37public:
38 CAboutDlg(); 38 CAboutDlg();
39 39
40// Dialog Data 40// Dialog Data
41 //{{AFX_DATA(CAboutDlg) 41 //{{AFX_DATA(CAboutDlg)
42 enum { IDD = IDD_ABOUTBOX }; 42 enum { IDD = IDD_ABOUTBOX };
43 //}}AFX_DATA 43 //}}AFX_DATA
44 44
45 // ClassWizard generated virtual function overrides 45 // ClassWizard generated virtual function overrides
46 //{{AFX_VIRTUAL(CAboutDlg) 46 //{{AFX_VIRTUAL(CAboutDlg)
47 protected: 47 protected:
48 virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support 48 virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
49 //}}AFX_VIRTUAL 49 //}}AFX_VIRTUAL
50 50
51// Implementation 51// Implementation
52protected: 52protected:
53 //{{AFX_MSG(CAboutDlg) 53 //{{AFX_MSG(CAboutDlg)
54 afx_msg void OnKlevernet(); 54 afx_msg void OnKlevernet();
55 //}}AFX_MSG 55 //}}AFX_MSG
56 DECLARE_MESSAGE_MAP() 56 DECLARE_MESSAGE_MAP()
57}; 57};
58 58
59CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) 59CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
60{ 60{
61 //{{AFX_DATA_INIT(CAboutDlg) 61 //{{AFX_DATA_INIT(CAboutDlg)
62 //}}AFX_DATA_INIT 62 //}}AFX_DATA_INIT
63} 63}
64 64
65void CAboutDlg::DoDataExchange(CDataExchange* pDX) 65void CAboutDlg::DoDataExchange(CDataExchange* pDX)
66{ 66{
67 CDialog::DoDataExchange(pDX); 67 CDialog::DoDataExchange(pDX);
68 //{{AFX_DATA_MAP(CAboutDlg) 68 //{{AFX_DATA_MAP(CAboutDlg)
69 //}}AFX_DATA_MAP 69 //}}AFX_DATA_MAP
70} 70}
71 71
72BEGIN_MESSAGE_MAP(CAboutDlg, CDialog) 72BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
73 //{{AFX_MSG_MAP(CAboutDlg) 73 //{{AFX_MSG_MAP(CAboutDlg)
74 ON_BN_CLICKED(IDC_KLEVERNET, OnKlevernet) 74 ON_BN_CLICKED(IDC_KLEVERNET, OnKlevernet)
75 //}}AFX_MSG_MAP 75 //}}AFX_MSG_MAP
76END_MESSAGE_MAP() 76END_MESSAGE_MAP()
77 77
78///////////////////////////////////////////////////////////////////////////// 78/////////////////////////////////////////////////////////////////////////////
79// CPumpKINDlg dialog 79// CPumpKINDlg dialog
80 80
81CPumpKINDlg::CPumpKINDlg(CWnd* pParent /*=NULL*/) 81CPumpKINDlg::CPumpKINDlg(CWnd* pParent /*=NULL*/)
82 : CDialog(CPumpKINDlg::IDD, pParent), m_MinSize(0,0) 82 : CDialog(CPumpKINDlg::IDD, pParent), m_MinSize(0,0)
83{ 83{
84 m_Listener.m_Daddy = this; 84 m_Listener.m_Daddy = this;
85 85
86 m_bListen = TRUE; 86 m_bListen = TRUE;
87 87
88 m_ListenPort = 69; 88 m_ListenPort = 69;
89 m_bTFTPSubdirs = TRUE; 89 m_bTFTPSubdirs = TRUE;
90 m_RRQMode = rrqAlwaysConfirm; 90 m_RRQMode = rrqAlwaysConfirm;
91 m_WRQMode = wrqAlwaysConfirm; 91 m_WRQMode = wrqAlwaysConfirm;
92 m_TFTPTimeOut = CTimeSpan(0,0,0,30); 92 m_TFTPTimeOut = CTimeSpan(0,0,0,30);
93 m_RetryTimeOut = CTimeSpan(0,0,0,10); 93 m_RetryTimeOut = CTimeSpan(0,0,0,10);
94 m_LogLength = 100; 94 m_LogLength = 100;
95 m_SpeakPort = 69; 95 m_SpeakPort = 69;
96 m_PromptTimeOut=30; 96 m_PromptTimeOut=30;
97 m_bShown=TRUE; 97 m_bShown=TRUE;
98 m_bExiting=FALSE; 98 m_bExiting=FALSE;
99 m_BlockSize=2048; 99 m_BlockSize=2048;
100 m_bnw.AssignSound("(bang)",IDR_WAVE_RING,CBellsNWhistles::CBang::bangResource); 100 m_bnw.AssignSound("(bang)",IDR_WAVE_RING,CBellsNWhistles::CBang::bangResource);
101 m_bnw.AssignSound("(done)",IDR_WAVE_FINISHED,CBellsNWhistles::CBang::bangResource); 101 m_bnw.AssignSound("(done)",IDR_WAVE_FINISHED,CBellsNWhistles::CBang::bangResource);
102 m_bnw.AssignSound("(oops)",IDR_WAVE_ABORTED,CBellsNWhistles::CBang::bangResource); 102 m_bnw.AssignSound("(oops)",IDR_WAVE_ABORTED,CBellsNWhistles::CBang::bangResource);
103 m_bnw.AssignSound("(none)",(int)0,CBellsNWhistles::CBang::bangNone); 103 m_bnw.AssignSound("(none)",(int)0,CBellsNWhistles::CBang::bangNone);
104 m_bnwRequest="(bang)"; m_bnwSuccess="(done)"; 104 m_bnwRequest="(bang)"; m_bnwSuccess="(done)";
105 m_bnwAbort="(oops)"; 105 m_bnwAbort="(oops)";
106 //{{AFX_DATA_INIT(CPumpKINDlg) 106 //{{AFX_DATA_INIT(CPumpKINDlg)
107 //}}AFX_DATA_INIT 107 //}}AFX_DATA_INIT
108 // Note that LoadIcon does not require a subsequent DestroyIcon in Win32 108 // Note that LoadIcon does not require a subsequent DestroyIcon in Win32
109 m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); 109 m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
110 m_bmpBack.LoadBitmap(IDB_BACKGROUND); 110 m_bmpBack.LoadBitmap(IDB_BACKGROUND);
111 m_bmpBack.GetBitmap(&m_bitmapBack); 111 m_bmpBack.GetBitmap(&m_bitmapBack);
112 m_Retrier = new CRetrier(this); 112 m_Retrier = new CRetrier(this);
113 ASSERT(m_Retrier); 113 ASSERT(m_Retrier);
114 m_Trayer = new CTrayer(this); 114 m_Trayer = new CTrayer(this);
115 ASSERT(m_Trayer); 115 ASSERT(m_Trayer);
116 /* Ensure we're backwards compatible */ 116 /* Ensure we're backwards compatible */
117 ASSERT(CPumpKINDlg::rrqGiveAll==0); 117 ASSERT(CPumpKINDlg::rrqGiveAll==0);
118 ASSERT(CPumpKINDlg::rrqAlwaysConfirm==1); 118 ASSERT(CPumpKINDlg::rrqAlwaysConfirm==1);
119 ASSERT(CPumpKINDlg::rrqDenyAll==2); 119 ASSERT(CPumpKINDlg::rrqDenyAll==2);
120 ASSERT(CPumpKINDlg::wrqTakeAll==0); 120 ASSERT(CPumpKINDlg::wrqTakeAll==0);
121 ASSERT(CPumpKINDlg::wrqConfirmIfExists==1); 121 ASSERT(CPumpKINDlg::wrqConfirmIfExists==1);
122 ASSERT(CPumpKINDlg::wrqAlwaysConfirm==2); 122 ASSERT(CPumpKINDlg::wrqAlwaysConfirm==2);
123 ASSERT(CPumpKINDlg::wrqDenyAll==3); 123 ASSERT(CPumpKINDlg::wrqDenyAll==3);
124 /* -- */ 124 /* -- */
125 LoadSettings(); 125 LoadSettings();
126} 126}
127 127
128void CPumpKINDlg::DoDataExchange(CDataExchange* pDX) 128void CPumpKINDlg::DoDataExchange(CDataExchange* pDX)
129{ 129{
130 CDialog::DoDataExchange(pDX); 130 CDialog::DoDataExchange(pDX);
131 //{{AFX_DATA_MAP(CPumpKINDlg) 131 //{{AFX_DATA_MAP(CPumpKINDlg)
132 DDX_Control(pDX, ID_HELP, m_HelpCtl); 132 DDX_Control(pDX, ID_HELP, m_HelpCtl);
133 DDX_Control(pDX, IDC_PUT, m_PutCtl); 133 DDX_Control(pDX, IDC_PUT, m_PutCtl);
134 DDX_Control(pDX, IDC_GET, m_GetCtl); 134 DDX_Control(pDX, IDC_GET, m_GetCtl);
135 DDX_Control(pDX, IDC_EXIT, m_ExitCtl); 135 DDX_Control(pDX, IDC_EXIT, m_ExitCtl);
136 DDX_Control(pDX, IDC_LISTENING, m_ListenCtl); 136 DDX_Control(pDX, IDC_LISTENING, m_ListenCtl);
137 DDX_Control(pDX, IDC_ABORT, m_AbortCtl); 137 DDX_Control(pDX, IDC_ABORT, m_AbortCtl);
138 DDX_Control(pDX, IDC_OPTIONS, m_OptionsCtl); 138 DDX_Control(pDX, IDC_OPTIONS, m_OptionsCtl);
139 DDX_Control(pDX, IDC_LOG, m_Log); 139 DDX_Control(pDX, IDC_LOG, m_Log);
140 DDX_Control(pDX, IDC_CONNECTIONS, m_List); 140 DDX_Control(pDX, IDC_CONNECTIONS, m_List);
141 //}}AFX_DATA_MAP 141 //}}AFX_DATA_MAP
142} 142}
143 143
144BEGIN_MESSAGE_MAP(CPumpKINDlg, CDialog) 144BEGIN_MESSAGE_MAP(CPumpKINDlg, CDialog)
145 //{{AFX_MSG_MAP(CPumpKINDlg) 145 //{{AFX_MSG_MAP(CPumpKINDlg)
146 ON_WM_SYSCOMMAND() 146 ON_WM_SYSCOMMAND()
147 ON_WM_DESTROY() 147 ON_WM_DESTROY()
148 ON_WM_PAINT() 148 ON_WM_PAINT()
149 ON_WM_QUERYDRAGICON() 149 ON_WM_QUERYDRAGICON()
150 ON_WM_CREATE() 150 ON_WM_CREATE()
151 ON_BN_CLICKED(IDC_OPTIONS, OnOptions) 151 ON_BN_CLICKED(IDC_OPTIONS, OnOptions)
152 ON_WM_TIMER() 152 ON_WM_TIMER()
153 ON_BN_CLICKED(IDC_EXIT, OnExit) 153 ON_BN_CLICKED(IDC_EXIT, OnExit)
154 ON_BN_CLICKED(IDC_PUT, OnPut) 154 ON_BN_CLICKED(IDC_PUT, OnPut)
155 ON_BN_CLICKED(IDC_GET, OnGet) 155 ON_BN_CLICKED(IDC_GET, OnGet)
156 ON_NOTIFY(LVN_DELETEALLITEMS, IDC_CONNECTIONS, OnDeleteallitemsConnections) 156 ON_NOTIFY(LVN_DELETEALLITEMS, IDC_CONNECTIONS, OnDeleteallitemsConnections)
157 ON_NOTIFY(LVN_DELETEITEM, IDC_CONNECTIONS, OnDeleteitemConnections) 157 ON_NOTIFY(LVN_DELETEITEM, IDC_CONNECTIONS, OnDeleteitemConnections)
158 ON_NOTIFY(LVN_INSERTITEM, IDC_CONNECTIONS, OnInsertitemConnections) 158 ON_NOTIFY(LVN_INSERTITEM, IDC_CONNECTIONS, OnInsertitemConnections)
159 ON_NOTIFY(LVN_ITEMCHANGED, IDC_CONNECTIONS, OnItemchangedConnections) 159 ON_NOTIFY(LVN_ITEMCHANGED, IDC_CONNECTIONS, OnItemchangedConnections)
160 ON_BN_CLICKED(IDC_ABORT, OnAbort) 160 ON_BN_CLICKED(IDC_ABORT, OnAbort)
161 ON_WM_CLOSE() 161 ON_WM_CLOSE()
162 ON_COMMAND(ID_TRAY_SHOWPUMPKINWINDOW, OnTrayShowpumpkinwindow) 162 ON_COMMAND(ID_TRAY_SHOWPUMPKINWINDOW, OnTrayShowpumpkinwindow)
163 ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen) 163 ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen)
164 ON_COMMAND(ID_TRAY_EXIT, OnTrayExit) 164 ON_COMMAND(ID_TRAY_EXIT, OnTrayExit)
165 ON_COMMAND(ID_TRAY_ABOUTPUMPKIN, OnTrayAboutpumpkin) 165 ON_COMMAND(ID_TRAY_ABOUTPUMPKIN, OnTrayAboutpumpkin)
166 ON_COMMAND(ID_TRAY_FETCHFILE, OnTrayFetchfile) 166 ON_COMMAND(ID_TRAY_FETCHFILE, OnTrayFetchfile)
167 ON_COMMAND(ID_TRAY_HELP, OnTrayHelp) 167 ON_COMMAND(ID_TRAY_HELP, OnTrayHelp)
168 ON_COMMAND(ID_TRAY_OPTIONS, OnTrayOptions) 168 ON_COMMAND(ID_TRAY_OPTIONS, OnTrayOptions)
169 ON_COMMAND(ID_TRAY_SENDFILE, OnTraySendfile) 169 ON_COMMAND(ID_TRAY_SENDFILE, OnTraySendfile)
170 ON_WM_WINDOWPOSCHANGING() 170 ON_WM_WINDOWPOSCHANGING()
171 ON_LBN_SELCHANGE(IDC_LOG, OnSelchangeLog) 171 ON_LBN_SELCHANGE(IDC_LOG, OnSelchangeLog)
172 ON_COMMAND(ID_TRAY_OPENFILESFOLDER, OnTrayOpenfilesfolder) 172 ON_COMMAND(ID_TRAY_OPENFILESFOLDER, OnTrayOpenfilesfolder)
173 ON_WM_DROPFILES() 173 ON_WM_DROPFILES()
174 ON_BN_CLICKED(ID_HELP, OnHelp) 174 ON_BN_CLICKED(ID_HELP, OnHelp)
175 ON_BN_CLICKED(IDC_LISTENING, OnListening) 175 ON_BN_CLICKED(IDC_LISTENING, OnListening)
176 ON_WM_GETMINMAXINFO() 176 ON_WM_GETMINMAXINFO()
177 ON_WM_SIZE() 177 ON_WM_SIZE()
178 //}}AFX_MSG_MAP 178 //}}AFX_MSG_MAP
179END_MESSAGE_MAP() 179END_MESSAGE_MAP()
180 180
181///////////////////////////////////////////////////////////////////////////// 181/////////////////////////////////////////////////////////////////////////////
182// CPumpKINDlg message handlers 182// CPumpKINDlg message handlers
183 183
184BOOL CPumpKINDlg::OnInitDialog() 184BOOL CPumpKINDlg::OnInitDialog()
185{ 185{
186 CDialog::OnInitDialog(); 186 CDialog::OnInitDialog();
187 187
188 // Add "About..." menu item to system menu. 188 // Add "About..." menu item to system menu.
189 189
190 // IDM_ABOUTBOX must be in the system command range. 190 // IDM_ABOUTBOX must be in the system command range.
191 ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX); 191 ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
192 ASSERT(IDM_ABOUTBOX < 0xF000); 192 ASSERT(IDM_ABOUTBOX < 0xF000);
193 193
194 CMenu* pSysMenu = GetSystemMenu(FALSE); 194 CMenu* pSysMenu = GetSystemMenu(FALSE);
195 CString strAboutMenu; 195 CString strAboutMenu;
196 strAboutMenu.LoadString(IDS_ABOUTBOX); 196 strAboutMenu.LoadString(IDS_ABOUTBOX);
197 if (!strAboutMenu.IsEmpty()) 197 if (!strAboutMenu.IsEmpty())
198 { 198 {
199 pSysMenu->AppendMenu(MF_SEPARATOR); 199 pSysMenu->AppendMenu(MF_SEPARATOR);
200 pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu); 200 pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu);
201 } 201 }
202 202
203 // Set the icon for this dialog. The framework does this automatically 203 // Set the icon for this dialog. The framework does this automatically
204 // when the application's main window is not a dialog 204 // when the application's main window is not a dialog
205 SetIcon(m_hIcon, TRUE); // Set big icon 205 SetIcon(m_hIcon, TRUE); // Set big icon
206 SetIcon(m_hIcon, FALSE); // Set small icon 206 SetIcon(m_hIcon, FALSE); // Set small icon
207 207
208 VERIFY(m_Retrier->Create(NULL,"PumpKIN-Retrier",WS_CHILD,CRect(0,0,0,0),this,0)); 208 VERIFY(m_Retrier->Create(NULL,"PumpKIN-Retrier",WS_CHILD,CRect(0,0,0,0),this,0));
209 209
210 m_Images.Create(16,16,TRUE,2,1); 210 m_Images.Create(16,16,TRUE,2,1);
211 m_iRRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_RRQ)); 211 m_iRRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_RRQ));
212 m_iWRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_WRQ)); 212 m_iWRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_WRQ));
213 ASSERT(m_iRRQ>=0); 213 ASSERT(m_iRRQ>=0);
214 ASSERT(m_iWRQ>=0); 214 ASSERT(m_iWRQ>=0);
215 m_List.SetImageList(&m_Images,LVSIL_NORMAL); 215 m_List.SetImageList(&m_Images,LVSIL_NORMAL);
216 m_List.SetImageList(&m_Images,LVSIL_SMALL); 216 m_List.SetImageList(&m_Images,LVSIL_SMALL);
217 m_List.SetImageList(&m_Images,LVSIL_STATE); 217 m_List.SetImageList(&m_Images,LVSIL_STATE);
218 m_List.SetTextColor(RGB(255,255,0));// Yellow 218 m_List.SetTextColor(RGB(255,255,0));// Yellow
219 m_List.SetTextBkColor(RGB(12,167,0));// Green 219 m_List.SetTextBkColor(RGB(12,167,0));// Green
220 m_List.SetBkColor(RGB(12,167,0));// Green 220 m_List.SetBkColor(RGB(12,167,0));// Green
221CRect listrc; 221CRect listrc;
222 m_List.GetClientRect(&listrc); 222 m_List.GetClientRect(&listrc);
223 m_List.InsertColumn(0,"File",LVCFMT_LEFT,listrc.Width()-((listrc.Width()/7)*3+listrc.Width()*2/7),subitemFile); 223 m_List.InsertColumn(0,"File",LVCFMT_LEFT,listrc.Width()-((listrc.Width()/7)*3+listrc.Width()*2/7),subitemFile);
224 m_List.InsertColumn(1,"type",LVCFMT_CENTER,listrc.Width()/7,subitemType); 224 m_List.InsertColumn(1,"type",LVCFMT_CENTER,listrc.Width()/7,subitemType);
225 m_List.InsertColumn(2,"peer",LVCFMT_LEFT,listrc.Width()*2/7,subitemPeer); 225 m_List.InsertColumn(2,"peer",LVCFMT_LEFT,listrc.Width()*2/7,subitemPeer);
226 m_List.InsertColumn(3,"ACK",LVCFMT_RIGHT,listrc.Width()/7,subitemBytes); 226 m_List.InsertColumn(3,"ACK",LVCFMT_RIGHT,listrc.Width()/7,subitemBytes);
227 m_List.InsertColumn(4,"tsize",LVCFMT_RIGHT,listrc.Width()/7,subitemTSize); 227 m_List.InsertColumn(4,"tsize",LVCFMT_RIGHT,listrc.Width()/7,subitemTSize);
228 228
229 LogLine(IDS_LOG_START); 229 LogLine(IDS_LOG_START);
230 230
231 SetupButtons(); 231 SetupButtons();
232 232
233CRect wrci, wrco; 233CRect wrci, wrco;
234 GetWindowRect(&wrco); 234 GetWindowRect(&wrco);
235 GetClientRect(&wrci); 235 GetClientRect(&wrci);
236CRect brc; 236CRect brc;
237 m_GetCtl.GetWindowRect(&brc); ScreenToClient(&brc); 237 m_GetCtl.GetWindowRect(&brc); ScreenToClient(&brc);
238 m_rightGapButtons = wrci.right-brc.right; 238 m_rightGapButtons = wrci.right-brc.right;
239 m_List.GetWindowRect(&brc); ScreenToClient(&brc); 239 m_List.GetWindowRect(&brc); ScreenToClient(&brc);
240 m_rightGapList = wrci.right-brc.right; 240 m_rightGapList = wrci.right-brc.right;
241 m_ListenCtl.GetWindowRect(&brc); ScreenToClient(&brc); 241 m_ListenCtl.GetWindowRect(&brc); ScreenToClient(&brc);
242 m_bottomGapListen = wrci.bottom-brc.bottom; 242 m_bottomGapListen = wrci.bottom-brc.bottom;
243 m_Log.GetWindowRect(&brc);ScreenToClient(&brc); 243 m_Log.GetWindowRect(&brc);ScreenToClient(&brc);
244 m_bottomGapLog = wrci.bottom-brc.bottom; 244 m_bottomGapLog = wrci.bottom-brc.bottom;
245 m_MinSize.cx = wrco.Width(); m_MinSize.cy=wrco.Height(); 245 m_MinSize.cx = wrco.Width(); m_MinSize.cy=wrco.Height();
246 246
247CRect rc, drc; 247CRect rc, drc;
248 GetWindowRect(rc); 248 GetWindowRect(rc);
249 GetDesktopWindow()->GetWindowRect(drc); 249 GetDesktopWindow()->GetWindowRect(drc);
250 SetWindowPos(NULL,drc.right-6-rc.Width(),6,0,0,SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER); 250 SetWindowPos(NULL,drc.right-6-rc.Width(),6,0,0,SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER);
251 251
252 if(m_bShown) 252 if(m_bShown)
253 ShowWindow(SW_SHOW); 253 ShowWindow(SW_SHOW);
254 else 254 else
255 ShowWindow(SW_HIDE); 255 ShowWindow(SW_HIDE);
256 256
257 m_ListenCtl.SetCheck(m_Listener.m_bListen?1:0); 257 m_ListenCtl.SetCheck(m_Listener.m_bListen?1:0);
258 258
259 // CG: The following block was added by the ToolTips component. 259 // CG: The following block was added by the ToolTips component.
260 { 260 {
261 // Create the ToolTip control. 261 // Create the ToolTip control.
262 m_tooltip.Create(this); 262 m_tooltip.Create(this);
263 m_tooltip.Activate(TRUE); 263 m_tooltip.Activate(TRUE);
264 264
265 m_tooltip.AddTool(&m_List,IDC_CONNECTIONS); 265 m_tooltip.AddTool(&m_List,IDC_CONNECTIONS);
266 m_tooltip.AddTool(GetDlgItem(IDC_PUT),IDC_PUT); 266 m_tooltip.AddTool(GetDlgItem(IDC_PUT),IDC_PUT);
267 m_tooltip.AddTool(GetDlgItem(IDC_GET),IDC_GET); 267 m_tooltip.AddTool(GetDlgItem(IDC_GET),IDC_GET);
268 m_tooltip.AddTool(&m_AbortCtl,IDC_ABORT); 268 m_tooltip.AddTool(&m_AbortCtl,IDC_ABORT);
269 m_tooltip.AddTool(GetDlgItem(IDC_OPTIONS),IDC_OPTIONS); 269 m_tooltip.AddTool(GetDlgItem(IDC_OPTIONS),IDC_OPTIONS);
270 m_tooltip.AddTool(GetDlgItem(IDC_EXIT),IDC_EXIT); 270 m_tooltip.AddTool(GetDlgItem(IDC_EXIT),IDC_EXIT);
271 m_tooltip.AddTool(GetDlgItem(ID_HELP),ID_HELP); 271 m_tooltip.AddTool(GetDlgItem(ID_HELP),ID_HELP);
272 m_tooltip.AddTool(GetDlgItem(IDC_LOG),IDC_LOG); 272 m_tooltip.AddTool(GetDlgItem(IDC_LOG),IDC_LOG);
273 } 273 }
274 return TRUE; // return TRUE unless you set the focus to a control 274 return TRUE; // return TRUE unless you set the focus to a control
275} 275}
276 276
277void CPumpKINDlg::OnSysCommand(UINT nID, LPARAM lParam) 277void CPumpKINDlg::OnSysCommand(UINT nID, LPARAM lParam)
278{ 278{
279 if ((nID & 0xFFF0) == IDM_ABOUTBOX) 279 if ((nID & 0xFFF0) == IDM_ABOUTBOX)
280 { 280 {
281 CAboutDlg dlgAbout; 281 CAboutDlg dlgAbout;
282 dlgAbout.DoModal(); 282 dlgAbout.DoModal();
283 } 283 }
284 else 284 else
285 { 285 {
286 CDialog::OnSysCommand(nID, lParam); 286 CDialog::OnSysCommand(nID, lParam);
287 } 287 }
288} 288}
289 289
290void CPumpKINDlg::OnDestroy() 290void CPumpKINDlg::OnDestroy()
291{ 291{
292 SaveSettings(); 292 SaveSettings();
293 293
294NOTIFYICONDATA nid; 294NOTIFYICONDATA nid;
295 memset(&nid,0,sizeof(nid)); 295 memset(&nid,0,sizeof(nid));
296 nid.cbSize=sizeof(nid); 296 nid.cbSize=sizeof(nid);
297 nid.hWnd=m_Trayer->m_hWnd; 297 nid.hWnd=m_Trayer->m_hWnd;
298 nid.uID=IDC_TRAYICON; 298 nid.uID=IDC_TRAYICON;
299 nid.uFlags=0; 299 nid.uFlags=0;
300 VERIFY(Shell_NotifyIcon(NIM_DELETE,&nid)); 300 VERIFY(Shell_NotifyIcon(NIM_DELETE,&nid));
301 301
302 WinHelp(0L, HELP_QUIT); 302 WinHelp(0L, HELP_QUIT);
303 CDialog::OnDestroy(); 303 CDialog::OnDestroy();
304POSITION p = m_LogTimes.GetStartPosition(); 304POSITION p = m_LogTimes.GetStartPosition();
305 while(p){ 305 while(p){
306 CTime *t,*tt; 306 CTime *t,*tt;
307 m_LogTimes.GetNextAssoc(p,t,tt); 307 m_LogTimes.GetNextAssoc(p,t,tt);
308 ASSERT(t && tt && t==tt); 308 ASSERT(t && tt && t==tt);
309 delete t; 309 delete t;
310 } 310 }
311 // *** Abort and cleanup transfers 311 // *** Abort and cleanup transfers
312 m_LogTimes.RemoveAll(); 312 m_LogTimes.RemoveAll();
313} 313}
314 314
315// If you add a minimize button to your dialog, you will need the code below 315// If you add a minimize button to your dialog, you will need the code below
316// to draw the icon. For MFC applications using the document/view model, 316// to draw the icon. For MFC applications using the document/view model,
317// this is automatically done for you by the framework. 317// this is automatically done for you by the framework.
318 318
319void CPumpKINDlg::OnPaint() 319void CPumpKINDlg::OnPaint()
320{ 320{
321 if (IsIconic()) 321 if (IsIconic())
322 { 322 {
323 CPaintDC dc(this); // device context for painting 323 CPaintDC dc(this); // device context for painting
324 324
325 SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0); 325 SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0);
326 326
327 // Center icon in client rectangle 327 // Center icon in client rectangle
328 int cxIcon = GetSystemMetrics(SM_CXICON); 328 int cxIcon = GetSystemMetrics(SM_CXICON);
329 int cyIcon = GetSystemMetrics(SM_CYICON); 329 int cyIcon = GetSystemMetrics(SM_CYICON);
330 CRect rect; 330 CRect rect;
331 GetClientRect(&rect); 331 GetClientRect(&rect);
332 int x = (rect.Width() - cxIcon + 1) / 2; 332 int x = (rect.Width() - cxIcon + 1) / 2;
333 int y = (rect.Height() - cyIcon + 1) / 2; 333 int y = (rect.Height() - cyIcon + 1) / 2;
334 334
335 // Draw the icon 335 // Draw the icon
336 dc.DrawIcon(x, y, m_hIcon); 336 dc.DrawIcon(x, y, m_hIcon);
337 } 337 }
338 else 338 else
339 { 339 {
340 CPaintDC pDC(this); 340 CPaintDC pDC(this);
341 CDC bmpDC; 341 CDC bmpDC;
342 bmpDC.CreateCompatibleDC(&pDC); 342 bmpDC.CreateCompatibleDC(&pDC);
343 bmpDC.SelectObject(&m_bmpBack); 343 bmpDC.SelectObject(&m_bmpBack);
344 CRect rc; 344 CRect rc;
345 GetClientRect(&rc); 345 GetClientRect(&rc);
346 for(int x=-m_bitmapBack.bmWidth*2/4;x<rc.Width();x+=m_bitmapBack.bmWidth) 346 for(int x=-m_bitmapBack.bmWidth*2/4;x<rc.Width();x+=m_bitmapBack.bmWidth)
347 for(int y=-m_bitmapBack.bmHeight*2/4;y<rc.Height();y+=m_bitmapBack.bmHeight) 347 for(int y=-m_bitmapBack.bmHeight*2/4;y<rc.Height();y+=m_bitmapBack.bmHeight)
348 pDC.BitBlt(x,y,m_bitmapBack.bmWidth,m_bitmapBack.bmHeight,&bmpDC,0,0,SRCCOPY); 348 pDC.BitBlt(x,y,m_bitmapBack.bmWidth,m_bitmapBack.bmHeight,&bmpDC,0,0,SRCCOPY);
349 bmpDC.DeleteDC(); 349 bmpDC.DeleteDC();
350 CDialog::OnPaint(); 350 CDialog::OnPaint();
351 } 351 }
352} 352}
353 353
354// The system calls this to obtain the cursor to display while the user drags 354// The system calls this to obtain the cursor to display while the user drags
355// the minimized window. 355// the minimized window.
356HCURSOR CPumpKINDlg::OnQueryDragIcon() 356HCURSOR CPumpKINDlg::OnQueryDragIcon()
357{ 357{
358 return (HCURSOR) m_hIcon; 358 return (HCURSOR) m_hIcon;
359} 359}
360 360
361int CPumpKINDlg::OnCreate(LPCREATESTRUCT lpCreateStruct) 361int CPumpKINDlg::OnCreate(LPCREATESTRUCT lpCreateStruct)
362{ 362{
363 if (CDialog::OnCreate(lpCreateStruct) == -1) 363 if (CDialog::OnCreate(lpCreateStruct) == -1)
364 return -1; 364 return -1;
365 365
366 if(!m_Listener.SetListen(m_bListen)) { 366 if(!m_Listener.SetListen(m_bListen)) {
367 m_bListen=FALSE; 367 m_bListen=FALSE;
368 TRACE0("Failed to create socket\n"); 368 TRACE0("Failed to create socket\n");
369 AfxMessageBox(IDS_BOX_CANTBIND,MB_OK|MB_ICONEXCLAMATION); 369 AfxMessageBox(IDS_BOX_CANTBIND,MB_OK|MB_ICONEXCLAMATION);
370 } 370 }
371 371
372 if(!m_Trayer->Create(NULL,"PumpKIN TrayIcon",WS_CHILD,CRect(0,0,0,0),this,0)){ 372 if(!m_Trayer->Create(NULL,"PumpKIN TrayIcon",WS_CHILD,CRect(0,0,0,0),this,0)){
373 TRACE0("Failed to create trayer\n"); 373 TRACE0("Failed to create trayer\n");
374 return -1; 374 return -1;
375 } 375 }
376 376
377NOTIFYICONDATA nid; 377NOTIFYICONDATA nid;
378 memset(&nid,0,sizeof(nid)); 378 memset(&nid,0,sizeof(nid));
379 nid.cbSize=sizeof(nid); 379 nid.cbSize=sizeof(nid);
380 nid.hWnd=m_Trayer->m_hWnd; 380 nid.hWnd=m_Trayer->m_hWnd;
381 nid.uID=IDC_TRAYICON; 381 nid.uID=IDC_TRAYICON;
382 nid.uFlags=NIF_MESSAGE|NIF_ICON|NIF_TIP; 382 nid.uFlags=NIF_MESSAGE|NIF_ICON|NIF_TIP;
383 nid.uCallbackMessage=WM_TRAYICON; 383 nid.uCallbackMessage=WM_TRAYICON;
384 nid.hIcon=AfxGetApp()->LoadIcon(IDR_MAINFRAME); 384 nid.hIcon=AfxGetApp()->LoadIcon(IDR_MAINFRAME);
385 // *** Load from resource 385 // *** Load from resource
386 strcpy(nid.szTip,"PumpKIN"); 386 strcpy(nid.szTip,"PumpKIN");
387 VERIFY(Shell_NotifyIcon(NIM_ADD,&nid)); 387 VERIFY(Shell_NotifyIcon(NIM_ADD,&nid));
388 388
389 return 0; 389 return 0;
390} 390}
391 391
392void CListenSocket::OnReceive(int nErrorCode) 392void CListenSocket::OnReceive(int nErrorCode)
393{ 393{
394 ASSERT(m_Daddy); 394 ASSERT(m_Daddy);
395 if(nErrorCode){ 395 if(nErrorCode){
396 m_Daddy->LogLine(IDS_LOG_LISTENRECEIVEERROR); 396 m_Daddy->LogLine(IDS_LOG_LISTENRECEIVEERROR);
397 return; 397 return;
398 } 398 }
399DWORD fionread = 0; 399DWORD fionread = 0;
400 VERIFY(IOCtl(FIONREAD,&fionread));// *** Do some checking on the value acquired 400 VERIFY(IOCtl(FIONREAD,&fionread));// *** Do some checking on the value acquired
401tftp *tftpRQ = tftp::Allocate(fionread); 401tftp *tftpRQ = tftp::Allocate(fionread);
402 ASSERT(tftpRQ); 402 ASSERT(tftpRQ);
403SOCKADDR_IN sin; 403SOCKADDR_IN sin;
404 if(!tftpRQ->Receive(this,fionread,&sin)){ 404 if(!tftpRQ->Receive(this,fionread,&sin)){
405 m_Daddy->LogLine(IDS_LOG_LISTENACCEPTERROR); 405 m_Daddy->LogLine(IDS_LOG_LISTENACCEPTERROR);
406 delete tftpRQ; 406 delete tftpRQ;
407 return; 407 return;
408 } 408 }
409 #ifndefNDEBUG 409 #ifndefNDEBUG
410CString tmp; 410CString tmp;
411 tmp.Format("%u - %s - %u\n",tftpRQ->Opcode(),inet_ntoa(sin.sin_addr),sin.sin_port); 411 tmp.Format("%u - %s - %u\n",tftpRQ->Opcode(),inet_ntoa(sin.sin_addr),sin.sin_port);
412 TRACE0(tmp); 412 TRACE0(tmp);
413#endif 413#endif
414POSITION p = m_Daddy->m_Xfers.GetStartPosition(); 414POSITION p = m_Daddy->m_Xfers.GetStartPosition();
415 while(p){ 415 while(p){
416 SOCKET key; 416 SOCKET key;
417 CXferSocket *sock; 417 CXferSocket *sock;
418 m_Daddy->m_Xfers.GetNextAssoc(p,key,sock); 418 m_Daddy->m_Xfers.GetNextAssoc(p,key,sock);
419 ASSERT(sock); 419 ASSERT(sock);
420 if(sock->m_Peer.sin_addr.s_addr==sin.sin_addr.s_addr && sock->m_Peer.sin_port==sin.sin_port){ 420 if(sock->m_Peer.sin_addr.s_addr==sin.sin_addr.s_addr && sock->m_Peer.sin_port==sin.sin_port){
421 TRACE0("Ignoring request which we are already processing\n"); 421 TRACE0("Ignoring request which we are already processing\n");
422 delete tftpRQ; 422 delete tftpRQ;
423 return; 423 return;
424 } 424 }
425 } 425 }
426 switch(tftpRQ->Opcode()){ 426 switch(tftpRQ->Opcode()){
427 case tftp::opRRQ: 427 case tftp::opRRQ:
428 // Read Request 428 // Read Request
429 { 429 {
430 CString tmp; 430 CString tmp;
431 tmp.Format(IDS_LOG_RRQSERVE,tftpRQ->rqFileName(),tftpRQ->rqType(),inet_ntoa(sin.sin_addr)); 431 tmp.Format(IDS_LOG_RRQSERVE,tftpRQ->rqFileName(),tftpRQ->rqType(),inet_ntoa(sin.sin_addr));
432 m_Daddy->LogLine(tmp); 432 m_Daddy->LogLine(tmp);
433 CRRQSocket *s = new CRRQSocket(m_Daddy,tftpRQ->rqFileName(),tftpRQ->rqType(),&sin); 433 CRRQSocket *s = new CRRQSocket(m_Daddy,tftpRQ->rqFileName(),tftpRQ->rqType(),&sin);
434 ASSERT(s); 434 ASSERT(s);
435 tftpRQ->GetOptions(&s->m_Options); 435 tftpRQ->GetOptions(&s->m_Options);
436 if(!s->Create()) 436 if(!s->Create())
437 s->Destroy(FALSE); 437 s->Destroy(FALSE);
438 } 438 }
439 break; 439 break;
440 case tftp::opWRQ: 440 case tftp::opWRQ:
441 // Write Request 441 // Write Request
442 { 442 {
443 CString tmp; 443 CString tmp;
444 tmp.Format(IDS_LOG_WRQSERVE,tftpRQ->rqFileName(),tftpRQ->rqType(),inet_ntoa(sin.sin_addr)); 444 tmp.Format(IDS_LOG_WRQSERVE,tftpRQ->rqFileName(),tftpRQ->rqType(),inet_ntoa(sin.sin_addr));
445 m_Daddy->LogLine(tmp); 445 m_Daddy->LogLine(tmp);
446 CWRQSocket *s = new CWRQSocket(m_Daddy,tftpRQ->rqFileName(),tftpRQ->rqType(),&sin); 446 CWRQSocket *s = new CWRQSocket(m_Daddy,tftpRQ->rqFileName(),tftpRQ->rqType(),&sin);
447 ASSERT(s); 447 ASSERT(s);
448 tftpRQ->GetOptions(&s->m_Options); 448 tftpRQ->GetOptions(&s->m_Options);
449 if(!s->Create(NULL,NULL)) 449 if(!s->Create(NULL,NULL))
450 s->Destroy(FALSE); 450 s->Destroy(FALSE);
451 } 451 }
452 break; 452 break;
453 default: 453 default:
454 m_Daddy->LogLine(IDS_LOG_LISTENOPCODE); 454 m_Daddy->LogLine(IDS_LOG_LISTENOPCODE);
455 delete tftpRQ; 455 delete tftpRQ;
456 return; 456 return;
457 } 457 }
458 delete tftpRQ; 458 delete tftpRQ;
459} 459}
460 460
461BOOL tftp::Receive(CAsyncSocket* socket,UINT maxLength,SOCKADDR_IN *sin) 461BOOL tftp::Receive(CAsyncSocket* socket,UINT maxLength,SOCKADDR_IN *sin)
462{ 462{
463 ASSERT(socket); 463 ASSERT(socket);
464int saddrLen = sizeof(SOCKADDR_IN); 464int saddrLen = sizeof(SOCKADDR_IN);
465 length = sin ? 465 length = sin ?
466 socket->ReceiveFrom(udpBase(),maxLength,(SOCKADDR*)sin,&saddrLen) 466 socket->ReceiveFrom(udpBase(),maxLength,(SOCKADDR*)sin,&saddrLen)
467 : 467 :
468 socket->Receive(udpBase(),maxLength) 468 socket->Receive(udpBase(),maxLength)
469 ; 469 ;
470 if(!length) 470 if(!length)
471 return FALSE; 471 return FALSE;
472 if(length==(tftpLength)SOCKET_ERROR) 472 if(length==(tftpLength)SOCKET_ERROR)
473 return FALSE; 473 return FALSE;
474 return TRUE; 474 return TRUE;
475} 475}
476 476
477UINT tftp::Opcode() 477UINT tftp::Opcode()
478{ 478{
479 return REVERSEBYTES(opcode); 479 return REVERSEBYTES(opcode);
480} 480}
481 481
482CString tftp::rqFileName() 482CString tftp::rqFileName()
483{ 483{
484 ASSERT(length); 484 ASSERT(length);
485 ASSERT(Opcode()==opRRQ || Opcode()==opWRQ); 485 ASSERT(Opcode()==opRRQ || Opcode()==opWRQ);
486CString rv; 486CString rv;
487 if(memchr(&data.m_RQ.data,0,length-sizeof(opcode))) 487 if(memchr(&data.m_RQ.data,0,length-sizeof(opcode)))
488 rv = (LPCTSTR)data.m_RQ.data; 488 rv = (LPCTSTR)data.m_RQ.data;
489 return rv; 489 return rv;
490} 490}
491 491
492CString tftp::rqType() 492CString tftp::rqType()
493{ 493{
494 ASSERT(length); 494 ASSERT(length);
495 ASSERT(Opcode()==opRRQ || Opcode()==opWRQ); 495 ASSERT(Opcode()==opRRQ || Opcode()==opWRQ);
496CString rv; 496CString rv;
497char *tmp = (char*)memchr(&data.m_RQ.data,0,length-sizeof(opcode)); 497char *tmp = (char*)memchr(&data.m_RQ.data,0,length-sizeof(opcode));
498 if(tmp++) 498 if(tmp++)
499 rv = (LPCTSTR)tmp; 499 rv = (LPCTSTR)tmp;
500 return rv; 500 return rv;
501} 501}
502 502
503UINT tftp::GetOptions(tftp::tftpOptions* ops) 503UINT tftp::GetOptions(tftp::tftpOptions* ops)
504{ 504{
505 ASSERT(length); 505 ASSERT(length);
506 ASSERT(Opcode()==opRRQ || Opcode()==opWRQ || Opcode()==opOACK); 506 ASSERT(Opcode()==opRRQ || Opcode()==opWRQ || Opcode()==opOACK);
507 ASSERT(ops); 507 ASSERT(ops);
508tftpOptions& o = *ops; 508tftpOptions& o = *ops;
509LPSTR base = (LPSTR)&data.m_RQ.data; 509LPSTR base = (LPSTR)&data.m_RQ.data;
510UINT basePtr = 0; 510UINT basePtr = 0;
511 if(Opcode()==opRRQ || Opcode()==opWRQ){ 511 if(Opcode()==opRRQ || Opcode()==opWRQ){
512 base = (LPSTR)memchr(&data.m_RQ.data,0,length-sizeof(opcode)); 512 base = (LPSTR)memchr(&data.m_RQ.data,0,length-sizeof(opcode));
513 if(!base) 513 if(!base)
514 return 0; 514 return 0;
515 base++; 515 base++;
516 basePtr = (base-(LPSTR)&data.m_RQ.data); 516 basePtr = (base-(LPSTR)&data.m_RQ.data);
517 base = (LPSTR)memchr(base,0,length-basePtr); 517 base = (LPSTR)memchr(base,0,length-basePtr);
518 if(!base) 518 if(!base)
519 return 0; 519 return 0;
520 base++; 520 base++;
521 basePtr = (base-(LPSTR)&data.m_RQ.data); 521 basePtr = (base-(LPSTR)&data.m_RQ.data);
522 } 522 }
523 ops->RemoveAll(); 523 ops->RemoveAll();
524UINT rv = 0; 524UINT rv = 0;
525 while(basePtr<(length-sizeof(opcode))){ 525 while(basePtr<(length-sizeof(opcode))){
526 CString onam = (LPSTR)&data.m_RQ.data[basePtr]; 526 CString onam = (LPSTR)&data.m_RQ.data[basePtr];
527 basePtr+=onam.GetLength()+1; 527 basePtr+=onam.GetLength()+1;
528 CString oval = (LPSTR)&data.m_RQ.data[basePtr]; 528 CString oval = (LPSTR)&data.m_RQ.data[basePtr];
529 basePtr+=oval.GetLength()+1; 529 basePtr+=oval.GetLength()+1;
530 onam.MakeLower(); 530 onam.MakeLower();
531 o[onam]=oval; 531 o[onam]=oval;
532 rv++; 532 rv++;
533 } 533 }
534 return rv; 534 return rv;
535} 535}
536 536
537tftp::tftp() 537tftp::tftp()
538{ 538{
539 length=0; 539 length=0;
540} 540}
541 541
542 542
543void CXferSocket::OnSend(int nErrorCode) 543void CXferSocket::OnSend(int nErrorCode)
544{ 544{
545 if(nErrorCode){ 545 if(nErrorCode){
546 ASSERT(m_Daddy); 546 ASSERT(m_Daddy);
547 m_Daddy->LogLine(IDS_LOG_XFERSEND); 547 m_Daddy->LogLine(IDS_LOG_XFERSEND);
548 return; 548 return;
549 } 549 }
550 if(!m_Queue.IsEmpty()){ 550 if(!m_Queue.IsEmpty()){
551 tftp *p = m_Queue.GetHead(); 551 tftp *p = m_Queue.GetHead();
552 ASSERT(p); 552 ASSERT(p);
553 m_Queue.RemoveHead(); 553 m_Queue.RemoveHead();
554 if(!p->Send(this,&m_Peer)){ 554 if(!p->Send(this,&m_Peer)){
555 ASSERT(m_Daddy); 555 ASSERT(m_Daddy);
556 m_Daddy->LogLine(IDS_LOG_XFERUDPSEND); 556 m_Daddy->LogLine(IDS_LOG_XFERUDPSEND);
557 } 557 }
558 delete p; 558 delete p;
559 } 559 }
560 DoSelect(); 560 DoSelect();
561 if(m_Queue.IsEmpty()){ 561 if(m_Queue.IsEmpty()){
562 switch(state){ 562 switch(state){
563 case stateDeny: 563 case stateDeny:
564 Destroy(FALSE); 564 Destroy(FALSE);
565 break; 565 break;
566 case stateFinish: 566 case stateFinish:
567 Destroy(TRUE); 567 Destroy(TRUE);
568 break; 568 break;
569 } 569 }
570 } 570 }
571} 571}
572 572
573BOOL tftp::Send(CAsyncSocket *socket,SOCKADDR_IN* saddr) 573BOOL tftp::Send(CAsyncSocket *socket,SOCKADDR_IN* saddr)
574{ 574{
575 ASSERT(socket); 575 ASSERT(socket);
576int rv = socket->SendTo(udpBase(),length,(SOCKADDR*)saddr,sizeof(SOCKADDR_IN)); 576int rv = socket->SendTo(udpBase(),length,(SOCKADDR*)saddr,sizeof(SOCKADDR_IN));
577 if(rv!=length) 577 if(rv!=length)
578 return FALSE; 578 return FALSE;
579 return TRUE; 579 return TRUE;
580} 580}
581 581
582void CXferSocket::DoSelect(BOOL do_select) 582void CXferSocket::DoSelect(BOOL do_select)
583{ 583{
584 if(m_Peer.sin_addr.s_addr!=INADDR_NONE) 584 if(m_Peer.sin_addr.s_addr!=INADDR_NONE)
585 AsyncSelect(FD_CLOSE|FD_READ|((m_Queue.IsEmpty()&&!do_select)?0:FD_WRITE)); 585 AsyncSelect(FD_CLOSE|FD_READ|((m_Queue.IsEmpty()&&!do_select)?0:FD_WRITE));
586} 586}
587 587
588void CXferSocket::OnReceive(int nErrorCode) 588void CXferSocket::OnReceive(int nErrorCode)
589{ 589{
590 if(nErrorCode){ 590 if(nErrorCode){
591 ASSERT(m_Daddy); 591 ASSERT(m_Daddy);
592 m_Daddy->LogLine(IDS_LOG_XFERRECEIVE); 592 m_Daddy->LogLine(IDS_LOG_XFERRECEIVE);
593 return; 593 return;
594 } 594 }
595 ASSERT(m_Daddy); 595 ASSERT(m_Daddy);
596DWORD fionread = 0; 596DWORD fionread = 0;
597 VERIFY(IOCtl(FIONREAD,&fionread)); 597 VERIFY(IOCtl(FIONREAD,&fionread));
598tftp *p = tftp::Allocate(fionread); 598tftp *p = tftp::Allocate(fionread);
599 ASSERT(p); 599 ASSERT(p);
600SOCKADDR_IN sin; 600SOCKADDR_IN sin;
601 if(!p->Receive(this,fionread,&sin)){ 601 if(!p->Receive(this,fionread,&sin)){
602 m_Daddy->LogLine(IDS_LOG_XFERUDPRECEIVE); 602 m_Daddy->LogLine(IDS_LOG_XFERUDPRECEIVE);
603 delete p; 603 delete p;
604 return;
604 }else 605 }else
605 if(m_Peer.sin_addr.s_addr==INADDR_NONE){ 606 if(m_Peer.sin_addr.s_addr==INADDR_NONE){
606 m_Peer.sin_addr=sin.sin_addr; 607 m_Peer.sin_addr=sin.sin_addr;
607 m_Peer.sin_port=sin.sin_port; 608 m_Peer.sin_port=sin.sin_port;
608 } 609 }
609BOOL alive = TRUE; 610BOOL alive = TRUE;
610 if(state==stateInit){ 611 if(state==stateInit){
611 state=stateXfer; 612 state=stateXfer;
612 m_Peer.sin_port=sin.sin_port; 613 m_Peer.sin_port=sin.sin_port;
613 UpdateList(); 614 UpdateList();
614 } 615 }
615 if(sin.sin_addr.s_addr!=m_Peer.sin_addr.s_addr || sin.sin_port!=m_Peer.sin_port){ 616 if(sin.sin_addr.s_addr!=m_Peer.sin_addr.s_addr || sin.sin_port!=m_Peer.sin_port){
616 m_Daddy->LogLine(IDS_LOG_XFERSOURCETID); 617 m_Daddy->LogLine(IDS_LOG_XFERSOURCETID);
617 // *** Bounce it! 618 // *** Bounce it!
618 }else{ 619 }else{
619 alive = OnTFTP(p); 620 alive = OnTFTP(p);
620 } 621 }
621 delete p; 622 delete p;
622 if(alive){ 623 if(alive){
623 DoSelect(); 624 DoSelect();
624 ResetTimeout(); 625 ResetTimeout();
625 } 626 }
626} 627}
627 628
628void CXferSocket::SetPeer(SOCKADDR_IN *sin) 629void CXferSocket::SetPeer(SOCKADDR_IN *sin)
629{ 630{
630 ASSERT(sin); 631 ASSERT(sin);
631 memmove(&m_Peer,sin,sizeof(m_Peer)); 632 memmove(&m_Peer,sin,sizeof(m_Peer));
632} 633}
633 634
634void CXferSocket::UpdateList() 635void CXferSocket::UpdateList()
635{ 636{
636 ASSERT(m_Daddy); 637 ASSERT(m_Daddy);
637LV_FINDINFO lvf; 638LV_FINDINFO lvf;
638 memset(&lvf,0,sizeof(lvf)); 639 memset(&lvf,0,sizeof(lvf));
639 lvf.flags=LVFI_PARAM; 640 lvf.flags=LVFI_PARAM;
640 lvf.lParam=(LPARAM)this; 641 lvf.lParam=(LPARAM)this;
641int i = m_Daddy->m_List.FindItem(&lvf); 642int i = m_Daddy->m_List.FindItem(&lvf);
642 if(i<0){ 643 if(i<0){
643 ASSERT(IsKindOf(RUNTIME_CLASS(CRRQSocket)) || IsKindOf(RUNTIME_CLASS(CWRQSocket))); 644 ASSERT(IsKindOf(RUNTIME_CLASS(CRRQSocket)) || IsKindOf(RUNTIME_CLASS(CWRQSocket)));
644 i=m_Daddy->m_List.InsertItem(0,m_FileName,IsKindOf(RUNTIME_CLASS(CRRQSocket))?m_Daddy->m_iRRQ:m_Daddy->m_iWRQ); 645 i=m_Daddy->m_List.InsertItem(0,m_FileName,IsKindOf(RUNTIME_CLASS(CRRQSocket))?m_Daddy->m_iRRQ:m_Daddy->m_iWRQ);
645 ASSERT(!(i<0)); 646 ASSERT(!(i<0));
646 m_Daddy->m_List.SetItemData(i,(DWORD)this); 647 m_Daddy->m_List.SetItemData(i,(DWORD)this);
647 } 648 }
648 m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemFile,m_FileName); 649 m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemFile,m_FileName);
649 m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemType,m_Type); 650 m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemType,m_Type);
650 m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemPeer,inet_ntoa(m_Peer.sin_addr)); 651 m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemPeer,inet_ntoa(m_Peer.sin_addr));
651CString tmp; 652CString tmp;
652 tmp.Format(IDS_FMT_BYTES,GetACK()); 653 tmp.Format(IDS_FMT_BYTES,GetACK());
653 m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemBytes,tmp); 654 m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemBytes,tmp);
654 if(m_xferSize>=0){ 655 if(m_xferSize>=0){
655 tmp.Format(IDS_FMT_BYTES,m_xferSize); 656 tmp.Format(IDS_FMT_BYTES,m_xferSize);
656 m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemTSize,tmp); 657 m_Daddy->m_List.SetItemText(i,CPumpKINDlg::subitemTSize,tmp);
657 } 658 }
658} 659}
659 660
660CXferSocket::CXferSocket() 661CXferSocket::CXferSocket()
661 : m_wndResolver(NULL), m_Retry(NULL), m_bRetry(FALSE), 662 : m_wndResolver(NULL), m_Retry(NULL), m_bRetry(FALSE),
662 m_blkSize(512), m_timeOut(30), m_xferSize(-1), 663 m_blkSize(512), m_timeOut(30), m_xferSize(-1),
663 m__blkSize(512), m__timeOut(30) 664 m__blkSize(512), m__timeOut(30)
664{ 665{
665 m_Daddy=NULL; 666 m_Daddy=NULL;
666 m_Peer.sin_addr.s_addr=INADDR_NONE; 667 m_Peer.sin_addr.s_addr=INADDR_NONE;
667 m_Peer.sin_family=AF_INET; 668 m_Peer.sin_family=AF_INET;
668 state=stateNone; 669 state=stateNone;
669} 670}
670 671
671ULONG CXferSocket::GetACK() 672ULONG CXferSocket::GetACK()
672{ 673{
673 return 0; 674 return 0;
674} 675}
675 676
676CXferSocket::CXferSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN* sin) 677CXferSocket::CXferSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN* sin)
677 : m_wndResolver(NULL), m_Retry(NULL), m_bRetry(FALSE), 678 : m_wndResolver(NULL), m_Retry(NULL), m_bRetry(FALSE),
678 m_blkSize(512), m_timeOut(30), m_xferSize(-1), 679 m_blkSize(512), m_timeOut(30), m_xferSize(-1),
679 m__blkSize(512), m__timeOut(30) 680 m__blkSize(512), m__timeOut(30)
680{ 681{
681 m_Peer.sin_family=AF_INET; 682 m_Peer.sin_family=AF_INET;
682 state=stateNone; 683 state=stateNone;
683 ASSERT(daddy); 684 ASSERT(daddy);
684 m_Daddy=daddy; 685 m_Daddy=daddy;
685 m_timeOut=m__timeOut=m_Daddy->m_TFTPTimeOut.GetTotalSeconds(); 686 m_timeOut=m__timeOut=m_Daddy->m_TFTPTimeOut.GetTotalSeconds();
686 if(sin){ 687 if(sin){
687 m_Peer.sin_addr.s_addr=sin->sin_addr.s_addr; 688 m_Peer.sin_addr.s_addr=sin->sin_addr.s_addr;
688 m_Peer.sin_port=sin->sin_port; 689 m_Peer.sin_port=sin->sin_port;
689 }else 690 }else
690 m_Peer.sin_addr.s_addr=INADDR_NONE; 691 m_Peer.sin_addr.s_addr=INADDR_NONE;
691 m_FileName=fileName; 692 m_FileName=fileName;
692 m_Type=type; 693 m_Type=type;
693} 694}
694 695
695BOOL CRRQSocket::Create(LPCTSTR localFile,LPCTSTR hostName) 696BOOL CRRQSocket::Create(LPCTSTR localFile,LPCTSTR hostName)
696{ 697{
697 if(!CAsyncSocket::Create(0,SOCK_DGRAM)) 698 if(!CAsyncSocket::Create(0,SOCK_DGRAM))
698 return FALSE; 699 return FALSE;
699 ASSERT(m_Daddy); 700 ASSERT(m_Daddy);
700 ASSERT(m_Peer.sin_addr.s_addr!=INADDR_NONE || hostName); 701 ASSERT(m_Peer.sin_addr.s_addr!=INADDR_NONE || hostName);
701 m_Daddy->m_Xfers[m_hSocket]=this; 702 m_Daddy->m_Xfers[m_hSocket]=this;
702CString lFile = localFile?localFile:m_FileName; 703CString lFile = localFile?localFile:m_FileName;
703 TurnSlashes(lFile,TRUE); 704 TurnSlashes(lFile,TRUE);
704 UpdateList(); 705 UpdateList();
705 if(!localFile){// Check only for incoming requests 706 if(!localFile){// Check only for incoming requests
706 if(CheckBadRelativeness(m_FileName)){ 707 if(CheckBadRelativeness(m_FileName)){
707 Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS); 708 Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS);
708 return TRUE; 709 return TRUE;
709 } 710 }
710 int atar=m_Daddy->m_aclRules.FindTarget(acl_rule::opRRQ,m_Peer.sin_addr.s_addr); 711 int atar=m_Daddy->m_aclRules.FindTarget(acl_rule::opRRQ,m_Peer.sin_addr.s_addr);
711 if(atar<0) 712 if(atar<0)
712 atar = m_Daddy->m_RRQMode; 713 atar = m_Daddy->m_RRQMode;
713 switch(atar){ 714 switch(atar){
714 case CPumpKINDlg::rrqGiveAll: 715 case CPumpKINDlg::rrqGiveAll:
715 break; 716 break;
716 case CPumpKINDlg::rrqAlwaysConfirm: 717 case CPumpKINDlg::rrqAlwaysConfirm:
717 if(ConfirmRequest()) 718 if(ConfirmRequest())
718 break; 719 break;
719 default: 720 default:
720 TRACE1("Unexpected access target: %d\n",atar); 721 TRACE1("Unexpected access target: %d\n",atar);
721 case CPumpKINDlg::rrqDenyAll: 722 case CPumpKINDlg::rrqDenyAll:
722 Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS); 723 Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS);
723 return TRUE; 724 return TRUE;
724 } 725 }
725 } 726 }
726CString fn = localFile?ApplyRootGently(lFile):ApplyRoot(lFile); 727CString fn = localFile?ApplyRootGently(lFile):ApplyRoot(lFile);
727CFileException e; 728CFileException e;
728 if(!m_File.Open(fn,CFile::modeRead|CFile::shareDenyWrite,&e)){ 729 if(!m_File.Open(fn,CFile::modeRead|CFile::shareDenyWrite,&e)){
729 if(localFile){ 730 if(localFile){
730 CString tmp; 731 CString tmp;
731 tmp.Format(IDS_LOG_FAILEDLOCALFILE,fn); 732 tmp.Format(IDS_LOG_FAILEDLOCALFILE,fn);
732 m_Daddy->LogLine(tmp); 733 m_Daddy->LogLine(tmp);
733 return FALSE; 734 return FALSE;
734 } 735 }
735 Deny(&e); 736 Deny(&e);
736 return TRUE; 737 return TRUE;
737 } 738 }
738 m_xferSize=m_File.GetLength();// *** HANDLE EXCEPTION 739 m_xferSize=m_File.GetLength();// *** HANDLE EXCEPTION
739 if(hostName){ 740 if(hostName){
740 m_HostName=hostName; 741 m_HostName=hostName;
741 742
742 CString tmp; 743 CString tmp;
743 tmp.Format(IDS_LOG_SENDING,m_FileName,m_HostName); 744 tmp.Format(IDS_LOG_SENDING,m_FileName,m_HostName);
744 m_Daddy->LogLine(tmp); 745 m_Daddy->LogLine(tmp);
745 746
746 CString inAddr = hostName; 747 CString inAddr = hostName;
747 int at = inAddr.Find('@'); 748 int at = inAddr.Find('@');
748 if(at>=0) 749 if(at>=0)
749 inAddr=inAddr.Mid(at+1); 750 inAddr=inAddr.Mid(at+1);
750 if((m_Peer.sin_addr.s_addr=inet_addr((LPCTSTR)inAddr))==INADDR_NONE){ 751 if((m_Peer.sin_addr.s_addr=inet_addr((LPCTSTR)inAddr))==INADDR_NONE){
751 ASSERT(!m_wndResolver); 752 ASSERT(!m_wndResolver);
752 m_wndResolver = new CResolver(this); 753 m_wndResolver = new CResolver(this);
753 ASSERT(m_wndResolver); 754 ASSERT(m_wndResolver);
754 return m_wndResolver->Resolve(); 755 return m_wndResolver->Resolve();
755 } 756 }
756 else 757 else
757 OnHostKnown(); 758 OnHostKnown();
758 }else{ 759 }else{
759 tftp::tftpOptions o; 760 tftp::tftpOptions o;
760 CString v; 761 CString v;
761 if(m_Options.Lookup(tftpoBSize,v)){ 762 if(m_Options.Lookup(tftpoBSize,v)){
762 m__blkSize=atoi(v); 763 m__blkSize=atoi(v);
763 if(m__blkSize){ 764 if(m__blkSize){
764 m_blkSize=m__blkSize; 765 m_blkSize=m__blkSize;
765 v.Format("%u",m_blkSize); 766 v.Format("%u",m_blkSize);
766 o[tftpoBSize]=v; 767 o[tftpoBSize]=v;
767 } 768 }
768 } 769 }
769 if(m_Options.Lookup(tftpoTSize,v)){ 770 if(m_Options.Lookup(tftpoTSize,v)){
770 v.Format("%lu",m_xferSize); 771 v.Format("%lu",m_xferSize);
771 o[tftpoTSize]=v; 772 o[tftpoTSize]=v;
772 } 773 }
773 if(m_Options.Lookup(tftpoTOut,v)){ 774 if(m_Options.Lookup(tftpoTOut,v)){
774 m__timeOut=atoi(v); 775 m__timeOut=atoi(v);
775 if(m__timeOut){ 776 if(m__timeOut){
776 m_timeOut=m__timeOut; 777 m_timeOut=m__timeOut;
777 v.Format("%u",m_timeOut); 778 v.Format("%u",m_timeOut);
778 o[tftpoTOut]=v; 779 o[tftpoTOut]=v;
779 } 780 }
780 } 781 }
781 // XXX: see if we can enforce our preference regarding block size here. 782 // XXX: see if we can enforce our preference regarding block size here.
782 if(m_xferSize >= (m_blkSize<<16)) { 783 if(m_xferSize >= (m_blkSize<<16)) {
783 Deny(tftp::errUndefined,IDS_TFTP_ERROR_TOOBIG); 784 Deny(tftp::errUndefined,IDS_TFTP_ERROR_TOOBIG);
784 return TRUE; 785 return TRUE;
785 } 786 }
786 state = stateXfer; 787 state = stateXfer;
787 m_ACK=0; 788 m_ACK=0;
788 if(o.GetCount()){ 789 if(o.GetCount()){
789 tftp *p = tftp::Allocate(tftp::tftpOACK::tftpSize(&o)); 790 tftp *p = tftp::Allocate(tftp::tftpOACK::tftpSize(&o));
790 ASSERT(p); 791 ASSERT(p);
791 p->SetOpcode(tftp::opOACK); 792 p->SetOpcode(tftp::opOACK);
792 p->data.m_OACK.Set(&o); 793 p->data.m_OACK.Set(&o);
793 PostTFTP(p,TRUE); 794 PostTFTP(p,TRUE);
794 }else 795 }else
795 DoXfer(); 796 DoXfer();
796 } 797 }
797 return TRUE; 798 return TRUE;
798} 799}
799 800
800CRRQSocket::CRRQSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin) 801CRRQSocket::CRRQSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin)
801 : CXferSocket(daddy,fileName,type,sin) 802 : CXferSocket(daddy,fileName,type,sin)
802{ 803{
803 m_ACK=0; 804 m_ACK=0;
804 m_LastSlack=0; 805 m_LastSlack=0;
805} 806}
806 807
807UINT tftp::tftpERROR::tftpSize(LPCTSTR msg) 808UINT tftp::tftpERROR::tftpSize(LPCTSTR msg)
808{ 809{
809 return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpERROR::tftpErrorCode)+strlen(msg)+1; 810 return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpERROR::tftpErrorCode)+strlen(msg)+1;
810} 811}
811 812
812tftp* tftp::Allocate(UINT tftpSize) 813tftp* tftp::Allocate(UINT tftpSize)
813{ 814{
814 ASSERT(tftpSize); 815 ASSERT(tftpSize);
815tftp* rv = (tftp*) new BYTE[tftpSlackSize+tftpSize]; 816tftp* rv = (tftp*) new BYTE[tftpSlackSize+tftpSize];
816 ASSERT(rv); 817 ASSERT(rv);
817 rv->length=tftpSize; 818 rv->length=tftpSize;
818 return rv; 819 return rv;
819} 820}
820 821
821void tftp::errSet(UINT code,LPCTSTR msg) 822void tftp::errSet(UINT code,LPCTSTR msg)
822{ 823{
823 ASSERT(this); 824 ASSERT(this);
824 ASSERT(length>=data.m_ERROR.tftpSize(msg)); 825 ASSERT(length>=data.m_ERROR.tftpSize(msg));
825 strcpy((char*)data.m_ERROR.data,msg); 826 strcpy((char*)data.m_ERROR.data,msg);
826 data.m_ERROR.SetCode(code); 827 data.m_ERROR.SetCode(code);
827} 828}
828 829
829void CXferSocket::PostTFTP(tftp* p,BOOL retryable) 830void CXferSocket::PostTFTP(tftp* p,BOOL retryable)
830{ 831{
831 ASSERT(p); 832 ASSERT(p);
832 m_Queue.AddTail(p); 833 m_Queue.AddTail(p);
833 DoSelect(); 834 DoSelect();
834 if(!m_bRetry){ 835 if(!m_bRetry){
835 if(retryable) 836 if(retryable)
836 SetTry(p); 837 SetTry(p);
837 else 838 else
838 SetTry(); 839 SetTry();
839 } 840 }
840 ResetTimeout(); 841 ResetTimeout();
841} 842}
842 843
843void CXferSocket::Deny(UINT errCode,UINT errID) 844void CXferSocket::Deny(UINT errCode,UINT errID)
844{ 845{
845 PostError(errCode,errID); 846 PostError(errCode,errID);
846 state=stateDeny; 847 state=stateDeny;
847} 848}
848 849
849void CRRQSocket::DoXfer() 850void CRRQSocket::DoXfer()
850{ 851{
851tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize)); 852tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize));
852 ASSERT(p); 853 ASSERT(p);
853 p->SetOpcode(tftp::opDATA); 854 p->SetOpcode(tftp::opDATA);
854 TRY{ 855 TRY{
855 m_File.Seek(m_ACK*m_blkSize,CFile::begin); 856 m_File.Seek(m_ACK*m_blkSize,CFile::begin);
856 int bytes = m_File.Read(p->data.m_DATA.data,m_blkSize); 857 int bytes = m_File.Read(p->data.m_DATA.data,m_blkSize);
857 p->data.m_DATA.SetBlock(m_ACK+1); 858 p->data.m_DATA.SetBlock(m_ACK+1);
858 p->length=p->length-m_blkSize+bytes; 859 p->length=p->length-m_blkSize+bytes;
859 m_LastSlack = m_blkSize-bytes; 860 m_LastSlack = m_blkSize-bytes;
860 PostTFTP(p); 861 PostTFTP(p);
861 if(bytes<m_blkSize){ 862 if(bytes<m_blkSize){
862 state=stateClosing; m_ACKtoClose = m_ACK+1; 863 state=stateClosing; m_ACKtoClose = m_ACK+1;
863 } 864 }
864 }CATCH(CFileException,e){ 865 }CATCH(CFileException,e){
865 Deny(e); 866 Deny(e);
866 }END_CATCH 867 }END_CATCH
867} 868}
868 869
869UINT tftp::tftpDATA::tftpSize(UINT blkSize) 870UINT tftp::tftpDATA::tftpSize(UINT blkSize)
870{ 871{
871 return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpDATA) 872 return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpDATA)
872 -sizeof(BYTE)+blkSize; 873 -sizeof(BYTE)+blkSize;
873} 874}
874 875
875void CXferSocket::Deny(CFileException* e) 876void CXferSocket::Deny(CFileException* e)
876{ 877{
877 PostError(e); 878 PostError(e);
878 state=stateDeny; 879 state=stateDeny;
879} 880}
880 881
881void CXferSocket::PostError(UINT errCode,UINT errID) 882void CXferSocket::PostError(UINT errCode,UINT errID)
882{ 883{
883CString msg; 884CString msg;
884 msg.LoadString(errID); 885 msg.LoadString(errID);
885 ASSERT(m_Daddy); 886 ASSERT(m_Daddy);
886CString tmp; 887CString tmp;
887 tmp.Format(IDS_LOG_SENTTFTPERROR,errCode,(LPCTSTR)msg); 888 tmp.Format(IDS_LOG_SENTTFTPERROR,errCode,(LPCTSTR)msg);
888 m_Daddy->LogLine(tmp); 889 m_Daddy->LogLine(tmp);
889tftp* err = tftp::Allocate(tftp::tftpERROR::tftpSize(msg)); 890tftp* err = tftp::Allocate(tftp::tftpERROR::tftpSize(msg));
890err->SetOpcode(tftp::opERROR); 891err->SetOpcode(tftp::opERROR);
891 err->errSet(errCode,msg); 892 err->errSet(errCode,msg);
892 PostTFTP(err); 893 PostTFTP(err);
893} 894}
894 895
895void CXferSocket::PostError(CFileException* e) 896void CXferSocket::PostError(CFileException* e)
896{ 897{
897UINT eCode; 898UINT eCode;
898UINT eMsgID; 899UINT eMsgID;
899 switch(e->m_cause){ 900 switch(e->m_cause){
900 case CFileException::fileNotFound: 901 case CFileException::fileNotFound:
901 eCode=tftp::errNotFound; 902 eCode=tftp::errNotFound;
902 eMsgID=IDS_TFTP_ERROR_NOTFOUND; 903 eMsgID=IDS_TFTP_ERROR_NOTFOUND;
903 break; 904 break;
904 case CFileException::accessDenied: 905 case CFileException::accessDenied:
905 eCode=tftp::errAccessViolation; 906 eCode=tftp::errAccessViolation;
906 eMsgID=IDS_TFTP_ERROR_ACCESS; 907 eMsgID=IDS_TFTP_ERROR_ACCESS;
907 break; 908 break;
908 case CFileException::directoryFull: 909 case CFileException::directoryFull:
909 eCode=tftp::errDiskFull; 910 eCode=tftp::errDiskFull;
910 eMsgID=IDS_TFTP_ERROR_DIRFULL; 911 eMsgID=IDS_TFTP_ERROR_DIRFULL;
911 break; 912 break;
912 case CFileException::sharingViolation: 913 case CFileException::sharingViolation:
913 eCode=tftp::errAccessViolation; 914 eCode=tftp::errAccessViolation;
914 eMsgID=IDS_TFTP_ERROR_SHARING; 915 eMsgID=IDS_TFTP_ERROR_SHARING;
915 break; 916 break;
916 case CFileException::diskFull: 917 case CFileException::diskFull:
917 eCode=tftp::errDiskFull; 918 eCode=tftp::errDiskFull;
918 eMsgID=IDS_TFTP_ERROR_DISKFULL; 919 eMsgID=IDS_TFTP_ERROR_DISKFULL;
919 break; 920 break;
920 default: 921 default:
921 eCode=tftp::errUndefined; 922 eCode=tftp::errUndefined;
922 eMsgID=IDS_TFTP_ERROR_UNDEFINED; 923 eMsgID=IDS_TFTP_ERROR_UNDEFINED;
923 break; 924 break;
924 } 925 }
925 PostError(eCode,eMsgID); 926 PostError(eCode,eMsgID);
926} 927}
927 928
928ULONG CRRQSocket::GetACK(void) 929ULONG CRRQSocket::GetACK(void)
929{ 930{
930 return (m_ACK*m_blkSize)-m_LastSlack; 931 return (m_ACK*m_blkSize)-m_LastSlack;
931} 932}
932 933
933BOOL CRRQSocket::OnTFTP(tftp* p) 934BOOL CRRQSocket::OnTFTP(tftp* p)
934{ 935{
935BOOL rv = TRUE; 936BOOL rv = TRUE;
936 switch(p->Opcode()){ 937 switch(p->Opcode()){
937 case tftp::opOACK: 938 case tftp::opOACK:
938 { 939 {
939 m_ACK=0; 940 m_ACK=0;
940 ASSERT(state!=stateFinish); 941 ASSERT(state!=stateFinish);
941 tftp::tftpOptions o; 942 tftp::tftpOptions o;
942 if(p->GetOptions(&o)){ 943 if(p->GetOptions(&o)){
943 CString v; 944 CString v;
944 if(o.Lookup(tftpoBSize,v)){ 945 if(o.Lookup(tftpoBSize,v)){
945 m_blkSize=atoi(v); 946 m_blkSize=atoi(v);
946 if(!m_blkSize){// *** More sanity checks 947 if(!m_blkSize){// *** More sanity checks
947 Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE); 948 Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);
948 rv = TRUE; 949 rv = TRUE;
949 break; 950 break;
950 } 951 }
951 } 952 }
952 if(o.Lookup(tftpoTOut,v)){ 953 if(o.Lookup(tftpoTOut,v)){
953 m_timeOut=atoi(v); 954 m_timeOut=atoi(v);
954 if(!m_timeOut){// *** More sanity checks 955 if(!m_timeOut){// *** More sanity checks
955 Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT); 956 Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);
956 rv = TRUE; 957 rv = TRUE;
957 break; 958 break;
958 } 959 }
959 } 960 }
960 if(o.Lookup(tftpoXResume,v)){ 961 if(o.Lookup(tftpoXResume,v)){
961 m_ACK=atoi(v); 962 m_ACK=atoi(v);
962 } 963 }
963 } 964 }
964 UpdateList(); 965 UpdateList();
965 DoXfer(); 966 DoXfer();
966 } 967 }
967 break; 968 break;
968 case tftp::opACK: 969 case tftp::opACK:
969 m_ACK=p->data.m_ACK.Block(); 970 m_ACK=p->data.m_ACK.Block();
970 if(state==stateClosing && m_ACK==m_ACKtoClose) { 971 if(state==stateClosing && m_ACK==m_ACKtoClose) {
971 state = stateFinish; 972 state = stateFinish;
972 ASSERT(m_Daddy); 973 ASSERT(m_Daddy);
973 CString tmp; 974 CString tmp;
974 tmp.Format(IDS_LOG_XFERRRQFINISHED,(LPCTSTR)m_FileName); 975 tmp.Format(IDS_LOG_XFERRRQFINISHED,(LPCTSTR)m_FileName);
975 m_Daddy->LogLine(tmp); 976 m_Daddy->LogLine(tmp);
976 rv = FALSE; 977 rv = FALSE;
977 DoSelect(TRUE); 978 DoSelect(TRUE);
978 }else if(state!=stateFinish){ 979 }else if(state!=stateFinish){
979 UpdateList(); 980 UpdateList();
980 DoXfer(); 981 DoXfer();
981 } 982 }
982 break; 983 break;
983 case tftp::opERROR: 984 case tftp::opERROR:
984 { 985 {
985 ASSERT(m_Daddy); 986 ASSERT(m_Daddy);
986 CString tmp; 987 CString tmp;
987 tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage()); 988 tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage());
988 m_Daddy->LogLine(tmp); 989 m_Daddy->LogLine(tmp);
989 } 990 }
990 Destroy(FALSE); 991 Destroy(FALSE);
991 rv = FALSE; 992 rv = FALSE;
992 break; 993 break;
993 default: 994 default:
994 { 995 {
995 ASSERT(m_Daddy); 996 ASSERT(m_Daddy);
996 CString tmp; 997 CString tmp;
997 tmp.Format(IDS_LOG_XFEROPCODE,p->Opcode()); 998 tmp.Format(IDS_LOG_XFEROPCODE,p->Opcode());
998 m_Daddy->LogLine(tmp); 999 m_Daddy->LogLine(tmp);
999 // *** Self destruct maybe?? 1000 // *** Self destruct maybe??
1000 } 1001 }
1001 break; 1002 break;
1002 } 1003 }
1003 return rv; 1004 return rv;
1004} 1005}
1005 1006
1006BOOL CWRQSocket::OnTFTP(tftp* p) 1007BOOL CWRQSocket::OnTFTP(tftp* p)
1007{ 1008{
1008 switch(p->Opcode()){ 1009 switch(p->Opcode()){
1009 case tftp::opOACK: 1010 case tftp::opOACK:
1010 ASSERT(state!=stateFinish); 1011 ASSERT(state!=stateFinish);
1011 { 1012 {
1012 if(m_bResume) 1013 if(m_bResume)
1013 m_ACK=m_File.GetLength()/m_blkSize; 1014 m_ACK=m_File.GetLength()/m_blkSize;
1014 else 1015 else
1015 m_ACK=0; 1016 m_ACK=0;
1016 tftp::tftpOptions o; 1017 tftp::tftpOptions o;
1017 if(p->GetOptions(&o)){ 1018 if(p->GetOptions(&o)){
1018 CString v; 1019 CString v;
1019 if(o.Lookup(tftpoBSize,v)){ 1020 if(o.Lookup(tftpoBSize,v)){
1020 m_blkSize=atoi(v); 1021 m_blkSize=atoi(v);
1021 if(!m_blkSize){// *** More sanity checks 1022 if(!m_blkSize){// *** More sanity checks
1022 Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE); 1023 Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);
1023 return TRUE; 1024 return TRUE;
1024 } 1025 }
1025 } 1026 }
1026 if(o.Lookup(tftpoTOut,v)){ 1027 if(o.Lookup(tftpoTOut,v)){
1027 m_timeOut=atoi(v); 1028 m_timeOut=atoi(v);
1028 if(!m_timeOut){// *** More sanity checks 1029 if(!m_timeOut){// *** More sanity checks
1029 Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT); 1030 Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);
1030 return TRUE; 1031 return TRUE;
1031 } 1032 }
1032 } 1033 }
1033 if(o.Lookup(tftpoTSize,v)){ 1034 if(o.Lookup(tftpoTSize,v)){
1034 m_xferSize=atoi(v); 1035 m_xferSize=atoi(v);
1035 } 1036 }
1036 if(m_xferSize>=0 && m_xferSize>=(m_blkSize<<16)) { 1037 if(m_xferSize>=0 && m_xferSize>=(m_blkSize<<16)) {
1037 Deny(tftp::errUndefined,IDS_TFTP_ERROR_TOOBIG); 1038 Deny(tftp::errUndefined,IDS_TFTP_ERROR_TOOBIG);
1038 return TRUE; 1039 return TRUE;
1039 } 1040 }
1040 } 1041 }
1041 UpdateList(); 1042 UpdateList();
1042 DoXfer(); 1043 DoXfer();
1043 } 1044 }
1044 break; 1045 break;
1045 case tftp::opDATA: 1046 case tftp::opDATA:
1046 { 1047 {
1047 UINTblock = p->data.m_DATA.Block(); 1048 UINTblock = p->data.m_DATA.Block();
1048 TRY{ 1049 TRY{
1049 m_File.Seek((block-1)*m_blkSize,CFile::begin); 1050 m_File.Seek((block-1)*m_blkSize,CFile::begin);
1050 int bytes = p->length-sizeof(p->data.m_DATA.block)-(tftpHdrSize-tftpSlackSize); 1051 int bytes = p->length-sizeof(p->data.m_DATA.block)-(tftpHdrSize-tftpSlackSize);
1051 if(bytes){ 1052 if(bytes){
1052 m_File.Write(p->data.m_DATA.data,bytes); 1053 m_File.Write(p->data.m_DATA.data,bytes);
1053 // *** Move to the other place where we can do it not that often 1054 // *** Move to the other place where we can do it not that often
1054 m_File.SetLength(m_File.GetPosition()); 1055 m_File.SetLength(m_File.GetPosition());
1055 } 1056 }
1056 if(bytes<m_blkSize){ 1057 if(bytes<m_blkSize){
1057 state=stateFinish; 1058 state=stateFinish;
1058 ASSERT(m_Daddy); 1059 ASSERT(m_Daddy);
1059 CString tmp; 1060 CString tmp;
1060 tmp.Format(IDS_LOG_XFERWRQFINISHED,(LPCTSTR)m_FileName); 1061 tmp.Format(IDS_LOG_XFERWRQFINISHED,(LPCTSTR)m_FileName);
1061 m_Daddy->LogLine(tmp); 1062 m_Daddy->LogLine(tmp);
1062 } 1063 }
1063 m_ACK=block; 1064 m_ACK=block;
1064 m_LastSlack=m_blkSize-bytes; 1065 m_LastSlack=m_blkSize-bytes;
1065 UpdateList(); 1066 UpdateList();
1066 DoXfer(); 1067 DoXfer();
1067 }CATCH(CFileException,e){ 1068 }CATCH(CFileException,e){
1068 Deny(e); 1069 Deny(e);
1069 }END_CATCH 1070 }END_CATCH
1070 } 1071 }
1071 break; 1072 break;
1072 case tftp::opERROR: 1073 case tftp::opERROR:
1073 { 1074 {
1074 ASSERT(m_Daddy); 1075 ASSERT(m_Daddy);
1075 CString tmp; 1076 CString tmp;
1076 tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage()); 1077 tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage());
1077 m_Daddy->LogLine(tmp); 1078 m_Daddy->LogLine(tmp);
1078 } 1079 }
1079 Destroy(FALSE); 1080 Destroy(FALSE);
1080 return FALSE; 1081 return FALSE;
1081 default: 1082 default:
1082 { 1083 {
1083 ASSERT(m_Daddy); 1084 ASSERT(m_Daddy);
1084 CString tmp; 1085 CString tmp;
1085 tmp.Format(IDS_LOG_XFEROPCODE,p->Opcode()); 1086 tmp.Format(IDS_LOG_XFEROPCODE,p->Opcode());
1086 m_Daddy->LogLine(tmp); 1087 m_Daddy->LogLine(tmp);
1087 // *** Self destruct maybe?? 1088 // *** Self destruct maybe??
1088 } 1089 }
1089 break; 1090 break;
1090 } 1091 }
1091 return TRUE; 1092 return TRUE;
1092} 1093}
1093 1094
1094void tftp::SetOpcode(WORD op) 1095void tftp::SetOpcode(WORD op)
1095{ 1096{
1096 opcode = REVERSEBYTES(op); 1097 opcode = REVERSEBYTES(op);
1097} 1098}
1098void tftp::tftpDATA::SetBlock(WORD b) 1099void tftp::tftpDATA::SetBlock(WORD b)
1099{ 1100{
1100 block=REVERSEBYTES(b); 1101 block=REVERSEBYTES(b);
1101} 1102}
1102WORD tftp::tftpDATA::Block() 1103WORD tftp::tftpDATA::Block()
1103{ 1104{
1104 return REVERSEBYTES(block); 1105 return REVERSEBYTES(block);
1105} 1106}
1106WORD tftp::tftpACK::Block() 1107WORD tftp::tftpACK::Block()
1107{ 1108{
1108 return REVERSEBYTES(block); 1109 return REVERSEBYTES(block);
1109} 1110}
1110void tftp::tftpACK::SetBlock(WORD b) 1111void tftp::tftpACK::SetBlock(WORD b)
1111{ 1112{
1112 block = REVERSEBYTES(b); 1113 block = REVERSEBYTES(b);
1113} 1114}
1114WORD tftp::tftpERROR::Code() 1115WORD tftp::tftpERROR::Code()
1115{ 1116{
1116 return REVERSEBYTES(code); 1117 return REVERSEBYTES(code);
1117} 1118}
1118void tftp::tftpERROR::SetCode(WORD c) 1119void tftp::tftpERROR::SetCode(WORD c)
1119{ 1120{
1120 code = REVERSEBYTES(c); 1121 code = REVERSEBYTES(c);
1121} 1122}
1122 1123
1123 1124
1124CString tftp::errMessage() 1125CString tftp::errMessage()
1125{ 1126{
1126CString rv; 1127CString rv;
1127 if(memchr(data.m_ERROR.data,0,length-(tftpHdrSize-tftpSlackSize)-sizeof(data.m_ERROR.code))) 1128 if(memchr(data.m_ERROR.data,0,length-(tftpHdrSize-tftpSlackSize)-sizeof(data.m_ERROR.code)))
1128 rv = (LPCTSTR)data.m_ERROR.data; 1129 rv = (LPCTSTR)data.m_ERROR.data;
1129 return rv; 1130 return rv;
1130} 1131}
1131 1132
1132void CXferSocket::Destroy(BOOL success) 1133void CXferSocket::Destroy(BOOL success)
1133{ 1134{
1134 if(m_wndResolver){ 1135 if(m_wndResolver){
1135 delete m_wndResolver; 1136 delete m_wndResolver;
1136 m_wndResolver=NULL; 1137 m_wndResolver=NULL;
1137 } 1138 }
1138 SetTry(); 1139 SetTry();
1139 m_Daddy->m_bnw.StartSound( 1140 m_Daddy->m_bnw.StartSound(
1140 success 1141 success
1141 ? m_Daddy->m_bnwSuccess 1142 ? m_Daddy->m_bnwSuccess
1142 : m_Daddy->m_bnwAbort 1143 : m_Daddy->m_bnwAbort
1143 ); 1144 );
1144 if(m_File.m_hFile!=CFile::hFileNull){ 1145 if(m_File.m_hFile!=CFile::hFileNull){
1145 TRY{ 1146 TRY{
1146 m_File.Close(); 1147 m_File.Close();
1147 }CATCH(CFileException,e){ 1148 }CATCH(CFileException,e){
1148 TRACE0("Error closing file\n"); 1149 TRACE0("Error closing file\n");
1149 }END_CATCH 1150 }END_CATCH
1150 } 1151 }
1151 ASSERT(m_Daddy); 1152 ASSERT(m_Daddy);
1152 m_Daddy->KillTimer(m_hSocket); 1153 m_Daddy->KillTimer(m_hSocket);
1153 m_Daddy->m_Xfers.RemoveKey(m_hSocket); 1154 m_Daddy->m_Xfers.RemoveKey(m_hSocket);
1154LV_FINDINFO lvf; 1155LV_FINDINFO lvf;
1155 memset(&lvf,0,sizeof(lvf)); 1156 memset(&lvf,0,sizeof(lvf));
1156 lvf.flags=LVFI_PARAM; 1157 lvf.flags=LVFI_PARAM;
1157 lvf.lParam=(LPARAM)this; 1158 lvf.lParam=(LPARAM)this;
1158int i = m_Daddy->m_List.FindItem(&lvf); 1159int i = m_Daddy->m_List.FindItem(&lvf);
1159 if(i>=0) 1160 if(i>=0)
1160 m_Daddy->m_List.DeleteItem(i); 1161 m_Daddy->m_List.DeleteItem(i);
1161 delete this; 1162 delete this;
1162} 1163}
1163 1164
1164void CPumpKINDlg::LogLineToScreen(LPCTSTR str) 1165void CPumpKINDlg::LogLineToScreen(LPCTSTR str)
1165{ 1166{
1166 ASSERT(m_LogLength); 1167 ASSERT(m_LogLength);
1167 while(m_Log.GetCount()>m_LogLength && m_Log.GetCount()!=LB_ERR){ 1168 while(m_Log.GetCount()>m_LogLength && m_Log.GetCount()!=LB_ERR){
1168 CTime *t = (CTime*)m_Log.GetItemData(0); 1169 CTime *t = (CTime*)m_Log.GetItemData(0);
1169 if(((DWORD)t)!=LB_ERR){ 1170 if(((DWORD)t)!=LB_ERR){
1170 ASSERT(t); 1171 ASSERT(t);
1171 m_LogTimes.RemoveKey(t); 1172 m_LogTimes.RemoveKey(t);
1172 delete t; 1173 delete t;
1173 } 1174 }
1174 m_Log.DeleteString(0); 1175 m_Log.DeleteString(0);
1175 } 1176 }
1176int i = m_Log.AddString(str); 1177int i = m_Log.AddString(str);
1177 ASSERT(i!=LB_ERR); 1178 ASSERT(i!=LB_ERR);
1178CTime *t = new CTime(CTime::GetCurrentTime()); 1179CTime *t = new CTime(CTime::GetCurrentTime());
1179 m_Log.SetItemData(i,(DWORD)(m_LogTimes[t]=t)); 1180 m_Log.SetItemData(i,(DWORD)(m_LogTimes[t]=t));
1180 m_Log.SetCurSel(i); 1181 m_Log.SetCurSel(i);
1181} 1182}
1182 1183
1183void CPumpKINDlg::LogLine(UINT msgID) 1184void CPumpKINDlg::LogLine(UINT msgID)
1184{ 1185{
1185CString tmp; 1186CString tmp;
1186 tmp.Format(msgID); 1187 tmp.Format(msgID);
1187 LogLine(tmp); 1188 LogLine(tmp);
1188} 1189}
1189 1190
1190void CXferSocket::TurnSlashes(CString& fn,BOOL bBack) 1191void CXferSocket::TurnSlashes(CString& fn,BOOL bBack)
1191{ 1192{
1192 ints = fn.Find(bBack?'/':'\\'); 1193 ints = fn.Find(bBack?'/':'\\');
1193 while(s>=0){ 1194 while(s>=0){
1194 fn.SetAt(s,bBack?'\\':'/'); 1195 fn.SetAt(s,bBack?'\\':'/');
1195 s = fn.Find(bBack?'/':'\\'); 1196 s = fn.Find(bBack?'/':'\\');
1196 } 1197 }
1197} 1198}
1198 1199
1199CString CXferSocket::ApplyRoot(LPCTSTR fileName) 1200CString CXferSocket::ApplyRoot(LPCTSTR fileName)
1200{ 1201{
1201 ASSERT(m_Daddy); 1202 ASSERT(m_Daddy);
1202CString fn = fileName; 1203CString fn = fileName;
1203CString rv = m_Daddy->m_TFTPRoot; 1204CString rv = m_Daddy->m_TFTPRoot;
1204 if(rv.IsEmpty()) 1205 if(rv.IsEmpty())
1205 rv = "."; 1206 rv = ".";
1206 if(rv[rv.GetLength()-1]!='\\') 1207 if(rv[rv.GetLength()-1]!='\\')
1207 rv+="\\"; 1208 rv+="\\";
1208 while((!fn.IsEmpty()) && fn[0]=='\\') 1209 while((!fn.IsEmpty()) && fn[0]=='\\')
1209 fn=fn.Mid(1); 1210 fn=fn.Mid(1);
1210 rv+=fn; 1211 rv+=fn;
1211 return rv; 1212 return rv;
1212} 1213}
1213 1214
1214void CPumpKINDlg::OnOptions() 1215void CPumpKINDlg::OnOptions()
1215{ 1216{
1216CPropertySheet cps(IDS_TITLE_OPTIONS,this); 1217CPropertySheet cps(IDS_TITLE_OPTIONS,this);
1217CPropsServer server; 1218CPropsServer server;
1218CPropsNetwork network; 1219CPropsNetwork network;
1219CPropsSounds sounds; 1220CPropsSounds sounds;
1220CPropsACL acl; 1221CPropsACL acl;
1221 1222
1222 server.m_RRQMode=m_RRQMode; 1223 server.m_RRQMode=m_RRQMode;
1223 server.m_TFTPRoot=m_TFTPRoot; 1224 server.m_TFTPRoot=m_TFTPRoot;
1224 server.m_TFTPSubdirs=m_bTFTPSubdirs; 1225 server.m_TFTPSubdirs=m_bTFTPSubdirs;
1225 server.m_WRQMode=m_WRQMode; 1226 server.m_WRQMode=m_WRQMode;
1226 server.m_PromptTimeOut=m_PromptTimeOut; 1227 server.m_PromptTimeOut=m_PromptTimeOut;
1227 server.m_LogFile=m_LogFile; 1228 server.m_LogFile=m_LogFile;
1228 1229
1229 network.m_ListenPort=m_ListenPort; 1230 network.m_ListenPort=m_ListenPort;
1230 network.m_SpeakPort=m_SpeakPort; 1231 network.m_SpeakPort=m_SpeakPort;
1231 network.m_TimeOut=m_TFTPTimeOut.GetTotalSeconds(); 1232 network.m_TimeOut=m_TFTPTimeOut.GetTotalSeconds();
1232 network.m_BlockSize=m_BlockSize; 1233 network.m_BlockSize=m_BlockSize;
1233 1234
1234 sounds.m_Request = m_bnwRequest; 1235 sounds.m_Request = m_bnwRequest;
1235 sounds.m_Success = m_bnwSuccess; 1236 sounds.m_Success = m_bnwSuccess;
1236 sounds.m_Abort = m_bnwAbort; 1237 sounds.m_Abort = m_bnwAbort;
1237 1238
1238 acl.m_rulist = m_aclRules; 1239 acl.m_rulist = m_aclRules;
1239 1240
1240 cps.AddPage(&server); 1241 cps.AddPage(&server);
1241 cps.AddPage(&network); 1242 cps.AddPage(&network);
1242 cps.AddPage(&sounds); 1243 cps.AddPage(&sounds);
1243 cps.AddPage(&acl); 1244 cps.AddPage(&acl);
1244 if(cps.DoModal()==IDOK){ 1245 if(cps.DoModal()==IDOK){
1245 m_RRQMode=server.m_RRQMode; 1246 m_RRQMode=server.m_RRQMode;
1246 m_TFTPRoot=server.m_TFTPRoot; 1247 m_TFTPRoot=server.m_TFTPRoot;
1247 m_bTFTPSubdirs=server.m_TFTPSubdirs; 1248 m_bTFTPSubdirs=server.m_TFTPSubdirs;
1248 m_WRQMode=server.m_WRQMode; 1249 m_WRQMode=server.m_WRQMode;
1249 m_PromptTimeOut=server.m_PromptTimeOut; 1250 m_PromptTimeOut=server.m_PromptTimeOut;
1250 m_LogFile=server.m_LogFile; 1251 m_LogFile=server.m_LogFile;
1251 1252
1252 m_ListenPort=network.m_ListenPort; 1253 m_ListenPort=network.m_ListenPort;
1253 m_SpeakPort=network.m_SpeakPort; 1254 m_SpeakPort=network.m_SpeakPort;
1254 m_TFTPTimeOut=CTimeSpan(network.m_TimeOut); 1255 m_TFTPTimeOut=CTimeSpan(network.m_TimeOut);
1255 m_BlockSize=network.m_BlockSize; 1256 m_BlockSize=network.m_BlockSize;
1256 1257
1257 m_bnwRequest = sounds.m_Request; 1258 m_bnwRequest = sounds.m_Request;
1258 m_bnwSuccess = sounds.m_Success; 1259 m_bnwSuccess = sounds.m_Success;
1259 m_bnwAbort = sounds.m_Abort; 1260 m_bnwAbort = sounds.m_Abort;
1260 1261
1261 m_aclRules = acl.m_rulist; 1262 m_aclRules = acl.m_rulist;
1262 1263
1263 m_lastlogerr.Empty(); 1264 m_lastlogerr.Empty();
1264 } 1265 }
1265} 1266}
1266 1267
1267BOOL CRRQSocket::ConfirmRequest() 1268BOOL CRRQSocket::ConfirmRequest()
1268{ 1269{
1269CConfirmRRQDlg cd(NULL); 1270CConfirmRRQDlg cd(NULL);
1270 cd.m_Daddy=this; 1271 cd.m_Daddy=this;
1271 cd.m_File=m_FileName; 1272 cd.m_File=m_FileName;
1272 cd.m_Host=inet_ntoa(m_Peer.sin_addr); 1273 cd.m_Host=inet_ntoa(m_Peer.sin_addr);
1273 if(cd.DoModal()==IDOK) 1274 if(cd.DoModal()==IDOK)
1274 return TRUE; 1275 return TRUE;
1275 return FALSE; 1276 return FALSE;
1276} 1277}
1277 1278
1278CWRQSocket::CWRQSocket(CPumpKINDlg* daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin) 1279CWRQSocket::CWRQSocket(CPumpKINDlg* daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin)
1279 : CXferSocket(daddy,fileName,type,sin) 1280 : CXferSocket(daddy,fileName,type,sin)
1280{ 1281{
1281 state=stateNone; 1282 state=stateNone;
1282 m_ACK=0; 1283 m_ACK=0;
1283 m_LastSlack=0; 1284 m_LastSlack=0;
1284 m_bResume=FALSE; 1285 m_bResume=FALSE;
1285} 1286}
1286 1287
1287BOOL CWRQSocket::Create(LPCTSTR localFile,LPCTSTR hostName) 1288BOOL CWRQSocket::Create(LPCTSTR localFile,LPCTSTR hostName)
1288{ 1289{
1289 if(!CAsyncSocket::Create(0,SOCK_DGRAM)) 1290 if(!CAsyncSocket::Create(0,SOCK_DGRAM))
1290 return FALSE; 1291 return FALSE;
1291 ASSERT(m_Daddy); 1292 ASSERT(m_Daddy);
1292 ASSERT(m_Peer.sin_addr.s_addr!=INADDR_NONE || hostName); 1293 ASSERT(m_Peer.sin_addr.s_addr!=INADDR_NONE || hostName);
1293 m_Daddy->m_Xfers[m_hSocket]=this; 1294 m_Daddy->m_Xfers[m_hSocket]=this;
1294 UpdateList(); 1295 UpdateList();
1295CString lf; 1296CString lf;
1296 if(!localFile) { 1297 if(!localFile) {
1297 lf = m_FileName; 1298 lf = m_FileName;
1298 TurnSlashes(lf,TRUE); 1299 TurnSlashes(lf,TRUE);
1299 } 1300 }
1300CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(lf); 1301CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(lf);
1301 if(!localFile){// This is an incoming request.. 1302 if(!localFile){// This is an incoming request..
1302 if(CheckBadRelativeness(m_FileName)){ 1303 if(CheckBadRelativeness(m_FileName)){
1303 Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS); 1304 Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS);
1304 return TRUE; 1305 return TRUE;
1305 } 1306 }
1306 BOOL exists; 1307 BOOL exists;
1307 if(!_access((LPCTSTR)fn,0)) 1308 if(!_access((LPCTSTR)fn,0))
1308 m_Rename=exists=TRUE; 1309 m_Rename=exists=TRUE;
1309 else 1310 else
1310 m_Rename=exists=FALSE; 1311 m_Rename=exists=FALSE;
1311 int atar=m_Daddy->m_aclRules.FindTarget(acl_rule::opWRQ,m_Peer.sin_addr.s_addr); 1312 int atar=m_Daddy->m_aclRules.FindTarget(acl_rule::opWRQ,m_Peer.sin_addr.s_addr);
1312 if(atar<0) 1313 if(atar<0)
1313 atar=m_Daddy->m_WRQMode; 1314 atar=m_Daddy->m_WRQMode;
1314 switch(atar){ 1315 switch(atar){
1315 case CPumpKINDlg::wrqTakeAll: 1316 case CPumpKINDlg::wrqTakeAll:
1316 if(exists){ 1317 if(exists){
1317 if(!RenameFile(fn)){ 1318 if(!RenameFile(fn)){
1318 Deny(tftp::errDiskFull,IDS_TFTP_ERROR_FAILEDTORENAME); 1319 Deny(tftp::errDiskFull,IDS_TFTP_ERROR_FAILEDTORENAME);
1319 return TRUE; 1320 return TRUE;
1320 } 1321 }
1321 } 1322 }
1322 break; 1323 break;
1323 case CPumpKINDlg::wrqConfirmIfExists: 1324 case CPumpKINDlg::wrqConfirmIfExists:
1324 if(!exists) 1325 if(!exists)
1325 break; 1326 break;
1326 case CPumpKINDlg::wrqAlwaysConfirm: 1327 case CPumpKINDlg::wrqAlwaysConfirm:
1327 if(exists) 1328 if(exists)
1328 m_bResume=TRUE; 1329 m_bResume=TRUE;
1329 if(ConfirmRequest()){ 1330 if(ConfirmRequest()){
1330 if(m_Rename){ 1331 if(m_Rename){
1331 RenameFile(fn); 1332 RenameFile(fn);
1332 if(SaveAs(fn)) 1333 if(SaveAs(fn))
1333 break; 1334 break;
1334 }else 1335 }else
1335 break; 1336 break;
1336 } 1337 }
1337 default: 1338 default:
1338 TRACE1("Unexpected access target: %d\n",atar); 1339 TRACE1("Unexpected access target: %d\n",atar);
1339 case CPumpKINDlg::wrqDenyAll: 1340 case CPumpKINDlg::wrqDenyAll:
1340 Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS); 1341 Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS);
1341 return TRUE; 1342 return TRUE;
1342 } 1343 }
1343 } 1344 }
1344CFileException e; 1345CFileException e;
1345 if(!m_File.Open( 1346 if(!m_File.Open(
1346 fn, 1347 fn,
1347 m_bResume 1348 m_bResume
1348 ?(CFile::modeWrite|CFile::shareDenyWrite) 1349 ?(CFile::modeWrite|CFile::shareDenyWrite)
1349 :(CFile::modeCreate|CFile::modeWrite|CFile::shareDenyWrite), 1350 :(CFile::modeCreate|CFile::modeWrite|CFile::shareDenyWrite),
1350 &e 1351 &e
1351 )){ 1352 )){
1352 if(localFile){// Outgoing request 1353 if(localFile){// Outgoing request
1353 CString tmp; 1354 CString tmp;
1354 tmp.Format(IDS_LOG_FAILEDTOOPEN,fn); 1355 tmp.Format(IDS_LOG_FAILEDTOOPEN,fn);
1355 m_Daddy->LogLine(tmp); 1356 m_Daddy->LogLine(tmp);
1356 return FALSE; 1357 return FALSE;
1357 }else{ 1358 }else{
1358 Deny(&e); 1359 Deny(&e);
1359 return TRUE; 1360 return TRUE;
1360 } 1361 }
1361 } 1362 }
1362 if(hostName){ 1363 if(hostName){
1363 m_HostName=hostName; 1364 m_HostName=hostName;
1364 1365
1365 CString tmp; 1366 CString tmp;
1366 tmp.Format(IDS_LOG_REQUESTING,m_FileName,m_HostName); 1367 tmp.Format(IDS_LOG_REQUESTING,m_FileName,m_HostName);
1367 m_Daddy->LogLine(tmp); 1368 m_Daddy->LogLine(tmp);
1368 1369
1369 CString inAddr = hostName; 1370 CString inAddr = hostName;
1370 int at = inAddr.Find('@'); 1371 int at = inAddr.Find('@');
1371 if(at>=0) 1372 if(at>=0)
1372 inAddr=inAddr.Mid(at+1); 1373 inAddr=inAddr.Mid(at+1);
1373 if((m_Peer.sin_addr.s_addr=inet_addr((LPCTSTR)inAddr))==INADDR_NONE){ 1374 if((m_Peer.sin_addr.s_addr=inet_addr((LPCTSTR)inAddr))==INADDR_NONE){
1374 ASSERT(!m_wndResolver); 1375 ASSERT(!m_wndResolver);
1375 m_wndResolver = new CResolver(this); 1376 m_wndResolver = new CResolver(this);
1376 ASSERT(m_wndResolver); 1377 ASSERT(m_wndResolver);
1377 return m_wndResolver->Resolve(); 1378 return m_wndResolver->Resolve();
1378 }else{ 1379 }else{
1379 OnHostKnown(); 1380 OnHostKnown();
1380 return TRUE; 1381 return TRUE;
1381 } 1382 }
1382 } 1383 }
1383CString v; 1384CString v;
1384tftp::tftpOptions oack; 1385tftp::tftpOptions oack;
1385 if(m_Options.Lookup(tftpoTSize,v)){ 1386 if(m_Options.Lookup(tftpoTSize,v)){
1386 m_xferSize=atol(v); 1387 m_xferSize=atol(v);
1387 if(!m_xferSize){ 1388 if(!m_xferSize){
1388 Deny(tftp::errOption,IDS_TFTP_ERROR_TSIZE); 1389 Deny(tftp::errOption,IDS_TFTP_ERROR_TSIZE);
1389 return TRUE; 1390 return TRUE;
1390 } 1391 }
1391 } 1392 }
1392 if(m_Options.Lookup(tftpoBSize,v)){ 1393 if(m_Options.Lookup(tftpoBSize,v)){
1393 m_blkSize=atoi(v); 1394 m_blkSize=atoi(v);
1394 if(!m_blkSize){// *** Do more about sanity check 1395 if(!m_blkSize){// *** Do more about sanity check
1395 Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE); 1396 Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);
1396 return TRUE; 1397 return TRUE;
1397 } 1398 }
1398 v.Format("%u",m_blkSize); 1399 v.Format("%u",m_blkSize);
1399 oack[tftpoBSize]=v; 1400 oack[tftpoBSize]=v;
1400 } 1401 }
1401 if(m_Options.Lookup(tftpoTOut,v)){ 1402 if(m_Options.Lookup(tftpoTOut,v)){
1402 m_timeOut=atoi(v); 1403 m_timeOut=atoi(v);
1403 if(!m_timeOut){// *** Do more about sanity check 1404 if(!m_timeOut){// *** Do more about sanity check
1404 Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT); 1405 Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);
1405 return TRUE; 1406 return TRUE;
1406 } 1407 }
1407 v.Format("%u",m_timeOut); 1408 v.Format("%u",m_timeOut);
1408 oack[tftpoTOut]=v; 1409 oack[tftpoTOut]=v;
1409 } 1410 }
1410 if(m_Options.Lookup(tftpoXResume,v) && m_bResume){ 1411 if(m_Options.Lookup(tftpoXResume,v) && m_bResume){
1411 m_ACK=m_File.GetLength()/m_blkSize; 1412 m_ACK=m_File.GetLength()/m_blkSize;
1412 v.Format("%u",m_ACK); 1413 v.Format("%u",m_ACK);
1413 oack[tftpoXResume]=v; 1414 oack[tftpoXResume]=v;
1414 }else 1415 }else
1415 m_ACK=0; 1416 m_ACK=0;
1416 // XXX: see if we can negotiate the right block size somehow 1417 // XXX: see if we can negotiate the right block size somehow
1417 if(m_xferSize>=0 && m_xferSize>=(m_blkSize<<16)) { 1418 if(m_xferSize>=0 && m_xferSize>=(m_blkSize<<16)) {
1418 Deny(tftp::errUndefined,IDS_TFTP_ERROR_TOOBIG); 1419 Deny(tftp::errUndefined,IDS_TFTP_ERROR_TOOBIG);
1419 return TRUE; 1420 return TRUE;
1420 } 1421 }
1421 state=stateXfer; 1422 state=stateXfer;
1422 if(oack.GetCount()){ 1423 if(oack.GetCount()){
1423 tftp *p = tftp::Allocate(tftp::tftpOACK::tftpSize(&oack)); 1424 tftp *p = tftp::Allocate(tftp::tftpOACK::tftpSize(&oack));
1424 ASSERT(p); 1425 ASSERT(p);
1425 p->SetOpcode(tftp::opOACK); 1426 p->SetOpcode(tftp::opOACK);
1426 p->data.m_OACK.Set(&oack); 1427 p->data.m_OACK.Set(&oack);
1427 PostTFTP(p,TRUE); 1428 PostTFTP(p,TRUE);
1428 }else 1429 }else
1429 DoXfer(); 1430 DoXfer();
1430 return TRUE; 1431 return TRUE;
1431} 1432}
1432 1433
1433BOOL CWRQSocket::ConfirmRequest() 1434BOOL CWRQSocket::ConfirmRequest()
1434{ 1435{
1435CConfirmWRQDlg cd(NULL); 1436CConfirmWRQDlg cd(NULL);
1436 cd.m_Daddy=this; 1437 cd.m_Daddy=this;
1437 cd.m_File=m_FileName; 1438 cd.m_File=m_FileName;
1438 cd.m_Host=inet_ntoa(m_Peer.sin_addr); 1439 cd.m_Host=inet_ntoa(m_Peer.sin_addr);
1439 switch(cd.DoModal()){ 1440 switch(cd.DoModal()){
1440 case IDOK: 1441 case IDOK:
1441 m_Rename=FALSE; 1442 m_Rename=FALSE;
1442 m_bResume=FALSE; 1443 m_bResume=FALSE;
1443 return TRUE; 1444 return TRUE;
1444 case IDC_RENAME: 1445 case IDC_RENAME:
1445 m_bResume=FALSE; 1446 m_bResume=FALSE;
1446 m_Rename=TRUE; 1447 m_Rename=TRUE;
1447 return TRUE; 1448 return TRUE;
1448 case IDC_RESUME: 1449 case IDC_RESUME:
1449 m_Rename=FALSE; 1450 m_Rename=FALSE;
1450 m_bResume=TRUE; 1451 m_bResume=TRUE;
1451 return TRUE; 1452 return TRUE;
1452 case IDCANCEL: 1453 case IDCANCEL:
1453 return FALSE; 1454 return FALSE;
1454 } 1455 }
1455 return FALSE; 1456 return FALSE;
1456} 1457}
1457 1458
1458BOOL CWRQSocket::RenameFile(CString& fn) 1459BOOL CWRQSocket::RenameFile(CString& fn)
1459{ 1460{
1460CString renamed = fn; 1461CString renamed = fn;
1461 if(fn.IsEmpty()) 1462 if(fn.IsEmpty())
1462 return FALSE; 1463 return FALSE;
1463 if(fn[fn.GetLength()-1]==')'){ 1464 if(fn[fn.GetLength()-1]==')'){
1464 int op = fn.ReverseFind('('); 1465 int op = fn.ReverseFind('(');
1465 if(op>0 && fn[op-1]==' '){ 1466 if(op>0 && fn[op-1]==' '){
1466 if(fn.Mid(op+1,fn.GetLength()-op-2).SpanExcluding("0123456789").IsEmpty()) 1467 if(fn.Mid(op+1,fn.GetLength()-op-2).SpanExcluding("0123456789").IsEmpty())
1467 renamed = renamed.Left(op-1); 1468 renamed = renamed.Left(op-1);
1468 } 1469 }
1469 } 1470 }
1470CString testFN; 1471CString testFN;
1471 for(UINT tmp=0;tmp<32768;tmp++){ 1472 for(UINT tmp=0;tmp<32768;tmp++){
1472 testFN.Format("%s (%u)",(LPCTSTR)renamed,tmp); 1473 testFN.Format("%s (%u)",(LPCTSTR)renamed,tmp);
1473 if(!_access((LPCTSTR)testFN,0)) 1474 if(!_access((LPCTSTR)testFN,0))
1474 continue; 1475 continue;
1475 fn=testFN; 1476 fn=testFN;
1476 return TRUE; 1477 return TRUE;
1477 } 1478 }
1478 return FALSE; 1479 return FALSE;
1479} 1480}
1480 1481
1481BOOL CWRQSocket::SaveAs(CString& fn) 1482BOOL CWRQSocket::SaveAs(CString& fn)
1482{ 1483{
1483CFileDialog cfd(FALSE,NULL,fn,OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT|OFN_PATHMUSTEXIST,NULL,m_Daddy); 1484CFileDialog cfd(FALSE,NULL,fn,OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT|OFN_PATHMUSTEXIST,NULL,m_Daddy);
1484CString title; 1485CString title;
1485 title.LoadString(IDS_RENAME_TITLE); 1486 title.LoadString(IDS_RENAME_TITLE);
1486 cfd.m_ofn.lpstrTitle=(LPCTSTR)title; 1487 cfd.m_ofn.lpstrTitle=(LPCTSTR)title;
1487 if(cfd.DoModal()!=IDOK) 1488 if(cfd.DoModal()!=IDOK)
1488 return FALSE; 1489 return FALSE;
1489 fn = cfd.GetPathName(); 1490 fn = cfd.GetPathName();
1490 return TRUE; 1491 return TRUE;
1491} 1492}
1492 1493
1493void CWRQSocket::DoXfer() 1494void CWRQSocket::DoXfer()
1494{ 1495{
1495tftp *p = tftp::Allocate(tftp::tftpACK::tftpSize()); 1496tftp *p = tftp::Allocate(tftp::tftpACK::tftpSize());
1496 ASSERT(p); 1497 ASSERT(p);
1497 p->SetOpcode(tftp::opACK); 1498 p->SetOpcode(tftp::opACK);
1498 p->data.m_ACK.SetBlock(m_ACK); 1499 p->data.m_ACK.SetBlock(m_ACK);
1499 TRACE1("WRQ-ACK-%u\n",m_ACK); 1500 TRACE1("WRQ-ACK-%u\n",m_ACK);
1500 PostTFTP(p,TRUE);// *** ??? Hope this is right 1501 PostTFTP(p,TRUE);// *** ??? Hope this is right
1501} 1502}
1502 1503
1503UINT tftp::tftpACK::tftpSize() 1504UINT tftp::tftpACK::tftpSize()
1504{ 1505{
1505 return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpACK); 1506 return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpACK);
1506} 1507}
1507 1508
1508ULONG CWRQSocket::GetACK() 1509ULONG CWRQSocket::GetACK()
1509{ 1510{
1510 return (m_ACK*m_blkSize)-m_LastSlack; 1511 return (m_ACK*m_blkSize)-m_LastSlack;
1511} 1512}
1512 1513
1513void CXferSocket::ResetTimeout() 1514void CXferSocket::ResetTimeout()
1514{ 1515{
1515 ASSERT(m_Daddy); 1516 ASSERT(m_Daddy);
1516 m_Daddy->m_Retrier->KillTimer(m_hSocket); 1517 m_Daddy->m_Retrier->KillTimer(m_hSocket);
1517 if(m_Retry) 1518 if(m_Retry)
1518 m_Daddy->m_Retrier->SetTimer(m_hSocket,min(60,m_Daddy->m_RetryTimeOut.GetTotalSeconds())*1000,NULL); 1519 m_Daddy->m_Retrier->SetTimer(m_hSocket,min(60,m_Daddy->m_RetryTimeOut.GetTotalSeconds())*1000,NULL);
1519 if(!m_bRetry){ 1520 if(!m_bRetry){
1520 m_Daddy->KillTimer(m_hSocket); 1521 m_Daddy->KillTimer(m_hSocket);
1521 m_Daddy->SetTimer(m_hSocket,min(60,m_timeOut)*1000,NULL); 1522 m_Daddy->SetTimer(m_hSocket,min(60,m_timeOut)*1000,NULL);
1522 } 1523 }
1523} 1524}
1524 1525
1525void CXferSocket::Abort() 1526void CXferSocket::Abort()
1526{ 1527{
1527 ASSERT(m_Daddy); 1528 ASSERT(m_Daddy);
1528CString tmp; 1529CString tmp;
1529 tmp.Format(IDS_LOG_XFERABORTED,(LPCTSTR)m_FileName); 1530 tmp.Format(IDS_LOG_XFERABORTED,(LPCTSTR)m_FileName);
1530 m_Daddy->LogLine(tmp); 1531 m_Daddy->LogLine(tmp);
1531 Destroy(FALSE); 1532 Destroy(FALSE);
1532} 1533}
1533 1534
1534void CPumpKINDlg::OnTimer(UINT nIDEvent) 1535void CPumpKINDlg::OnTimer(UINT nIDEvent)
1535{ 1536{
1536CXferSocket *socket; 1537CXferSocket *socket;
1537 if(m_Xfers.Lookup(nIDEvent,socket)){ 1538 if(m_Xfers.Lookup(nIDEvent,socket)){
1538 CString tmp; 1539 CString tmp;
1539 tmp.Format(IDS_LOG_TIMEDOUT,socket->m_FileName); 1540 tmp.Format(IDS_LOG_TIMEDOUT,socket->m_FileName);
1540 LogLine(tmp); 1541 LogLine(tmp);
1541 socket->Abort(); 1542 socket->Abort();
1542 }else{ 1543 }else{
1543 TRACE0("Failed to find timed out socket!\n"); 1544 TRACE0("Failed to find timed out socket!\n");
1544 } 1545 }
1545 CDialog::OnTimer(nIDEvent); 1546 CDialog::OnTimer(nIDEvent);
1546} 1547}
1547 1548
1548void CPumpKINDlg::OnExit() 1549void CPumpKINDlg::OnExit()
1549{ 1550{
1550 if(!m_Xfers.IsEmpty()){ 1551 if(!m_Xfers.IsEmpty()){
1551 CString title,text; 1552 CString title,text;
1552 title.LoadString(IDS_CONFIRMEXIT_TITLE); 1553 title.LoadString(IDS_CONFIRMEXIT_TITLE);
1553 text.LoadString(IDS_CONFIRMEXIT_TEXT); 1554 text.LoadString(IDS_CONFIRMEXIT_TEXT);
1554 if(MessageBox(text,title,MB_ICONQUESTION|MB_YESNO)!=IDYES) 1555 if(MessageBox(text,title,MB_ICONQUESTION|MB_YESNO)!=IDYES)
1555 return; 1556 return;
1556 } 1557 }
1557 m_bExiting=TRUE; 1558 m_bExiting=TRUE;
1558 EndDialog(IDOK); 1559 EndDialog(IDOK);
1559} 1560}
1560 1561
1561void CPumpKINDlg::OnPut() 1562void CPumpKINDlg::OnPut()
1562{ 1563{
1563CRequestDlg crd(NULL); 1564CRequestDlg crd(NULL);
1564 crd.m_Put=TRUE; 1565 crd.m_Put=TRUE;
1565 crd.m_BSize=m_BlockSize; 1566 crd.m_BSize=m_BlockSize;
1566 if(crd.DoModal()==IDOK){ 1567 if(crd.DoModal()==IDOK){
1567 CRRQSocket *socket = new CRRQSocket(this,crd.m_RemoteFile,crd.m_Type,NULL); 1568 CRRQSocket *socket = new CRRQSocket(this,crd.m_RemoteFile,crd.m_Type,NULL);
1568 if(crd.m_BSize) 1569 if(crd.m_BSize)
1569 socket->m__blkSize=crd.m_BSize; 1570 socket->m__blkSize=crd.m_BSize;
1570 if(!socket->Create(crd.m_LocalFile,crd.m_Host)) 1571 if(!socket->Create(crd.m_LocalFile,crd.m_Host))
1571 socket->Destroy(); 1572 socket->Destroy();
1572 } 1573 }
1573} 1574}
1574 1575
1575void CPumpKINDlg::OnGet() 1576void CPumpKINDlg::OnGet()
1576{ 1577{
1577CRequestDlg crd(NULL); 1578CRequestDlg crd(NULL);
1578 crd.m_Put=FALSE; 1579 crd.m_Put=FALSE;
1579 crd.m_BSize=m_BlockSize; 1580 crd.m_BSize=m_BlockSize;
1580 if(crd.DoModal()==IDOK){ 1581 if(crd.DoModal()==IDOK){
1581 CWRQSocket *socket = new CWRQSocket(this,crd.m_RemoteFile,crd.m_Type,NULL); 1582 CWRQSocket *socket = new CWRQSocket(this,crd.m_RemoteFile,crd.m_Type,NULL);
1582 if(crd.m_BSize) 1583 if(crd.m_BSize)
1583 socket->m__blkSize=crd.m_BSize; 1584 socket->m__blkSize=crd.m_BSize;
1584 if(!socket->Create(crd.m_LocalFile,crd.m_Host)) 1585 if(!socket->Create(crd.m_LocalFile,crd.m_Host))
1585 socket->Destroy(); 1586 socket->Destroy();
1586 } 1587 }
1587} 1588}
1588 1589
1589void CPumpKINDlg::SetupButtons() 1590void CPumpKINDlg::SetupButtons()
1590{ 1591{
1591 m_AbortCtl.EnableWindow(m_List.GetSelectedCount()>0); 1592 m_AbortCtl.EnableWindow(m_List.GetSelectedCount()>0);
1592} 1593}
1593 1594
1594void CPumpKINDlg::OnDeleteallitemsConnections(NMHDR* pNMHDR, LRESULT* pResult) 1595void CPumpKINDlg::OnDeleteallitemsConnections(NMHDR* pNMHDR, LRESULT* pResult)
1595{ 1596{
1596 NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR; 1597 NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
1597 SetupButtons(); 1598 SetupButtons();
1598 *pResult = 0; 1599 *pResult = 0;
1599} 1600}
1600 1601
1601void CPumpKINDlg::OnDeleteitemConnections(NMHDR* pNMHDR, LRESULT* pResult) 1602void CPumpKINDlg::OnDeleteitemConnections(NMHDR* pNMHDR, LRESULT* pResult)
1602{ 1603{
1603 NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR; 1604 NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
1604 SetupButtons(); 1605 SetupButtons();
1605 *pResult = 0; 1606 *pResult = 0;
1606} 1607}
1607 1608
1608void CPumpKINDlg::OnInsertitemConnections(NMHDR* pNMHDR, LRESULT* pResult) 1609void CPumpKINDlg::OnInsertitemConnections(NMHDR* pNMHDR, LRESULT* pResult)
1609{ 1610{
1610 NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR; 1611 NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
1611 SetupButtons(); 1612 SetupButtons();
1612 *pResult = 0; 1613 *pResult = 0;
1613} 1614}
1614 1615
1615void CPumpKINDlg::OnItemchangedConnections(NMHDR* pNMHDR, LRESULT* pResult) 1616void CPumpKINDlg::OnItemchangedConnections(NMHDR* pNMHDR, LRESULT* pResult)
1616{ 1617{
1617 NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR; 1618 NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
1618 SetupButtons(); 1619 SetupButtons();
1619 *pResult = 0; 1620 *pResult = 0;
1620} 1621}
1621 1622
1622void CPumpKINDlg::OnAbort() 1623void CPumpKINDlg::OnAbort()
1623{ 1624{
1624 if(!m_List.GetSelectedCount()) 1625 if(!m_List.GetSelectedCount())
1625 return; 1626 return;
1626 intitems = m_List.GetItemCount(); 1627 intitems = m_List.GetItemCount();
1627 for(int tmp=0;tmp<items;tmp++){ 1628 for(int tmp=0;tmp<items;tmp++){