| author | Michael Krelin <hacker@klever.net> | 2006-02-02 23:07:50 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2006-02-02 23:07:50 (UTC) |
| commit | 39bb4331674cc77560a546f4f9b14b143603d4be (patch) (side-by-side diff) | |
| tree | fbbc1006c655888a5483ddd359c52b863e7a27ab | |
| parent | fedc32eb7d20e5278a2125ead3ed125dc63b5746 (diff) | |
| download | pumpkin-39bb4331674cc77560a546f4f9b14b143603d4be.zip pumpkin-39bb4331674cc77560a546f4f9b14b143603d4be.tar.gz pumpkin-39bb4331674cc77560a546f4f9b14b143603d4be.tar.bz2 | |
- version bump to 2.7
- year bump to 2006
- ip-based access control
- server switchable off
- logging to file
git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@144 fe716a7a-6dde-0310-88d9-d003556173a8
| -rw-r--r-- | ACLTargetCombo.cpp | 85 | ||||
| -rw-r--r-- | ACLTargetCombo.h | 42 | ||||
| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | PropsACL.cpp | 290 | ||||
| -rw-r--r-- | PropsACL.h | 71 | ||||
| -rw-r--r-- | PropsServer.cpp | 19 | ||||
| -rw-r--r-- | PropsServer.h | 3 | ||||
| -rw-r--r-- | PumpKINDlg.cpp | 109 | ||||
| -rw-r--r-- | PumpKINDlg.h | 178 | ||||
| -rw-r--r-- | Trayer.cpp | 7 | ||||
| -rw-r--r-- | Trayer.h | 1 | ||||
| -rw-r--r-- | help/pumpkin.cnt | 1 | ||||
| -rw-r--r-- | help/pumpkin.rtf | 15 | ||||
| -rw-r--r-- | help/pumpkin.xml | 17 | ||||
| -rw-r--r-- | install/Install.clw | 35 | ||||
| -rw-r--r-- | install/install.cpp | 2 | ||||
| -rw-r--r-- | install/install.rc | 10 | ||||
| -rw-r--r-- | pumpkin.clw | 78 | ||||
| -rw-r--r-- | pumpkin.mak | 362 | ||||
| -rw-r--r-- | pumpkin.rc | 169 | ||||
| -rw-r--r-- | res/down.ico | bin | 0 -> 766 bytes | |||
| -rw-r--r-- | res/remove.ico | bin | 0 -> 766 bytes | |||
| -rw-r--r-- | res/up.ico | bin | 0 -> 766 bytes | |||
| -rw-r--r-- | resource.h | 29 |
24 files changed, 1394 insertions, 131 deletions
diff --git a/ACLTargetCombo.cpp b/ACLTargetCombo.cpp new file mode 100644 index 0000000..cdbd075 --- a/dev/null +++ b/ACLTargetCombo.cpp @@ -0,0 +1,85 @@ +// ACLTargetCombo.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "PumpKIN.h"
+#include "PumpKINDlg.h"
+#include "ACLTargetCombo.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CACLTargetCombo
+
+CACLTargetCombo::CACLTargetCombo()
+: m_op(-1)
+{
+}
+
+CACLTargetCombo::~CACLTargetCombo()
+{
+}
+
+
+BEGIN_MESSAGE_MAP(CACLTargetCombo, CComboBox)
+ //{{AFX_MSG_MAP(CACLTargetCombo)
+ // NOTE - the ClassWizard will add and remove mapping macros here.
+ //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CACLTargetCombo message handlers
+
+void CACLTargetCombo::SetOp(int op)
+{
+ m_op=op;
+ ResetContent();
+ switch(op) {
+ case tftp::opRRQ:
+ m_tmap.RemoveAll();
+ SetItemData(m_tmap[acl_rule::rrqNone]=AddString("fallback to global"),acl_rule::rrqNone);
+ SetItemData(m_tmap[acl_rule::rrqDeny]=AddString("deny access"),acl_rule::rrqDeny);
+ SetItemData(m_tmap[acl_rule::rrqPrompt]=AddString("prompt"),acl_rule::rrqPrompt);
+ SetItemData(m_tmap[acl_rule::rrqGrant]=AddString("grant access"),CPumpKINDlg::rrqGrant);
+ SetCurSel(0);
+ EnableWindow(TRUE);
+ break;
+ case tftp::opWRQ:
+ m_tmap.RemoveAll();
+ SetItemData(m_tmap[acl_rule::wrqNone]=AddString("fallback to global"),acl_rule::wrqNone);
+ SetItemData(m_tmap[acl_rule::wrqDeny]=AddString("deny access"),acl_rule::wrqDeny);
+ SetItemData(m_tmap[acl_rule::wrqPrompt]=AddString("prompt"),acl_rule::wrqPrompt);
+ SetItemData(m_tmap[acl_rule::wrqPromptIfExists]=AddString("prompt if file exists"),acl_rule::wrqPromptIfExists);
+ SetItemData(m_tmap[acl_rule::wrqGrant]=AddString("grant access"),acl_rule::wrqGrant);
+ SetCurSel(0);
+ EnableWindow(TRUE);
+ break;
+ default:
+ EnableWindow(FALSE);
+ break;
+ }
+}
+
+int CACLTargetCombo::GetTarget()
+{
+ int cs=GetCurSel();
+ if(cs==CB_ERR)
+ return -1;
+ return GetItemData(cs);
+}
+
+void CACLTargetCombo::SetTarget(int t,int op)
+{
+ if(op>=0)
+ SetOp(op);
+ ASSERT(m_op>=0);
+ int i;
+ if(m_tmap.Lookup(t,i))
+ SetCurSel(i);
+ else
+ SetCurSel(0);
+}
diff --git a/ACLTargetCombo.h b/ACLTargetCombo.h new file mode 100644 index 0000000..ef7baef --- a/dev/null +++ b/ACLTargetCombo.h @@ -0,0 +1,42 @@ +// ACLTargetCombo.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CACLTargetCombo window
+
+class CACLTargetCombo : public CComboBox
+{
+// Construction
+public:
+ void SetTarget(int t,int op=-1);
+ int GetTarget();
+ void SetOp(int op);
+ int m_op;
+ CACLTargetCombo();
+
+// Attributes
+public:
+ CMap<int,int,int,int> m_tmap;
+
+// Operations
+public:
+
+// Overrides
+ // ClassWizard generated virtual function overrides
+ //{{AFX_VIRTUAL(CACLTargetCombo)
+ //}}AFX_VIRTUAL
+
+// Implementation
+public:
+ virtual ~CACLTargetCombo();
+
+ // Generated message map functions
+protected:
+ //{{AFX_MSG(CACLTargetCombo)
+ // NOTE - the ClassWizard will add and remove member functions here.
+ //}}AFX_MSG
+
+ DECLARE_MESSAGE_MAP()
+};
+
+/////////////////////////////////////////////////////////////////////////////
@@ -1,2 +1,2 @@ -Copyright (c) 1997-2005 Klever Group (http://www.klever.net/) +Copyright (c) 1997-2006 Klever Group (http://www.klever.net/) diff --git a/PropsACL.cpp b/PropsACL.cpp new file mode 100644 index 0000000..6d918ad --- a/dev/null +++ b/PropsACL.cpp @@ -0,0 +1,290 @@ +// PropsACL.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "PumpKIN.h"
+#include "PumpKINDlg.h"
+#include "ACLTargetCombo.h"
+#include "PropsACL.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropsACL property page
+
+IMPLEMENT_DYNCREATE(CPropsACL, CPropertyPage)
+
+CPropsACL::CPropsACL() : CPropertyPage(CPropsACL::IDD)
+{
+ //{{AFX_DATA_INIT(CPropsACL)
+ //}}AFX_DATA_INIT
+}
+
+CPropsACL::~CPropsACL()
+{
+}
+
+void CPropsACL::DoDataExchange(CDataExchange* pDX)
+{
+ CPropertyPage::DoDataExchange(pDX);
+ //{{AFX_DATA_MAP(CPropsACL)
+ DDX_Control(pDX, IDC_ACL_REPLACE, m_ReplaceCtl);
+ DDX_Control(pDX, IDC_ACL_NETMASK, m_NetmaskCtl);
+ DDX_Control(pDX, IDC_ACL_XFER, m_XferCtl);
+ DDX_Control(pDX, IDC_ACL_UP, m_UpCtl);
+ DDX_Control(pDX, IDC_ACL_RULE, m_RuleCtl);
+ DDX_Control(pDX, IDC_ACL_REMOVE, m_RemoveCtl);
+ DDX_Control(pDX, IDC_ACL_LIST, m_ListCtl);
+ DDX_Control(pDX, IDC_ACL_DOWN, m_DownCtl);
+ DDX_Control(pDX, IDC_ACL_ADDR, m_AddrCtl);
+ DDX_Control(pDX, IDC_ACL_ADD, m_AddCtl);
+ //}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CPropsACL, CPropertyPage)
+ //{{AFX_MSG_MAP(CPropsACL)
+ ON_CBN_SELCHANGE(IDC_ACL_XFER, OnSelchangeAclXfer)
+ ON_NOTIFY(LVN_ITEMCHANGED, IDC_ACL_LIST, OnItemchangedAclList)
+ ON_BN_CLICKED(IDC_ACL_ADD, OnAclAdd)
+ ON_BN_CLICKED(IDC_ACL_REPLACE, OnAclReplace)
+ ON_BN_CLICKED(IDC_ACL_REMOVE, OnAclRemove)
+ ON_BN_CLICKED(IDC_ACL_UP, OnAclUp)
+ ON_BN_CLICKED(IDC_ACL_DOWN, OnAclDown)
+ //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropsACL message handlers
+
+BOOL CPropsACL::OnInitDialog()
+{
+ CPropertyPage::OnInitDialog();
+
+ m_FocusedRule=-1;
+
+ m_Images.Create(16,16,TRUE,2,1);
+ m_iRRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_RRQ));
+ m_iWRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_WRQ));
+ ASSERT(m_iRRQ>=0); ASSERT(m_iWRQ>=0);
+ m_ListCtl.SetImageList(&m_Images,LVSIL_NORMAL);
+ m_ListCtl.SetImageList(&m_Images,LVSIL_SMALL);
+ m_ListCtl.SetImageList(&m_Images,LVSIL_STATE);
+
+ CRect lrc; m_ListCtl.GetClientRect(&lrc);
+ long lrcw3 = lrc.Width()/3;
+ m_ListCtl.InsertColumn(0,"IP",LVCFMT_LEFT,lrcw3,subitemIP);
+ m_ListCtl.InsertColumn(1,"netmask",LVCFMT_LEFT,lrcw3,subitemNM);
+ m_ListCtl.InsertColumn(2,"action",LVCFMT_LEFT,lrc.Width()-lrcw3*2,subitemAction);
+
+ m_UpCtl.SetIcon(AfxGetApp()->LoadIcon(IDI_UP));
+ m_DownCtl.SetIcon(AfxGetApp()->LoadIcon(IDI_DOWN));
+ m_RemoveCtl.SetIcon(AfxGetApp()->LoadIcon(IDI_REMOVE));
+
+ m_XferCtl.SetItemData(0,tftp::opRRQ);
+ m_XferCtl.SetItemData(1,tftp::opWRQ);
+
+ m_AddrCtl.SetWindowText("192.168.0.0");
+ m_NetmaskCtl.SetWindowText("255.255.255.0");
+
+ for(int i=0;i<m_rulist.GetSize();++i) {
+ m_ListCtl.InsertItem(i,0);
+ SetListRule(i,m_rulist[i]);
+ }
+
+ UpdateControls();
+
+ return TRUE; // return TRUE unless you set the focus to a control
+ // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+void CPropsACL::OnSelchangeAclXfer() {
+ int cs = m_XferCtl.GetCurSel();
+ if(cs==CB_ERR) {
+ m_RuleCtl.EnableWindow(FALSE);
+ }else{
+ int rq = m_XferCtl.GetItemData(cs);
+ m_RuleCtl.SetOp(rq);
+ }
+}
+
+void CPropsACL::OnItemchangedAclList(NMHDR* pNMHDR, LRESULT* pResult) {
+ NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
+ if(
+ (pNMListView->uChanged&LVIF_STATE)
+ &&
+ (pNMListView->uNewState&LVIS_FOCUSED)!=(pNMListView->uOldState&LVIS_FOCUSED)
+ &&
+ pNMListView->iItem>=0 && pNMListView->iItem<m_ListCtl.GetItemCount()
+ ){
+ if(pNMListView->uNewState&LVIS_FOCUSED)
+ m_FocusedRule=pNMListView->iItem;
+ else if(pNMListView->iItem==m_FocusedRule)
+ m_FocusedRule=-1;
+ UpdateControls();
+ }
+
+ *pResult = 0;
+}
+
+void CPropsACL::UpdateControls() {
+ if(m_FocusedRule>=m_rulist.GetSize())
+ m_FocusedRule=-1;
+ if(m_FocusedRule>=0) {
+ m_UpCtl.EnableWindow(m_FocusedRule>0);
+ m_DownCtl.EnableWindow(m_FocusedRule<(m_ListCtl.GetItemCount()-1));
+ acl_rule r;
+ GetListRule(m_FocusedRule,r);
+ SetRule(r);
+ m_AddCtl.EnableWindow(TRUE);
+ m_ReplaceCtl.EnableWindow(TRUE);
+ }else{
+ OnSelchangeAclXfer();
+ m_AddCtl.EnableWindow(TRUE);
+ m_ReplaceCtl.EnableWindow(FALSE);
+ }
+ m_RemoveCtl.EnableWindow(m_ListCtl.GetSelectedCount()!=0 || m_FocusedRule>=0);
+}
+
+void CPropsACL::OnAclAdd() {
+ acl_rule r;
+ UINT err=GetRule(r);
+ if(err) {
+ AfxMessageBox(err,MB_OK);
+ }else{
+ int i=m_rulist.AppendRule(r);
+ ASSERT(r.op==acl_rule::opRRQ || r.op==acl_rule::opWRQ);
+ m_ListCtl.InsertItem(i,0);
+ SetListRule(i,r);
+ }
+}
+
+void CPropsACL::OnAclReplace() {
+ acl_rule r;
+ UINT err=GetRule(r);
+ if(err) {
+ AfxMessageBox(err,MB_OK);
+ }else{
+ ASSERT(m_FocusedRule>=0);
+ m_rulist[m_FocusedRule]=r;
+ SetListRule(m_FocusedRule,r);
+ }
+}
+
+int CPropsACL::GetOp() {
+ int cs=m_XferCtl.GetCurSel();
+ if(cs==CB_ERR)
+ return -1;
+ else
+ return m_XferCtl.GetItemData(cs);
+}
+
+void CPropsACL::SetOp(int op) {
+ int os=m_XferCtl.GetCount();
+ for(int i=0;i<os;++i) {
+ if(m_XferCtl.GetItemData(i)==op) {
+ m_XferCtl.SetCurSel(i);
+ return;
+ }
+ }
+ m_XferCtl.SetCurSel(-1);
+}
+
+void CPropsACL::SetListRule(int i,acl_rule& r) {
+ m_ListCtl.SetItem(i,subitemIP,LVIF_TEXT|LVIF_IMAGE,r.str_addr(),(r.op==acl_rule::opRRQ)?m_iRRQ:m_iWRQ,0,0,0);
+ m_ListCtl.SetItemText(i,subitemNM,r.str_mask());
+ m_ListCtl.SetItemText(i,subitemAction,r.str_target());
+}
+
+void CPropsACL::SetRule(acl_rule& r) {
+ SetOp(r.op);
+ m_AddrCtl.SetWindowText(r.str_addr());
+ m_NetmaskCtl.SetWindowText(r.str_mask());
+ m_RuleCtl.SetTarget(r.target,r.op);
+}
+
+void CPropsACL::GetListRule(int i,acl_rule& r) {
+ r = m_rulist[i];
+}
+
+UINT CPropsACL::GetRule(acl_rule& r)
+{
+ UINT rv=0;
+ r.op=GetOp();
+ if(r.op!=acl_rule::opRRQ && r.op!=acl_rule::opWRQ)
+ rv=IDS_NO_XFER_OP;
+ else{
+ CString t;
+ m_AddrCtl.GetWindowText(t);
+ if(t.IsEmpty() || ( (r.addr=inet_addr((LPCSTR)t))==INADDR_NONE && t!="255.255.255.255") )
+ rv=IDS_INVALID_IP;
+ else{
+ m_NetmaskCtl.GetWindowText(t);
+ if(t.IsEmpty() || ( (r.mask=inet_addr((LPCSTR)t))==INADDR_NONE && t!="255.255.255.255") )
+ rv=IDS_INVALID_NETMASK;
+ else{
+ r.target=m_RuleCtl.GetTarget();
+ if(!r.IsValid())
+ rv=IDS_INVALID_RULE;
+ }
+ }
+ }
+ return rv;
+}
+
+void CPropsACL::OnAclRemove() {
+ ASSERT(m_FocusedRule>=0);
+ int fr=m_FocusedRule;
+ if(fr<0 || fr>=m_rulist.GetSize()) return;
+ m_rulist.DeleteRule(fr);
+ m_ListCtl.DeleteItem(fr);
+ ASSERT(m_rulist.GetSize()==m_ListCtl.GetItemCount());
+ if(fr>=m_rulist.GetSize()) {
+ if(fr>0) {
+ fr=m_rulist.GetSize()-1;
+ }
+ }else
+ fr=-1;
+ if(fr>0)
+ SetListFocusSelection(fr);
+ m_ListCtl.SetFocus();
+}
+
+void CPropsACL::OnAclUp() {
+ int s=m_FocusedRule;
+ if(s<=0) return;
+ int d=s-1;
+ acl_rule r=m_rulist[s];
+ m_rulist[s]=m_rulist[d];
+ m_rulist[d]=r;
+ SetListRule(d,m_rulist[d]);
+ SetListRule(s,m_rulist[s]);
+ SetListFocusSelection(d);
+ m_ListCtl.SetFocus();
+}
+
+void CPropsACL::OnAclDown() {
+ int s=m_FocusedRule;
+ int d=s+1;
+ if(s<0 || d>=m_rulist.GetSize()) return;
+ acl_rule r=m_rulist[s];
+ m_rulist[s]=m_rulist[d];
+ m_rulist[d]=r;
+ SetListRule(d,m_rulist[d]);
+ SetListRule(s,m_rulist[s]);
+ SetListFocusSelection(d);
+ m_ListCtl.SetFocus();
+}
+
+void CPropsACL::SetListFocusSelection(int i) {
+ int s=m_ListCtl.GetItemCount();
+ for(int t=0;t<s;++t)
+ if(t!=i)
+ m_ListCtl.SetItemState(t,0,LVIS_FOCUSED|LVIS_SELECTED);
+ m_ListCtl.SetItemState(i,LVIS_FOCUSED|LVIS_SELECTED,LVIS_FOCUSED|LVIS_SELECTED);
+}
+
diff --git a/PropsACL.h b/PropsACL.h new file mode 100644 index 0000000..c8773e7 --- a/dev/null +++ b/PropsACL.h @@ -0,0 +1,71 @@ +// PropsACL.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropsACL dialog
+
+class CPropsACL : public CPropertyPage
+{
+ DECLARE_DYNCREATE(CPropsACL)
+
+// Construction
+public:
+ void SetListFocusSelection(int i);
+ UINT GetRule(acl_rule& r);
+ void GetListRule(int i,acl_rule& r);
+ void SetOp(int op);
+ void SetRule(acl_rule& r);
+ void SetListRule(int i,acl_rule& r);
+ int m_iWRQ;
+ int m_iRRQ;
+ CImageList m_Images;
+ int GetOp();
+ acl_rules_t m_rulist;
+ int m_FocusedRule;
+ void UpdateControls();
+ enum {
+ subitemIP=0, subitemNM, subitemAction
+ };
+
+ CPropsACL();
+ ~CPropsACL();
+
+// Dialog Data
+ //{{AFX_DATA(CPropsACL)
+ enum { IDD = IDD_PROPS_ACL };
+ CButton m_ReplaceCtl;
+ CEdit m_NetmaskCtl;
+ CComboBox m_XferCtl;
+ CButton m_UpCtl;
+ CACLTargetCombo m_RuleCtl;
+ CButton m_RemoveCtl;
+ CListCtrl m_ListCtl;
+ CButton m_DownCtl;
+ CEdit m_AddrCtl;
+ CButton m_AddCtl;
+ //}}AFX_DATA
+
+
+// Overrides
+ // ClassWizard generate virtual function overrides
+ //{{AFX_VIRTUAL(CPropsACL)
+ protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+ //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+ // Generated message map functions
+ //{{AFX_MSG(CPropsACL)
+ virtual BOOL OnInitDialog();
+ afx_msg void OnSelchangeAclXfer();
+ afx_msg void OnItemchangedAclList(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg void OnAclAdd();
+ afx_msg void OnAclReplace();
+ afx_msg void OnAclRemove();
+ afx_msg void OnAclUp();
+ afx_msg void OnAclDown();
+ //}}AFX_MSG
+ DECLARE_MESSAGE_MAP()
+
+};
diff --git a/PropsServer.cpp b/PropsServer.cpp index 6f1e08c..a3948e0 100644 --- a/PropsServer.cpp +++ b/PropsServer.cpp @@ -25,2 +25,3 @@ CPropsServer::CPropsServer() : CPropertyPage(CPropsServer::IDD) m_WRQMode = -1;
+ m_LogFile = _T("");
//}}AFX_DATA_INIT
@@ -36,2 +37,3 @@ void CPropsServer::DoDataExchange(CDataExchange* pDX) //{{AFX_DATA_MAP(CPropsServer)
+ DDX_Control(pDX, IDC_LOGFILE_BROWSE, m_LogBrowseCtl);
DDX_Control(pDX, IDC_BROWSE, m_BrowseCtl);
@@ -42,2 +44,3 @@ void CPropsServer::DoDataExchange(CDataExchange* pDX) DDX_Radio(pDX, IDC_WRQ_TAKEALL, m_WRQMode);
+ DDX_Text(pDX, IDC_LOGFILE, m_LogFile);
//}}AFX_DATA_MAP
@@ -53,2 +56,3 @@ BEGIN_MESSAGE_MAP(CPropsServer, CPropertyPage) ON_BN_CLICKED(IDC_BROWSE, OnBrowse)
+ ON_BN_CLICKED(IDC_LOGFILE_BROWSE, OnLogfileBrowse)
//}}AFX_MSG_MAP
@@ -65,2 +69,3 @@ BOOL CPropsServer::OnInitDialog() m_BrowseCtl.SetIcon(AfxGetApp()->LoadIcon(IDI_BROWSE));
+ m_LogBrowseCtl.SetIcon(AfxGetApp()->LoadIcon(IDI_BROWSE));
@@ -79 +84,15 @@ CString nr = m_TFTPRoot; }
+
+void CPropsServer::OnLogfileBrowse()
+{
+ UpdateData(TRUE);
+ CFileDialog cfd(
+ FALSE, ".log", (LPCSTR)m_LogFile,
+ OFN_EXPLORER|OFN_HIDEREADONLY|OFN_LONGNAMES|OFN_NOCHANGEDIR|OFN_OVERWRITEPROMPT|OFN_PATHMUSTEXIST,
+ "Log files (*.log)|*.log|All Files (*.*)|*.*||",
+ this);
+ if(cfd.DoModal()==IDOK) {
+ m_LogFile = cfd.GetPathName();
+ UpdateData(FALSE);
+ }
+}
diff --git a/PropsServer.h b/PropsServer.h index 29d85bd..1563479 100644 --- a/PropsServer.h +++ b/PropsServer.h @@ -19,2 +19,3 @@ public: enum { IDD = IDD_PROPS_SERVER };
+ CButton m_LogBrowseCtl;
CButton m_BrowseCtl;
@@ -25,2 +26,3 @@ public: int m_WRQMode;
+ CString m_LogFile;
//}}AFX_DATA
@@ -41,2 +43,3 @@ protected: afx_msg void OnBrowse();
+ afx_msg void OnLogfileBrowse();
//}}AFX_MSG
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp index b6b8a36..4cb1633 100644 --- a/PumpKINDlg.cpp +++ b/PumpKINDlg.cpp @@ -7,2 +7,3 @@ +#include "ACLTargetCombo.h"
#include "PropsServer.h"
@@ -10,2 +11,3 @@ #include "PropsSounds.h"
+#include "PropsACL.h"
#include "ConfirmRRQDlg.h"
@@ -81,2 +83,6 @@ CPumpKINDlg::CPumpKINDlg(CWnd* pParent /*=NULL*/) {
+ m_Listener.m_Daddy = this;
+
+ m_bListen = TRUE;
+
m_ListenPort = 69;
@@ -109,2 +115,11 @@ CPumpKINDlg::CPumpKINDlg(CWnd* pParent /*=NULL*/) ASSERT(m_Trayer);
+ /* Ensure we're backwards compatible */
+ ASSERT(CPumpKINDlg::rrqGiveAll==0);
+ ASSERT(CPumpKINDlg::rrqAlwaysConfirm==1);
+ ASSERT(CPumpKINDlg::rrqDenyAll==2);
+ ASSERT(CPumpKINDlg::wrqTakeAll==0);
+ ASSERT(CPumpKINDlg::wrqConfirmIfExists==1);
+ ASSERT(CPumpKINDlg::wrqAlwaysConfirm==2);
+ ASSERT(CPumpKINDlg::wrqDenyAll==3);
+ /* -- */
LoadSettings();
@@ -116,2 +131,3 @@ void CPumpKINDlg::DoDataExchange(CDataExchange* pDX) //{{AFX_DATA_MAP(CPumpKINDlg)
+ DDX_Control(pDX, IDC_LISTENING, m_ListenCtl);
DDX_Control(pDX, IDC_ABORT, m_AbortCtl);
@@ -153,2 +169,4 @@ BEGIN_MESSAGE_MAP(CPumpKINDlg, CDialog) ON_BN_CLICKED(ID_HELP, OnHelp)
+ ON_BN_CLICKED(IDC_LISTENING, OnListening)
+ ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen)
//}}AFX_MSG_MAP
@@ -219,2 +237,4 @@ CRect rc, drc; + m_ListenCtl.SetCheck(m_Listener.m_bListen?1:0);
+
// CG: The following block was added by the ToolTips component.
@@ -326,7 +346,6 @@ int CPumpKINDlg::OnCreate(LPCREATESTRUCT lpCreateStruct) - m_Listener.m_Daddy=this;
- if(!m_Listener.Create(m_ListenPort,SOCK_DGRAM)){
+ if(!m_Listener.SetListen(m_bListen)) {
+ m_bListen=FALSE;
TRACE0("Failed to create socket\n");
AfxMessageBox(IDS_BOX_CANTBIND,MB_OK|MB_ICONEXCLAMATION);
- return -1;
}
@@ -666,3 +685,3 @@ CString lFile = localFile?localFile:m_FileName; UpdateList();
- if(!localFile){ // Check only if server
+ if(!localFile){ // Check only for incoming requests
if(CheckBadRelativeness(m_FileName)){
@@ -671,3 +690,6 @@ CString lFile = localFile?localFile:m_FileName; }
- switch(m_Daddy->m_RRQMode){
+ int atar=m_Daddy->m_aclRules.FindTarget(acl_rule::opRRQ,m_Peer.sin_addr.s_addr);
+ if(atar<0)
+ atar = m_Daddy->m_RRQMode;
+ switch(atar){
case CPumpKINDlg::rrqGiveAll:
@@ -677,2 +699,4 @@ CString lFile = localFile?localFile:m_FileName; break;
+ default:
+ TRACE1("Unexpected access target: %d\n",atar);
case CPumpKINDlg::rrqDenyAll:
@@ -1109,3 +1133,3 @@ int i = m_Daddy->m_List.FindItem(&lvf); -void CPumpKINDlg::LogLine(LPCTSTR str)
+void CPumpKINDlg::LogLineToScreen(LPCTSTR str)
{
@@ -1165,2 +1189,3 @@ CPropsNetwork network; CPropsSounds sounds;
+CPropsACL acl;
@@ -1171,2 +1196,3 @@ CPropsSounds sounds; server.m_PromptTimeOut=m_PromptTimeOut;
+ server.m_LogFile=m_LogFile;
@@ -1181,2 +1207,4 @@ CPropsSounds sounds; + acl.m_rulist = m_aclRules;
+
cps.AddPage(&server);
@@ -1184,2 +1212,3 @@ CPropsSounds sounds; cps.AddPage(&sounds);
+ cps.AddPage(&acl);
if(cps.DoModal()==IDOK){
@@ -1190,2 +1219,3 @@ CPropsSounds sounds; m_PromptTimeOut=server.m_PromptTimeOut;
+ m_LogFile=server.m_LogFile;
@@ -1199,2 +1229,6 @@ CPropsSounds sounds; m_bnwAbort = sounds.m_Abort;
+
+ m_aclRules = acl.m_rulist;
+
+ m_lastlogerr.Empty();
}
@@ -1246,4 +1280,6 @@ CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(lf); m_Rename=exists=FALSE;
- // *** m_WRQMode only if server transfer
- switch(m_Daddy->m_WRQMode){
+ int atar=m_Daddy->m_aclRules.FindTarget(acl_rule::opWRQ,m_Peer.sin_addr.s_addr);
+ if(atar<0)
+ atar=m_Daddy->m_WRQMode;
+ switch(atar){
case CPumpKINDlg::wrqTakeAll:
@@ -1270,2 +1306,4 @@ CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(lf); }
+ default:
+ TRACE1("Unexpected access target: %d\n",atar);
case CPumpKINDlg::wrqDenyAll:
@@ -1797,2 +1835,3 @@ CWinApp *app = AfxGetApp(); ASSERT(app);
+ m_bListen=app->GetProfileInt("TFTPSettings","Listen",m_bListen);
m_bnwRequest=app->GetProfileString("BellsNWhistles","Request",m_bnwRequest);
@@ -1807,2 +1846,3 @@ CWinApp *app = AfxGetApp(); m_TFTPRoot=app->GetProfileString("TFTPSettings","TFTPRoot",m_TFTPRoot);
+ m_LogFile=app->GetProfileString("General","LogFile",m_LogFile);
m_TFTPTimeOut=CTimeSpan(app->GetProfileInt("TFTPSettings","TFTPTimeout",m_TFTPTimeOut.GetTotalSeconds()));
@@ -1818,2 +1858,3 @@ CWinApp *app = AfxGetApp(); ::SetCurrentDirectory(m_TFTPRoot);
+ m_aclRules.LoadProfile(app);
}
@@ -1824,2 +1865,3 @@ CWinApp *app = AfxGetApp(); ASSERT(app);
+ app->WriteProfileInt("TFTPSettings","Listen",m_bListen);
app->WriteProfileString("BellsNWhistles","Request",m_bnwRequest);
@@ -1834,2 +1876,3 @@ CWinApp *app = AfxGetApp(); app->WriteProfileString("TFTPSettings","TFTPRoot",m_TFTPRoot);
+ app->WriteProfileString("General","LogFile",m_LogFile);
app->WriteProfileInt("TFTPSettings","TFTPTimeout",m_TFTPTimeOut.GetTotalSeconds());
@@ -1839,2 +1882,3 @@ CWinApp *app = AfxGetApp(); app->WriteProfileInt("UISettings","Visble",m_bShown);
+ m_aclRules.SaveProfile(app);
}
@@ -1986 +2030,50 @@ void CPumpKINDlg::OnHelp() }
+
+BOOL CListenSocket::SetListen(BOOL b) {
+ ASSERT(m_Daddy);
+ if(b==m_bListen)
+ return TRUE;
+ if(b) {
+ if(!Create(m_Daddy->m_ListenPort,SOCK_DGRAM))
+ return FALSE;
+ return m_bListen=TRUE;
+ }else{
+ Close(); m_bListen=FALSE;
+ return TRUE;
+ }
+}
+
+void CPumpKINDlg::OnListening()
+{
+ if(!m_Listener.SetListen(m_ListenCtl.GetCheck()==1)) {
+ TRACE0("Failed to create socket\n");
+ AfxMessageBox(IDS_BOX_CANTBIND,MB_OK|MB_ICONEXCLAMATION);
+ }
+ m_ListenCtl.SetCheck(m_Listener.m_bListen?1:0);
+ m_bListen=m_Listener.m_bListen;
+}
+
+void CPumpKINDlg::OnTrayListen()
+{
+ if(!m_Listener.SetListen(!m_Listener.m_bListen)) {
+ TRACE0("Failed to create socket\n");
+ AfxMessageBox(IDS_BOX_CANTBIND,MB_OK|MB_ICONEXCLAMATION);
+ }
+ m_ListenCtl.SetCheck(m_Listener.m_bListen?1:0);
+ m_bListen=m_Listener.m_bListen;
+}
+
+void CPumpKINDlg::LogLine(LPCTSTR str)
+{
+ LogLineToScreen(str);
+ if(!m_LogFile.IsEmpty()) {
+ if(!Klever::LogRecord((LPCTSTR)m_LogFile,str)) {
+ if(m_lastlogerr!=m_LogFile) {
+ CString tmp;
+ tmp.Format(IDS_LOG_LOGERROR,m_LogFile);
+ LogLineToScreen(tmp);
+ m_lastlogerr=m_LogFile;
+ }
+ }
+ }
+}
diff --git a/PumpKINDlg.h b/PumpKINDlg.h index 42ae62d..b247c56 100644 --- a/PumpKINDlg.h +++ b/PumpKINDlg.h @@ -115,2 +115,143 @@ public: +struct acl_rule {
+ enum {
+ opRRQ=tftp::opRRQ, opWRQ=tftp::opWRQ
+ };
+ int op;
+ DWORD addr, mask;
+ enum {
+ rrqGrant=0, rrqPrompt, rrqDeny,
+ rrqRules,
+ rrqNone=-1
+ };
+ enum {
+ wrqGrant=0, wrqPromptIfExists, wrqPrompt, wrqDeny,
+ wrqRules,
+ wrqNone=-1
+ };
+ int target;
+
+ acl_rule()
+ : op(-1), addr(0), mask(0), target(-1) { }
+ acl_rule(int o,DWORD a,DWORD m,int t)
+ : op(o), addr(a), mask(m), target(t) { }
+ acl_rule(const acl_rule& s)
+ : op(s.op), addr(s.addr), mask(s.mask), target(s.target) { }
+
+ BOOL IsValid() {
+ if(op==opRRQ) {
+ if(target<rrqNone || target>=rrqRules)
+ return FALSE;
+ }else if(op==opWRQ) {
+ if(target<wrqNone || target>=wrqRules)
+ return FALSE;
+ }else
+ return FALSE;
+ return TRUE;
+ }
+
+ BOOL IsMatch(int o,DWORD a) {
+ if(o!=op) return FALSE;
+ if( (a&mask) != (addr&mask)) return FALSE;
+ return TRUE;
+ }
+
+ CString str_addr() {
+ return inet_ntoa(*(struct in_addr*)&addr);
+ }
+ CString str_mask() {
+ return inet_ntoa(*(struct in_addr*)&mask);
+ }
+ CString str_target() {
+ if(op==opRRQ) {
+ switch(target) {
+ case rrqNone: return "fallback";
+ case rrqGrant: return "grant";
+ case rrqPrompt: return "prompt";
+ case rrqDeny: return "deny";
+ default: return "?";
+ }
+ }else if(op==opWRQ) {
+ switch(target) {
+ case wrqNone: return "fallback";
+ case wrqGrant: return "grant";
+ case wrqPromptIfExists: return "prompt if exists";
+ case wrqPrompt: return "prompt";
+ case wrqDeny: return "deny";
+ default: return "?";
+ }
+ }else
+ return "?";
+ }
+
+ void SaveProfile(CWinApp* app,int i) {
+ CString n; n.Format("%d",i);
+ app->WriteProfileInt("ACL","op_"+n,op);
+ app->WriteProfileString("ACL","addr_"+n,str_addr());
+ app->WriteProfileString("ACL","mask_"+n,str_mask());
+ app->WriteProfileInt("ACL","target_"+n,target);
+ }
+
+ void LoadProfile(CWinApp* app,int i) {
+ CString n; n.Format("%d",i);
+ op=app->GetProfileInt("ACL","op_"+n,-1);
+ addr=inet_addr(app->GetProfileString("ACL","addr_"+n));
+ mask=inet_addr(app->GetProfileString("ACL","mask_"+n));
+ target=app->GetProfileInt("ACL","target_"+n,-1);
+ }
+
+};
+
+class acl_rules_t : public CArray<acl_rule,acl_rule&> {
+public:
+
+ acl_rules_t& operator=(const acl_rules_t& s) {
+ // Copy(s); XXX: unsuprisingly, there's a bug in MFC Copy, *pDst++=*pSrc (no ++ for Src)
+ RemoveAll();
+ int ns = s.GetSize();
+ SetSize(ns);
+ for(int i=0;i<ns;++i)
+ m_pData[i]=s.m_pData[i];
+ return *this;
+ }
+
+ int AppendRule(acl_rule& r) {
+ return Add(r);
+ }
+
+ void DeleteRule(int r) {
+ RemoveAt(r);
+ }
+
+ int FindRule(int op,DWORD ip) {
+ for(int i=0;i<GetSize();++i)
+ if(m_pData[i].IsMatch(op,ip))
+ return i;
+ return -1;
+ }
+
+ int FindTarget(int op,DWORD ip) {
+ int r=FindRule(op,ip);
+ if(r<0) return -1;
+ return m_pData[r].target;
+ }
+
+ void SaveProfile(CWinApp* app) {
+ int s=GetSize();
+ for(int i=0;i<s;++i)
+ m_pData[i].SaveProfile(app,i);
+ app->WriteProfileInt("ACL","rules",s);
+ }
+ void LoadProfile(CWinApp* app) {
+ RemoveAll();
+ int s=app->GetProfileInt("ACL","rules",0);
+ for(int i=0;i<s;++i) {
+ acl_rule r;
+ r.LoadProfile(app,i);
+ if(r.IsValid())
+ Add(r);
+ }
+ }
+};
+
class CPumpKINDlg;
@@ -118,4 +259,10 @@ class CListenSocket : public CAsyncSocket { public:
- virtual void OnReceive(int nErrorCode);
CPumpKINDlg* m_Daddy;
+ BOOL m_bListen;
+
+ CListenSocket()
+ : m_bListen(FALSE), m_Daddy(0) { }
+
+ BOOL SetListen(BOOL b);
+ virtual void OnReceive(int nErrorCode);
};
@@ -222,2 +369,7 @@ class CPumpKINDlg : public CDialog public:
+ CString m_lastlogerr;
+ void LogLine(LPCTSTR str);
+ CString m_LogFile;
+ BOOL m_bListen;
+ acl_rules_t m_aclRules;
CString m_bnwRequest;
@@ -242,3 +394,4 @@ public: CTimeMap m_LogTimes;
- void LogLine(LPCTSTR str);
+ void LogLineToFile(LPCTSTR str);
+ void LogLineToScreen(LPCTSTR str);
int m_LogLength;
@@ -253,11 +406,15 @@ public: enum {
- rrqGiveAll=0,
- rrqAlwaysConfirm,
- rrqDenyAll
+ rrqGiveAll=acl_rule::rrqGrant,
+ rrqAlwaysConfirm=acl_rule::rrqPrompt,
+ rrqDenyAll=acl_rule::rrqDeny,
+ rrqFallback=acl_rule::rrqNone,
+ rrqGrant=rrqGiveAll, rrqDeny=rrqDenyAll, rrqPrompt=rrqAlwaysConfirm
};
enum {
- wrqTakeAll=0,
- wrqConfirmIfExists,
- wrqAlwaysConfirm,
- wrqDenyAll
+ wrqTakeAll=acl_rule::wrqGrant,
+ wrqConfirmIfExists=acl_rule::wrqPromptIfExists,
+ wrqAlwaysConfirm=acl_rule::wrqPrompt,
+ wrqDenyAll=acl_rule::wrqDeny,
+ wrqFallback=acl_rule::wrqNone,
+ wrqGrant=wrqTakeAll,wrqDeny=wrqDenyAll, wrqPrompt=wrqAlwaysConfirm
};
@@ -275,2 +432,3 @@ public: enum { IDD = IDD_PUMPKIN_DIALOG };
+ CButton m_ListenCtl;
CButton m_AbortCtl;
@@ -312,2 +470,3 @@ protected: afx_msg void OnTrayShowpumpkinwindow();
+ afx_msg void OnTrayListen();
afx_msg void OnTrayExit();
@@ -324,2 +483,3 @@ protected: afx_msg void OnHelp();
+ afx_msg void OnListening();
//}}AFX_MSG
@@ -39,2 +39,3 @@ BEGIN_MESSAGE_MAP(CTrayer, CWnd) ON_COMMAND(ID_TRAY_SHOWPUMPKINWINDOW, OnTrayShowpumpkinwindow)
+ ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen)
//}}AFX_MSG_MAP
@@ -67,2 +68,3 @@ LRESULT CTrayer::OnTray(WPARAM wP,LPARAM lP) popUp->CheckMenuItem(ID_TRAY_SHOWPUMPKINWINDOW,MF_BYCOMMAND|(IsWindowVisible()?MF_CHECKED:MF_UNCHECKED));
+ popUp->CheckMenuItem(ID_TRAY_LISTEN,MF_BYCOMMAND|(m_Daddy->m_Listener.m_bListen?MF_CHECKED:MF_UNCHECKED));
popUp->TrackPopupMenu(TPM_RIGHTALIGN|TPM_LEFTBUTTON|TPM_RIGHTBUTTON,pt.x,pt.y,this);
@@ -118 +120,6 @@ void CTrayer::OnTrayShowpumpkinwindow() }
+
+void CTrayer::OnTrayListen()
+{
+ m_Daddy->SendMessage(WM_COMMAND,ID_TRAY_LISTEN);
+}
@@ -43,2 +43,3 @@ protected: afx_msg void OnTrayShowpumpkinwindow();
+ afx_msg void OnTrayListen();
//}}AFX_MSG
diff --git a/help/pumpkin.cnt b/help/pumpkin.cnt index 0e09da3..dfe42e5 100644 --- a/help/pumpkin.cnt +++ b/help/pumpkin.cnt @@ -14 +14,2 @@ 2 Sounds Options=SoundsOptions
+2 Access Lists=ACL
diff --git a/help/pumpkin.rtf b/help/pumpkin.rtf index b39ca9c..9c02ca9 100644 --- a/help/pumpkin.rtf +++ b/help/pumpkin.rtf @@ -20,3 +20,3 @@ K{\footnote about} {
-\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1997-2005 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}
+\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1997-2006 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}
\par\qj\sb120\sa120Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@@ -30,2 +30,5 @@ K{\footnote about} ${\footnote What's New}
+\par\pard\plain\f1\fs24\qc\cf2\b 2.7 - February 1st, 2006
+\par\pard\plain\fi0\li0\f1\fs18 \bullet Added acess lists based on request IP address and TFTP opcode for automating access policy
+\par\pard\plain\fi0\li0\f1\fs18 \bullet Added possibility to start/stop TFTP server, while keeping client functionality intact
\par\pard\plain\f1\fs24\qc\cf2\b 2.6 - August 6th, 2005
@@ -114,3 +117,3 @@ ${\footnote Server Options} \pard\plain\keepn
-#{\footnote SoundsOptoins}
+#{\footnote SoundsOptions}
${\footnote Sounds Options}
@@ -120,2 +123,10 @@ ${\footnote Sounds Options} \page
+
+\pard\plain\keepn
+#{\footnote ACL}
+${\footnote Access Lists}
+{ \f1\fs18\b\sb120 Access Lists}
+\par\sa120\sb120\qj\pard \f1\fs18\sb120 You can slightly automate your access policies by setting up read/write request behavior for different incoming requests.
+\par\sa120\sb120\qj\pard \f1\fs18\sb120 The rule consists of {\b request type}, source networke ({\b ip} and {\b netmask}) and {\b action} to take (see also {\uldb Server Options}{\v ServerOptions}).
+\page
}
\ No newline at end of file diff --git a/help/pumpkin.xml b/help/pumpkin.xml index 38c54ca..944bb54 100644 --- a/help/pumpkin.xml +++ b/help/pumpkin.xml @@ -7,3 +7,3 @@ <p><b><i>Enjoy!</i></b></p>
- <license years="1997-2005"/>
+ <license years="1997-2006"/>
<credist/>
@@ -11,2 +11,6 @@ <topic id="News" title="What's New">
+ <newsfor version="2.7" date="">
+ <ni>Added acess lists based on request IP address and TFTP opcode for automating access policy</ni>
+ <ni>Added possibility to start/stop TFTP server, while keeping client functionality intact</ni>
+ </newsfor>
<newsfor version="2.6" date="August 6th, 2005">
@@ -38,2 +42,3 @@ <p>Use <a href="#Options">Options</a> button to set <kin>PumpKIN</kin> options.</p>
+ <p>You can start and stop <kin>PumpKIN</kin>'s <term>TFTP</term> server by checking and unchecking the <b>Server is running</b> checkbox in the lower right corner of main <kin>PumpKIN</kin> window.</p>
</topic>
@@ -85,3 +90,3 @@ </topic>
- <topic id="SoundsOptoins" title="Sounds Options">
+ <topic id="SoundsOptions" title="Sounds Options">
<heading scroll="no">Sounds</heading>
@@ -90,2 +95,10 @@ </topic>
+ <topic id="ACL" title="Access Lists">
+ <heading scroll="no">Access Lists</heading>
+ <p>You can slightly automate your access policies by setting up read/write request behavior for different incoming requests.</p>
+ <p>The rule consists of <b>request type</b>, source network (<b>ip</b> and <b>netmask</b>) and <b>action</b> to take (see also <a href="#ServerOptions">Server Options</a>).</p>
+ <p>When <kin>PumpKIN</kin> receives request it goes through the list of rules and bases its decision on the first matching rule. To rearrange order of rules, select the rule you wish to move and use up and down arrows buttons on the right. To remove rule, use the cross button.</p>
+ <p>To add a new rule fill in the information about <b>request type</b>, source <b>address</b> and <b>netmask</b> and desired action. Then click on the 'Add new rule' button.</p>
+ <p>If you wish to amend the rule, select it in the rules list, change parameters below and click the 'Replace rule' button.</p>
+ </topic>
</winhelp>
diff --git a/install/Install.clw b/install/Install.clw new file mode 100644 index 0000000..6775b4c --- a/dev/null +++ b/install/Install.clw @@ -0,0 +1,35 @@ +; CLW file contains information for the MFC ClassWizard
+
+[General Info]
+Version=1
+LastClass=
+LastTemplate=CDialog
+NewFileInclude1=#include "stdafx.h"
+NewFileInclude2=#include "install.h"
+LastPage=0
+
+ClassCount=0
+
+ResourceCount=2
+Resource1=IDD_INSTALLING (FALSE)
+Resource2=IDD_PATH
+
+[DLG:IDD_INSTALLING (FALSE)]
+Type=1
+Class=?
+ControlCount=4
+Control1=IDCANCEL,button,1342295808
+Control2=IDC_DISKS,SysAnimate32,1342242822
+Control3=IDC_STATE,static,1342308736
+Control4=IDC_PROGRESS,msctls_progress32,1342177280
+
+[DLG:IDD_PATH]
+Type=1
+Class=?
+ControlCount=5
+Control1=IDC_PROMPT,static,1342308352
+Control2=IDC_PATH,edit,1350631552
+Control3=IDC_BROWSE,button,1342242816
+Control4=IDOK,button,1342242817
+Control5=IDCANCEL,button,1342242816
+
diff --git a/install/install.cpp b/install/install.cpp index d11de03..cfe4d27 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -3,3 +3,3 @@ -#define VERSION "2.6"
+#define VERSION "2.7"
#define KINAME "PumpKIN " VERSION
diff --git a/install/install.rc b/install/install.rc index cc621ad..9a03edb 100644 --- a/install/install.rc +++ b/install/install.rc @@ -133,4 +133,4 @@ IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION 2,7,0,0
+ PRODUCTVERSION 2,7,0,0
FILEFLAGSMASK 0x3fL
@@ -151,5 +151,5 @@ BEGIN VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
+ VALUE "FileVersion", "2, 7, 0, 0\0"
VALUE "InternalName", "INSTALL\0"
- VALUE "LegalCopyright", "Copyright © 1997-2005 Klever Group (http://www.klever.net/)\0"
+ VALUE "LegalCopyright", "Copyright © 1997-2006 Klever Group (http://www.klever.net/)\0"
VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
@@ -157,3 +157,3 @@ BEGIN VALUE "ProductName", "PumpKIN\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
+ VALUE "ProductVersion", "2, 7, 0, 0\0"
END
diff --git a/pumpkin.clw b/pumpkin.clw index 4ae747b..5344bfd 100644 --- a/pumpkin.clw +++ b/pumpkin.clw @@ -4,4 +4,4 @@ Version=1
-LastClass=CPropsSounds
-LastTemplate=CPropertyPage
+LastClass=CPropsServer
+LastTemplate=CComboBox
NewFileInclude1=#include "stdafx.h"
@@ -9,3 +9,3 @@ NewFileInclude2=#include "PumpKIN.h" -ClassCount=12
+ClassCount=14
Class1=CPumpKINApp
@@ -14,5 +14,5 @@ Class3=CAboutDlg -ResourceCount=9
+ResourceCount=10
Resource1=IDD_REQUEST
-Resource2=IDD_PROPS_SERVER
+Resource2=IDD_PROPS_NETWORK
Resource3=IDD_CONFIRM_RRQ
@@ -22,3 +22,3 @@ Class5=CPropsNetwork Resource5=IDD_CONFIRM_WRQ
-Resource6=IDD_PROPS_NETWORK
+Resource6=IDD_PROPS_ACL
Class6=CConfirmRRQDlg
@@ -33,2 +33,5 @@ Class12=CPropsSounds Resource9=IDM_POPUPS
+Class13=CPropsACL
+Class14=CACLTargetCombo
+Resource10=IDD_PROPS_SERVER
@@ -47,3 +50,3 @@ BaseClass=CDialog VirtualFilter=dWC
-LastObject=ID_HELP
+LastObject=CPumpKINDlg
@@ -71,3 +74,3 @@ Type=1 Class=CPumpKINDlg
-ControlCount=9
+ControlCount=10
Control1=IDC_CONNECTIONS,SysListView32,1350631681
@@ -81,2 +84,3 @@ Control8=IDC_LOG,listbox,1353728129 Control9=IDCANCEL,button,1073741824
+Control10=IDC_LISTENING,button,1342275619
@@ -85,3 +89,3 @@ Type=1 Class=CPropsServer
-ControlCount=15
+ControlCount=18
Control1=IDC_STATIC,button,1342177287
@@ -101,2 +105,5 @@ Control14=IDC_STATIC,static,1342308609 Control15=IDC_PROMPTTIMEOUT,msctls_trackbar32,1342242823
+Control16=IDC_STATIC,button,1342177287
+Control17=IDC_LOGFILE,edit,1350631552
+Control18=IDC_LOGFILE_BROWSE,button,1342242880
@@ -129,3 +136,3 @@ Filter=D VirtualFilter=idWC
-LastObject=CPropsServer
+LastObject=IDC_LOGFILE_BROWSE
@@ -138,3 +145,3 @@ Filter=D VirtualFilter=idWC
-LastObject=CPropsNetwork
+LastObject=IDC_BLOCKSIZE
@@ -232,8 +239,9 @@ Command2=ID_TRAY_FETCHFILE Command3=ID_TRAY_OPTIONS
-Command4=ID_TRAY_SHOWPUMPKINWINDOW
-Command5=ID_TRAY_OPENFILESFOLDER
-Command6=ID_TRAY_HELP
-Command7=ID_TRAY_ABOUTPUMPKIN
-Command8=ID_TRAY_EXIT
-CommandCount=8
+Command4=ID_TRAY_LISTEN
+Command5=ID_TRAY_SHOWPUMPKINWINDOW
+Command6=ID_TRAY_OPENFILESFOLDER
+Command7=ID_TRAY_HELP
+Command8=ID_TRAY_ABOUTPUMPKIN
+Command9=ID_TRAY_EXIT
+CommandCount=9
@@ -283 +291,37 @@ VirtualFilter=idWC +[DLG:IDD_PROPS_ACL]
+Type=1
+Class=CPropsACL
+ControlCount=14
+Control1=IDC_ACL_LIST,SysListView32,1350631425
+Control2=IDC_ACL_UP,button,1342246720
+Control3=IDC_ACL_DOWN,button,1342246720
+Control4=IDC_ACL_REMOVE,button,1342246720
+Control5=IDC_STATIC,static,1342308352
+Control6=IDC_ACL_XFER,combobox,1344339971
+Control7=IDC_STATIC,static,1342308352
+Control8=IDC_ACL_ADDR,edit,1350631552
+Control9=IDC_STATIC,static,1342308352
+Control10=IDC_ACL_NETMASK,edit,1350631552
+Control11=IDC_STATIC,static,1342308352
+Control12=IDC_ACL_RULE,combobox,1344339971
+Control13=IDC_ACL_ADD,button,1342242816
+Control14=IDC_ACL_REPLACE,button,1342242816
+
+[CLS:CPropsACL]
+Type=0
+HeaderFile=PropsACL.h
+ImplementationFile=PropsACL.cpp
+BaseClass=CPropertyPage
+Filter=D
+LastObject=CPropsACL
+VirtualFilter=idWC
+
+[CLS:CACLTargetCombo]
+Type=0
+HeaderFile=ACLTargetCombo.h
+ImplementationFile=ACLTargetCombo.cpp
+BaseClass=CComboBox
+Filter=W
+LastObject=CACLTargetCombo
+
diff --git a/pumpkin.mak b/pumpkin.mak index bd466fe..7d2ec22 100644 --- a/pumpkin.mak +++ b/pumpkin.mak @@ -68,4 +68,6 @@ ALL : "$(OUTDIR)\pumpkin.exe" "$(OUTDIR)\pumpkin.ex_" "$(OUTDIR)\pumpkin.hlp"\ CLEAN :
+ -@erase "$(INTDIR)\ACLTargetCombo.obj"
-@erase "$(INTDIR)\ConfirmRRQDlg.obj"
-@erase "$(INTDIR)\ConfirmWRQDlg.obj"
+ -@erase "$(INTDIR)\PropsACL.obj"
-@erase "$(INTDIR)\PropsNetwork.obj"
@@ -117,4 +119,6 @@ LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\ LINK32_OBJS= \
+ "$(INTDIR)\ACLTargetCombo.obj" \
"$(INTDIR)\ConfirmRRQDlg.obj" \
"$(INTDIR)\ConfirmWRQDlg.obj" \
+ "$(INTDIR)\PropsACL.obj" \
"$(INTDIR)\PropsNetwork.obj" \
@@ -171,2 +175,4 @@ ALL : "$(OUTDIR)\pumpkin.exe" "$(OUTDIR)\pumpkin.bsc" "$(OUTDIR)\pumpkin.ex_"\ CLEAN :
+ -@erase "$(INTDIR)\ACLTargetCombo.obj"
+ -@erase "$(INTDIR)\ACLTargetCombo.sbr"
-@erase "$(INTDIR)\ConfirmRRQDlg.obj"
@@ -175,2 +181,4 @@ CLEAN : -@erase "$(INTDIR)\ConfirmWRQDlg.sbr"
+ -@erase "$(INTDIR)\PropsACL.obj"
+ -@erase "$(INTDIR)\PropsACL.sbr"
-@erase "$(INTDIR)\PropsNetwork.obj"
@@ -230,4 +238,6 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc" BSC32_SBRS= \
+ "$(INTDIR)\ACLTargetCombo.sbr" \
"$(INTDIR)\ConfirmRRQDlg.sbr" \
"$(INTDIR)\ConfirmWRQDlg.sbr" \
+ "$(INTDIR)\PropsACL.sbr" \
"$(INTDIR)\PropsNetwork.sbr" \
@@ -254,4 +264,6 @@ LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes\ LINK32_OBJS= \
+ "$(INTDIR)\ACLTargetCombo.obj" \
"$(INTDIR)\ConfirmRRQDlg.obj" \
"$(INTDIR)\ConfirmWRQDlg.obj" \
+ "$(INTDIR)\PropsACL.obj" \
"$(INTDIR)\PropsNetwork.obj" \
@@ -307,4 +319,6 @@ ALL : "$(OUTDIR)\pumpkin.exe" "$(OUTDIR)\pumpkin.ex_" "$(OUTDIR)\pumpkin.hlp"\ CLEAN :
+ -@erase "$(INTDIR)\ACLTargetCombo.obj"
-@erase "$(INTDIR)\ConfirmRRQDlg.obj"
-@erase "$(INTDIR)\ConfirmWRQDlg.obj"
+ -@erase "$(INTDIR)\PropsACL.obj"
-@erase "$(INTDIR)\PropsNetwork.obj"
@@ -355,4 +369,6 @@ LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\ LINK32_OBJS= \
+ "$(INTDIR)\ACLTargetCombo.obj" \
"$(INTDIR)\ConfirmRRQDlg.obj" \
"$(INTDIR)\ConfirmWRQDlg.obj" \
+ "$(INTDIR)\PropsACL.obj" \
"$(INTDIR)\PropsNetwork.obj" \
@@ -672,4 +688,7 @@ LINK32_OBJS= \ SOURCE=.\PumpKIN.cpp
+
+!IF "$(CFG)" == "PumpKIN - Win32 Release"
+
DEP_CPP_PUMPK=\
- ".\PumpKIN.h"\
+ ".\pumpkin.h"\
".\PumpKINDlg.h"\
@@ -680,5 +699,2 @@ DEP_CPP_PUMPK=\ -!IF "$(CFG)" == "PumpKIN - Win32 Release"
-
-
"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\
@@ -689,2 +705,8 @@ DEP_CPP_PUMPK=\ +DEP_CPP_PUMPK=\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -699,2 +721,9 @@ DEP_CPP_PUMPK=\ +DEP_CPP_PUMPK=\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -711,5 +740,10 @@ DEP_CPP_PUMPK=\ SOURCE=.\PumpKINDlg.cpp
+
+!IF "$(CFG)" == "PumpKIN - Win32 Release"
+
DEP_CPP_PUMPKI=\
+ ".\ACLTargetCombo.h"\
".\ConfirmRRQDlg.h"\
".\ConfirmWRQDlg.h"\
+ ".\PropsACL.h"\
".\PropsNetwork.h"\
@@ -717,3 +751,3 @@ DEP_CPP_PUMPKI=\ ".\PropsSounds.h"\
- ".\PumpKIN.h"\
+ ".\pumpkin.h"\
".\PumpKINDlg.h"\
@@ -728,5 +762,2 @@ DEP_CPP_PUMPKI=\ -!IF "$(CFG)" == "PumpKIN - Win32 Release"
-
-
"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\
@@ -737,2 +768,20 @@ DEP_CPP_PUMPKI=\ +DEP_CPP_PUMPKI=\
+ ".\ACLTargetCombo.h"\
+ ".\ConfirmRRQDlg.h"\
+ ".\ConfirmWRQDlg.h"\
+ ".\PropsACL.h"\
+ ".\PropsNetwork.h"\
+ ".\PropsServer.h"\
+ ".\PropsSounds.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\RequestDlg.h"\
+ ".\Resolver.h"\
+ ".\Retrier.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+ ".\Trayer.h"\
+
@@ -747,2 +796,20 @@ DEP_CPP_PUMPKI=\ +DEP_CPP_PUMPKI=\
+ ".\ACLTargetCombo.h"\
+ ".\ConfirmRRQDlg.h"\
+ ".\ConfirmWRQDlg.h"\
+ ".\PropsACL.h"\
+ ".\PropsNetwork.h"\
+ ".\PropsServer.h"\
+ ".\PropsSounds.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\RequestDlg.h"\
+ ".\Resolver.h"\
+ ".\Retrier.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+ ".\Trayer.h"\
+
@@ -824,2 +891,3 @@ SOURCE=.\pumpkin.rc DEP_RSC_PUMPKIN=\
+ ".\res\down.ico"\
".\res\failed.wav"\
@@ -828,4 +896,6 @@ DEP_RSC_PUMPKIN=\ ".\res\pumpkin.rc2"\
+ ".\res\remove.ico"\
".\res\ring.wav"\
".\res\rrq.ico"\
+ ".\res\up.ico"\
".\res\wrq.ico"\
@@ -953,5 +1023,8 @@ BuildCmds= \ SOURCE=.\PropsServer.cpp
+
+!IF "$(CFG)" == "PumpKIN - Win32 Release"
+
DEP_CPP_PROPS=\
".\PropsServer.h"\
- ".\PumpKIN.h"\
+ ".\pumpkin.h"\
".\shared-code\BellsNWhistles.h"\
@@ -961,5 +1034,2 @@ DEP_CPP_PROPS=\ -!IF "$(CFG)" == "PumpKIN - Win32 Release"
-
-
"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\
@@ -970,2 +1040,8 @@ DEP_CPP_PROPS=\ +DEP_CPP_PROPS=\
+ ".\PropsServer.h"\
+ ".\pumpkin.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -980,2 +1056,9 @@ DEP_CPP_PROPS=\ +DEP_CPP_PROPS=\
+ ".\PropsServer.h"\
+ ".\pumpkin.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -994,3 +1077,3 @@ DEP_CPP_PROPSN=\ ".\PropsNetwork.h"\
- ".\PumpKIN.h"\
+ ".\pumpkin.h"\
".\shared-code\BellsNWhistles.h"\
@@ -1031,5 +1114,8 @@ DEP_CPP_PROPSN=\ SOURCE=.\ConfirmRRQDlg.cpp
+
+!IF "$(CFG)" == "PumpKIN - Win32 Release"
+
DEP_CPP_CONFI=\
".\ConfirmRRQDlg.h"\
- ".\PumpKIN.h"\
+ ".\pumpkin.h"\
".\PumpKINDlg.h"\
@@ -1040,5 +1126,2 @@ DEP_CPP_CONFI=\ -!IF "$(CFG)" == "PumpKIN - Win32 Release"
-
-
"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\
@@ -1049,2 +1132,9 @@ DEP_CPP_CONFI=\ +DEP_CPP_CONFI=\
+ ".\ConfirmRRQDlg.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -1059,2 +1149,10 @@ DEP_CPP_CONFI=\ +DEP_CPP_CONFI=\
+ ".\ConfirmRRQDlg.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -1071,5 +1169,8 @@ DEP_CPP_CONFI=\ SOURCE=.\ConfirmWRQDlg.cpp
+
+!IF "$(CFG)" == "PumpKIN - Win32 Release"
+
DEP_CPP_CONFIR=\
".\ConfirmWRQDlg.h"\
- ".\PumpKIN.h"\
+ ".\pumpkin.h"\
".\PumpKINDlg.h"\
@@ -1080,5 +1181,2 @@ DEP_CPP_CONFIR=\ -!IF "$(CFG)" == "PumpKIN - Win32 Release"
-
-
"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\
@@ -1089,2 +1187,9 @@ DEP_CPP_CONFIR=\ +DEP_CPP_CONFIR=\
+ ".\ConfirmWRQDlg.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -1099,2 +1204,10 @@ DEP_CPP_CONFIR=\ +DEP_CPP_CONFIR=\
+ ".\ConfirmWRQDlg.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -1112,3 +1225,3 @@ SOURCE=.\RequestDlg.cpp DEP_CPP_REQUE=\
- ".\PumpKIN.h"\
+ ".\pumpkin.h"\
".\RequestDlg.h"\
@@ -1150,4 +1263,7 @@ DEP_CPP_REQUE=\ SOURCE=.\Resolver.cpp
+
+!IF "$(CFG)" == "PumpKIN - Win32 Release"
+
DEP_CPP_RESOL=\
- ".\PumpKIN.h"\
+ ".\pumpkin.h"\
".\PumpKINDlg.h"\
@@ -1159,5 +1275,2 @@ DEP_CPP_RESOL=\ -!IF "$(CFG)" == "PumpKIN - Win32 Release"
-
-
"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\
@@ -1168,2 +1281,9 @@ DEP_CPP_RESOL=\ +DEP_CPP_RESOL=\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\Resolver.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -1178,2 +1298,10 @@ DEP_CPP_RESOL=\ +DEP_CPP_RESOL=\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\Resolver.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -1190,4 +1318,7 @@ DEP_CPP_RESOL=\ SOURCE=.\Retrier.cpp
+
+!IF "$(CFG)" == "PumpKIN - Win32 Release"
+
DEP_CPP_RETRI=\
- ".\PumpKIN.h"\
+ ".\pumpkin.h"\
".\PumpKINDlg.h"\
@@ -1199,5 +1330,2 @@ DEP_CPP_RETRI=\ -!IF "$(CFG)" == "PumpKIN - Win32 Release"
-
-
"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\
@@ -1208,2 +1336,9 @@ DEP_CPP_RETRI=\ +DEP_CPP_RETRI=\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\Retrier.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -1218,2 +1353,10 @@ DEP_CPP_RETRI=\ +DEP_CPP_RETRI=\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\Retrier.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -1230,4 +1373,7 @@ DEP_CPP_RETRI=\ SOURCE=.\Trayer.cpp
+
+!IF "$(CFG)" == "PumpKIN - Win32 Release"
+
DEP_CPP_TRAYE=\
- ".\PumpKIN.h"\
+ ".\pumpkin.h"\
".\PumpKINDlg.h"\
@@ -1239,5 +1385,2 @@ DEP_CPP_TRAYE=\ -!IF "$(CFG)" == "PumpKIN - Win32 Release"
-
-
"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\
@@ -1248,2 +1391,9 @@ DEP_CPP_TRAYE=\ +DEP_CPP_TRAYE=\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+ ".\Trayer.h"\
+
@@ -1258,2 +1408,10 @@ DEP_CPP_TRAYE=\ +DEP_CPP_TRAYE=\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+ ".\Trayer.h"\
+
@@ -1290,5 +1448,8 @@ SOURCE=.\help\pumpkin.cnt SOURCE=.\PropsSounds.cpp
+
+!IF "$(CFG)" == "PumpKIN - Win32 Release"
+
DEP_CPP_PROPSS=\
".\PropsSounds.h"\
- ".\PumpKIN.h"\
+ ".\pumpkin.h"\
".\PumpKINDlg.h"\
@@ -1299,5 +1460,2 @@ DEP_CPP_PROPSS=\ -!IF "$(CFG)" == "PumpKIN - Win32 Release"
-
-
"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\
@@ -1308,2 +1466,9 @@ DEP_CPP_PROPSS=\ +DEP_CPP_PROPSS=\
+ ".\PropsSounds.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -1318,2 +1483,10 @@ DEP_CPP_PROPSS=\ +DEP_CPP_PROPSS=\
+ ".\PropsSounds.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
@@ -1326,2 +1499,115 @@ DEP_CPP_PROPSS=\ # End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\PropsACL.cpp
+
+!IF "$(CFG)" == "PumpKIN - Win32 Release"
+
+DEP_CPP_PROPSA=\
+ ".\ACLTargetCombo.h"\
+ ".\PropsACL.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
+
+"$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\
+ "$(INTDIR)\pumpkin.pch"
+
+
+!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
+
+DEP_CPP_PROPSA=\
+ ".\ACLTargetCombo.h"\
+ ".\PropsACL.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
+
+"$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\
+ "$(INTDIR)\pumpkin.pch"
+
+"$(INTDIR)\PropsACL.sbr" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\
+ "$(INTDIR)\pumpkin.pch"
+
+
+!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
+
+DEP_CPP_PROPSA=\
+ ".\ACLTargetCombo.h"\
+ ".\PropsACL.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
+
+"$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\
+ "$(INTDIR)\pumpkin.pch"
+
+
+!ENDIF
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\ACLTargetCombo.cpp
+
+!IF "$(CFG)" == "PumpKIN - Win32 Release"
+
+DEP_CPP_ACLTA=\
+ ".\ACLTargetCombo.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
+
+"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\
+ "$(INTDIR)\pumpkin.pch"
+
+
+!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
+
+DEP_CPP_ACLTA=\
+ ".\ACLTargetCombo.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
+
+"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\
+ "$(INTDIR)\pumpkin.pch"
+
+"$(INTDIR)\ACLTargetCombo.sbr" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\
+ "$(INTDIR)\pumpkin.pch"
+
+
+!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
+
+DEP_CPP_ACLTA=\
+ ".\ACLTargetCombo.h"\
+ ".\pumpkin.h"\
+ ".\PumpKINDlg.h"\
+ ".\shared-code\BellsNWhistles.h"\
+ ".\shared-code\kHelpers.h"\
+ ".\stdafx.h"\
+
+
+"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\
+ "$(INTDIR)\pumpkin.pch"
+
+
+!ENDIF
+
+# End Source File
# End Target
@@ -72,2 +72,5 @@ IDR_MAINFRAME ICON DISCARDABLE "res\\pumpkin.ico" IDI_PLAY ICON DISCARDABLE "shared-data/play-icon.ico"
+IDI_UP ICON DISCARDABLE "res\\up.ico"
+IDI_DOWN ICON DISCARDABLE "res\\down.ico"
+IDI_REMOVE ICON DISCARDABLE "res\\remove.ico"
@@ -84,5 +87,5 @@ BEGIN ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20
- LTEXT "PumpKIN, Version 2.6",IDC_STATIC,40,15,119,8,
+ LTEXT "PumpKIN, Version 2.7",IDC_STATIC,40,15,119,8,
SS_NOPREFIX
- LTEXT "Copyright © 1997-2005 Klever Group",IDC_STATIC,40,30,
+ LTEXT "Copyright © 1997-2006 Klever Group",IDC_STATIC,40,30,
170,8
@@ -92,3 +95,3 @@ END -IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 191
+IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 193
STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION |
@@ -97,3 +100,3 @@ EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW CAPTION " PumpKIN"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
BEGIN
@@ -112,8 +115,11 @@ BEGIN PUSHBUTTON "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE
- LISTBOX IDC_LOG,7,115,348,69,LBS_USETABSTOPS | LBS_NOSEL |
+ LISTBOX IDC_LOG,7,115,348,65,LBS_USETABSTOPS | LBS_NOSEL |
WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME
PUSHBUTTON "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP
+ CONTROL "&Server is running",IDC_LISTENING,"Button",
+ BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_FLAT | WS_TABSTOP,286,
+ 180,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE
END
-IDD_PROPS_SERVER DIALOG DISCARDABLE 0, 0, 210, 154
+IDD_PROPS_SERVER DIALOG DISCARDABLE 0, 0, 300, 201
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -123,32 +129,37 @@ BEGIN GROUPBOX "TFTP filesystem &root (download path)",IDC_STATIC,7,7,
- 196,38
- EDITTEXT IDC_TFTPROOT,13,16,170,13,ES_AUTOHSCROLL
- PUSHBUTTON "&B",IDC_BROWSE,186,16,13,13,BS_ICON
+ 286,38
+ EDITTEXT IDC_TFTPROOT,13,16,256,13,ES_AUTOHSCROLL
+ PUSHBUTTON "&B",IDC_BROWSE,274,16,13,13,BS_ICON
CONTROL "Allow access to &subdirectories",IDC_TFTPSUBDIRS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,31,111,10
- GROUPBOX "Read Request Behavior",IDC_STATIC,7,48,153,42
+ GROUPBOX "Read Request Behavior",IDC_STATIC,7,48,243,56
CONTROL "Give &all files",IDC_RRQ_GIVEALL,"Button",
- BS_AUTORADIOBUTTON | BS_NOTIFY | WS_GROUP,13,57,53,10
+ BS_AUTORADIOBUTTON | BS_NOTIFY | WS_GROUP,13,63,53,10
CONTROL "&Prompt before giving file",IDC_RRQ_ALWAYSCONFIRM,
- "Button",BS_AUTORADIOBUTTON | BS_NOTIFY,23,67,91,10
+ "Button",BS_AUTORADIOBUTTON | BS_NOTIFY,43,75,91,10
CONTROL "&Deny all requests",IDC_RRQ_DENYALL,"Button",
- BS_AUTORADIOBUTTON | BS_NOTIFY,33,77,70,10
- GROUPBOX "Write Request Behavior",IDC_STATIC,7,93,172,54,WS_GROUP
+ BS_AUTORADIOBUTTON | BS_NOTIFY,73,87,70,10
+ GROUPBOX "Write Request Behavior",IDC_STATIC,7,106,243,56,
+ WS_GROUP
CONTROL "Take a&ll files",IDC_WRQ_TAKEALL,"Button",
- BS_AUTORADIOBUTTON | WS_GROUP,13,103,55,10
+ BS_AUTORADIOBUTTON | WS_GROUP,13,116,55,10
CONTROL "Prompt if file &exists",IDC_WRQ_PROMPTEXISTING,"Button",
- BS_AUTORADIOBUTTON,23,113,73,10
+ BS_AUTORADIOBUTTON,43,126,73,10
CONTROL "Always pro&mpt before accepting file",
- IDC_WRQ_ALWAYSCONFIRM,"Button",BS_AUTORADIOBUTTON,33,123,
+ IDC_WRQ_ALWAYSCONFIRM,"Button",BS_AUTORADIOBUTTON,73,136,
139,10
CONTROL "D&eny all requests",IDC_WRQ_DENYALL,"Button",
- BS_AUTORADIOBUTTON,43,133,70,10
- CTEXT "Confirmation &timeout",IDC_STATIC,163,52,40,19,
+ BS_AUTORADIOBUTTON,103,146,70,10
+ CTEXT "Confirmation &timeout",IDC_STATIC,253,52,40,19,
SS_NOTIFY
CONTROL "Slider1",IDC_PROMPTTIMEOUT,"msctls_trackbar32",
- TBS_AUTOTICKS | TBS_VERT | TBS_TOP | WS_TABSTOP,182,73,
- 21,74
+ TBS_AUTOTICKS | TBS_VERT | TBS_TOP | WS_TABSTOP,272,72,
+ 21,90
+ GROUPBOX "Log file (leave empty to disable logging to file)",
+ IDC_STATIC,7,165,286,29
+ EDITTEXT IDC_LOGFILE,13,175,256,13,ES_AUTOHSCROLL
+ PUSHBUTTON "",IDC_LOGFILE_BROWSE,274,175,13,13,BS_ICON
END
-IDD_PROPS_NETWORK DIALOG DISCARDABLE 0, 0, 210, 154
+IDD_PROPS_NETWORK DIALOG DISCARDABLE 0, 0, 300, 201
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -157,3 +168,3 @@ FONT 8, "MS Sans Serif" BEGIN
- GROUPBOX "UDP Ports",IDC_STATIC,7,7,196,40
+ GROUPBOX "UDP Ports",IDC_STATIC,7,7,286,40
RTEXT "Listen for &incoming requests on port:",IDC_STATIC,13,
@@ -259,3 +270,3 @@ END -IDD_PROPS_SOUNDS DIALOG DISCARDABLE 0, 0, 210, 154
+IDD_PROPS_SOUNDS DIALOG DISCARDABLE 0, 0, 300, 201
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -265,16 +276,44 @@ BEGIN LTEXT "&Incoming request:",IDC_STATIC,7,9,57,8
- COMBOBOX IDC_RING,70,7,103,100,CBS_DROPDOWN | CBS_AUTOHSCROLL |
+ COMBOBOX IDC_RING,70,7,188,100,CBS_DROPDOWN | CBS_AUTOHSCROLL |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "browse",IDC_RING_BROWSE,175,7,13,13,BS_ICON
- PUSHBUTTON "play",IDC_RING_PLAY,190,7,13,13,BS_ICON
+ PUSHBUTTON "browse",IDC_RING_BROWSE,263,7,13,13,BS_ICON
+ PUSHBUTTON "play",IDC_RING_PLAY,280,7,13,13,BS_ICON
LTEXT "xfer &finished:",IDC_STATIC,7,25,57,8
- COMBOBOX IDC_FINISHED,70,22,103,100,CBS_DROPDOWN |
+ COMBOBOX IDC_FINISHED,70,22,188,100,CBS_DROPDOWN |
CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "browse",IDC_FINISHED_BROWSE,175,22,13,13,BS_ICON
- PUSHBUTTON "play",IDC_FINISHED_PLAY,190,22,13,13,BS_ICON
+ PUSHBUTTON "browse",IDC_FINISHED_BROWSE,263,22,13,13,BS_ICON
+ PUSHBUTTON "play",IDC_FINISHED_PLAY,280,22,13,13,BS_ICON
LTEXT "xfer &aborted:",IDC_STATIC,7,40,57,8
- COMBOBOX IDC_ABORTED,70,37,103,100,CBS_DROPDOWN | CBS_AUTOHSCROLL |
+ COMBOBOX IDC_ABORTED,70,37,188,100,CBS_DROPDOWN | CBS_AUTOHSCROLL |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "browse",IDC_ABORTED_BROWSE,175,37,13,13,BS_ICON
- PUSHBUTTON "play",IDC_ABORTED_PLAY,190,37,13,13,BS_ICON
+ PUSHBUTTON "browse",IDC_ABORTED_BROWSE,263,37,13,13,BS_ICON
+ PUSHBUTTON "play",IDC_ABORTED_PLAY,280,37,13,13,BS_ICON
+END
+
+IDD_PROPS_ACL DIALOG DISCARDABLE 0, 0, 300, 201
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Access Lists"
+FONT 8, "MS Sans Serif"
+BEGIN
+ CONTROL "List1",IDC_ACL_LIST,"SysListView32",LVS_REPORT |
+ WS_BORDER | WS_TABSTOP,7,7,258,110
+ PUSHBUTTON "&Up",IDC_ACL_UP,273,7,20,30,BS_ICON | BS_CENTER |
+ BS_VCENTER
+ PUSHBUTTON "&Down",IDC_ACL_DOWN,273,87,20,30,BS_ICON | BS_CENTER |
+ BS_VCENTER
+ PUSHBUTTON "&Remove",IDC_ACL_REMOVE,273,47,20,30,BS_ICON |
+ BS_CENTER | BS_VCENTER
+ LTEXT "If",IDC_STATIC,13,128,8,8
+ COMBOBOX IDC_ACL_XFER,21,125,48,67,CBS_DROPDOWNLIST | WS_VSCROLL |
+ WS_TABSTOP
+ LTEXT "request comes from the address in the network",
+ IDC_STATIC,71,128,122,8
+ EDITTEXT IDC_ACL_ADDR,47,143,80,12,ES_AUTOHSCROLL
+ LTEXT "with netmask",IDC_STATIC,129,145,41,8
+ EDITTEXT IDC_ACL_NETMASK,173,143,80,12,ES_AUTOHSCROLL
+ LTEXT "then",IDC_STATIC,124,160,15,8
+ COMBOBOX IDC_ACL_RULE,143,158,123,117,CBS_DROPDOWNLIST |
+ WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Add new rule",IDC_ACL_ADD,7,178,130,16
+ PUSHBUTTON "&Replace rule",IDC_ACL_REPLACE,152,178,130,16
END
@@ -289,4 +328,4 @@ END VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION 2,7,0,0
+ PRODUCTVERSION 2,7,0,0
FILEFLAGSMASK 0x3fL
@@ -307,5 +346,5 @@ BEGIN VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
+ VALUE "FileVersion", "2, 7, 0, 0\0"
VALUE "InternalName", "PUMPKIN\0"
- VALUE "LegalCopyright", "Copyright © 1997-2005 Klever Group (http://www.klever.net)\0"
+ VALUE "LegalCopyright", "Copyright © 1997-2006 Klever Group (http://www.klever.net)\0"
VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
@@ -313,3 +352,3 @@ BEGIN VALUE "ProductName", "PumpKIN\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
+ VALUE "ProductVersion", "2, 7, 0, 0\0"
END
@@ -346,3 +385,3 @@ BEGIN TOPMARGIN, 7
- BOTTOMMARGIN, 184
+ BOTTOMMARGIN, 186
HORZGUIDE, 115
@@ -353,5 +392,5 @@ BEGIN LEFTMARGIN, 7
- RIGHTMARGIN, 203
+ RIGHTMARGIN, 293
TOPMARGIN, 7
- BOTTOMMARGIN, 147
+ BOTTOMMARGIN, 194
END
@@ -361,5 +400,5 @@ BEGIN LEFTMARGIN, 7
- RIGHTMARGIN, 203
+ RIGHTMARGIN, 293
TOPMARGIN, 7
- BOTTOMMARGIN, 147
+ BOTTOMMARGIN, 194
END
@@ -393,5 +432,15 @@ BEGIN LEFTMARGIN, 7
- RIGHTMARGIN, 203
+ RIGHTMARGIN, 293
TOPMARGIN, 7
- BOTTOMMARGIN, 147
+ BOTTOMMARGIN, 194
+ END
+
+ IDD_PROPS_ACL, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 293
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 194
+ HORZGUIDE, 117
+ HORZGUIDE, 125
END
@@ -441,2 +490,21 @@ END +IDD_PROPS_ACL DLGINIT
+BEGIN
+ IDC_ACL_XFER, 0x403, 5, 0
+0x6572, 0x6461, "\000"
+ IDC_ACL_XFER, 0x403, 6, 0
+0x7277, 0x7469, 0x0065,
+ IDC_ACL_RULE, 0x403, 12, 0
+0x6361, 0x6563, 0x7470, 0x6620, 0x6c69, 0x0065,
+ IDC_ACL_RULE, 0x403, 33, 0
+0x6361, 0x6563, 0x7470, 0x6120, 0x646e, 0x7220, 0x6e65, 0x6d61, 0x2065,
+0x6669, 0x6620, 0x6c69, 0x2065, 0x7865, 0x7369, 0x7374, "\000"
+ IDC_ACL_RULE, 0x403, 12, 0
+0x6572, 0x656a, 0x7463, 0x6620, 0x6c69, 0x0065,
+ IDC_ACL_RULE, 0x403, 31, 0
+0x6166, 0x6c6c, 0x6162, 0x6b63, 0x7420, 0x206f, 0x6874, 0x2065, 0x6c67,
+0x626f, 0x6c61, 0x7320, 0x7465, 0x6974, 0x676e, "\000"
+ 0
+END
+
@@ -454,2 +522,3 @@ BEGIN MENUITEM "&Options", ID_TRAY_OPTIONS
+ MENUITEM "&Listen to requests", ID_TRAY_LISTEN
MENUITEM "Show &PumpKIN Window", ID_TRAY_SHOWPUMPKINWINDOW
@@ -535,2 +604,3 @@ BEGIN ID_TRAY_OPENFILESFOLDER "Explore TFTP root folder"
+ ID_TRAY_LISTEN "Listen for incoming requests"
END
@@ -574,2 +644,5 @@ BEGIN IDS_BOX_CANTBIND "Failed to create listening socket. The port may be in use by another application."
+ IDS_NO_XFER_OP "No request type specified."
+ IDS_INVALID_IP "Invalid IP address."
+ IDS_INVALID_NETMASK "Invalid netmask."
END
@@ -581,2 +654,8 @@ END +STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_INVALID_RULE "Invalid access rule."
+ IDS_LOG_LOGERROR "Error logging to '%s'"
+END
+
#endif // English (U.S.) resources
diff --git a/res/down.ico b/res/down.ico Binary files differnew file mode 100644 index 0000000..433e718 --- a/dev/null +++ b/res/down.ico diff --git a/res/remove.ico b/res/remove.ico Binary files differnew file mode 100644 index 0000000..8e4473d --- a/dev/null +++ b/res/remove.ico diff --git a/res/up.ico b/res/up.ico Binary files differnew file mode 100644 index 0000000..32f684b --- a/dev/null +++ b/res/up.ico @@ -75,8 +75,17 @@ #define IDS_TFTP_ERROR_TSIZE 150
+#define IDD_PROPS_ACL 150
#define IDS_TFTP_ERROR_BSIZE 151
#define IDS_TFTP_ERROR_TOUT 152
+#define IDI_UP 152
#define IDS_SELECT_TFTPROOT 153
+#define IDI_DOWN 153
#define IDS_FILTER_WAV 154
+#define IDI_REMOVE 154
#define IDS_TITLE_WAV 155
#define IDS_BOX_CANTBIND 156
+#define IDS_NO_XFER_OP 157
+#define IDS_INVALID_IP 158
+#define IDS_INVALID_NETMASK 159
+#define IDS_INVALID_RULE 160
+#define IDS_LOG_LOGERROR 161
#define IDC_KLEVERNET 1000
@@ -123,8 +132,21 @@ #define IDC_RING_PLAY 1043
+#define IDC_ACL_LIST 1043
#define IDC_FINISHED 1044
+#define IDC_ACL_UP 1044
#define IDC_FINISHED_BROWSE 1045
+#define IDC_ACL_DOWN 1045
#define IDC_FINISHED_PLAY 1046
+#define IDC_ACL_REMOVE 1046
#define IDC_ABORTED 1047
+#define IDC_ACL_ADDR 1047
#define IDC_ABORTED_BROWSE 1048
+#define IDC_ACL_RULE 1048
#define IDC_ABORTED_PLAY 1049
+#define IDC_ACL_NETMASK 1049
+#define IDC_ACL_ADD 1050
+#define IDC_ACL_XFER 1051
+#define IDC_ACL_REPLACE 1052
+#define IDC_LISTENING 1052
+#define IDC_LOGFILE 1053
+#define IDC_LOGFILE_BROWSE 1054
#define ID_TRAY_HELP 32771
@@ -137,2 +159,3 @@ #define ID_TRAY_OPENFILESFOLDER 32778
+#define ID_TRAY_LISTEN 32780
@@ -142,5 +165,5 @@ #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 150
-#define _APS_NEXT_COMMAND_VALUE 32780
-#define _APS_NEXT_CONTROL_VALUE 1043
+#define _APS_NEXT_RESOURCE_VALUE 155
+#define _APS_NEXT_COMMAND_VALUE 32781
+#define _APS_NEXT_CONTROL_VALUE 1055
#define _APS_NEXT_SYMED_VALUE 102
|