bumped dates and versions, updated newsHEAD2.7.3master

Signed-off-by: Michael Krelin <hacker@klever.net>

4 files changed, 18 insertions, 14 deletions

diff --git a/help/pumpkin.xml b/help/pumpkin.xml
index 153219a..486ac82 100644
--- a/help/pumpkin.xml
+++ b/help/pumpkin.xml
@@ -1,59 +1,63 @@
 <?xml version="1.0"?>

 <winhelp>

  <topic id="About" title="About PumpKIN" keywords="about">

   <heading scroll="no">About <kin>PumpKIN</kin></heading>

   <p><kin>PumpKIN</kin> is a program designed to send and receive files over the net while having <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> session running using <term>TFTP</term> (<rfc num="1350"/>) protocol. It includes full-functional <term>TFTP</term> server/client so it may be useful for maintaining <a href="http://www.cisco.com/">CISCO</a> routers and other network equipment.</p>

   <p/>

   <p><b><i>Enjoy!</i></b></p>

-  <license years="1997-2006"/>

+  <license years="1997-2011"/>

   <credist/>

  </topic>

  <topic id="News" title="What's New">

+  <newsfor version="2.7.3" date="Apr 27th, 2011">

+   <ni>Added configuration option to bind to specific ip address</ni>

+   <ni>Fixed a minor bug that lead to misdiagnosis of the packet from unexpected source</ni>

+  </newsfor>

   <newsfor version="2.7.2" date="October 18th, 2006">

    <ni>Added rejecting of too large file requests with explicit error message about the block size</ni>

    <ni>A bit more elaborate logging</ni>

    <ni>Not closing receive socket until the last ACK receved now</ni>

   </newsfor>

   <newsfor version="2.7.1" date="March 13th, 2006">

    <ni>Bugfix release</ni>

   </newsfor>

   <newsfor version="2.7" date="February 28th, 2006">

    <ni>Access lists based on request IP address and TFTP opcode for automating access policy</ni>

    <ni>Possibility to start/stop TFTP server, while keeping client functionality intact</ni>

    <ni>Logging to file</ni>

    <ni>Resizable main window</ni>

   </newsfor>

   <newsfor version="2.6" date="August 6th, 2005">

    <ni>more robust solution to the backslash/slash dilemma</ni>

    <ni>A bit more elaborate error reporting</ni>

    <ni>Fixed uninstall procedure so that it works on XP</ni>

   </newsfor>

   <newsfor version="2.5" date="July 11th, 2004">

    <ni>Change of <a href="#About">license</a> and opening the source.</ni>

    <ni>Minor cosmetic changes</ni>

   </newsfor>

   <newsfor version="2.0" date="June 13th, 1998">

    <ni>Sounds customization. Now you can customize <kin>PumpKIN</kin> bells and whistles or turn them off completely.</ni>

    <ni>Previous version of <kin>PumpKIN</kin> had a bug causing it to misbehave when you're requesting file from remote <term>tftp</term> server using <b>IP Address</b> (as opposed to <b>hostname</b>).</ni>

    <ni>Typo causing <kin>PumpKIN</kin> to log outgoing request in reverse (i.e. <i>Requesting 'hostname' from 'filename'</i>) fixed.</ni>

    <ni>Something else that you may not notice and I can not remember.</ni>

   </newsfor>

   <newsfor version="1.5" date="February 12th, 1998">

    <ni>Transfer resumes. No checking on file contents is done, so it's up to you to decide whether you want to start transmission from the beginning or resume unfinished transfer.</ni>

    <ni>Support for <b>block size</b>, <b>trasnfer size</b> and <b>transfer timeout</b> options as described in <rfc num="1782"/>, <rfc num="1783"/> and <rfc num="1784"/>. I'm not sure if there are any other <term>TFTP</term> implementations supporting this, but at least it makes sense if you use <kin>PumpKIN</kin> on both ends.</ni>

    <ni>New Install program</ni>

   </newsfor>

  </topic>

  <topic id="Using" title="Using PumpKIN">

   <heading scroll="no">Using <kin>PumpKIN</kin></heading>

   <p>This is a simple program for file exchange between two parties. It allows you to send files over the network to your party while having a <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> conversation. It uses open sessions to determine IP address of your party. Also you may use it as a <term>TFTP</term> client/server by itself. To get/put files from/to <term>TFTP</term> server you need to enter host name/IP address manually in the <a href="#Request">Request Dialog</a>.</p>

   <p>To Abort transfer(s) currently in progress - select transfer(s) you want to terminate in the list and click <b>Abort xfer</b> button.</p>

   <p>You may want to hide <kin>PumpKIN</kin> window and leave it as a tray icon only. Just click the <image source="pumpkin.bmp"/> icon in the tray or simply close the window.</p>

   <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>

  <topic id="ConfirmRRQ" title="Confirm Read Request Dialog">

   <heading scroll="no">Confirm Read Request Dialog</heading>

   <p>When the file is requested from your <term>TFTP</term> server you may choose to <b>Grant Access</b> to this file or to <b>Deny Access</b>. If you hesitate to answer for <a href="#ConfirmationTimeout"><b>Confirmation timeout</b></a> (<i>default - 30 seconds</i>) <kin>PumpKIN</kin> defaults to denial of all requests.</p>

  </topic>

  <topic id="ConfirmWRQ" title="Confirm Write Request Dialog">

diff --git a/install/install.cpp b/install/install.cpp
index 58ed997..ea27a2c 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,52 +1,52 @@
 #include "resource.h"
 #include "../shared-code/install.h"

 

-#define VERSION "2.7.2"

+#define VERSION "2.7.3"

         #defineKINAME "PumpKIN " VERSION

 #define SKINAME "PumpKIN"
 
 BOOL Install(void)
 {
 STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path");

 STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");

 LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings");

 STRING path = REQUESTPATH("  " KINAME,"\nEnter destination path:",qPath);

         if(!path)

                 return NULL;

 

         #ifdefK_ANNED

 STRING sysDir(_MAX_PATH);

         GetSystemDirectory(sysDir,_MAX_PATH);

         INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll");

 #endif

 

         MAKE_PATH(path);

 STRING shortPath = GET_SHORT_PATH(path);

         if(!shortPath){

                 MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK);

                 return FALSE;

         }

 

         if(!(

                 INSTALLFILE(SKINAME ".ex_",path,SKINAME ".exe") &&

                 INSTALLFILE(SKINAME ".hl_",path,SKINAME ".hlp") && 

                 INSTALLFILE(SKINAME ".cn_",path,SKINAME ".cnt")

         )){

                 MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK);

                 return FALSE;

         }

         ADDMENU("Klever Group",SKINAME,path, SKINAME ".exe");

 

         strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path",path);

         strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath",path);

 

 FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");

         if(!inf){

                 MessageBox(NULL,"Failed to install " KINAME,NULL,MB_ICONERROR|MB_OK);

                 return FALSE;

         }

         INF_FILE_HEADER(inf);

         INF_FILE_SECTION(inf,"Uninstall");

         fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n");

         INF_FILE_SECTION(inf,"kFiles");

         INF_REMOVE_ROOT(inf,SKINAME "Files",shortPath);

diff --git a/install/install.rc b/install/install.rc
index 6967799..2dce211 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -86,97 +86,97 @@ BEGIN
         BOTTOMMARGIN, 66

         HORZGUIDE, 37

     END

 END

 #endif    // APSTUDIO_INVOKED

 

 

 #ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

 //

 // TEXTINCLUDE

 //

 

 1 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "resource.h\0"

 END

 

 2 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "#include ""afxres.h""\r\n"

     "\0"

 END

 

 3 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "#include ""custom.rch""\0"

 END

 

 #endif    // APSTUDIO_INVOKED

 

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // Icon

 //

 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico"

 

 #ifndef _MAC

 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 2,7,2,0

- PRODUCTVERSION 2,7,2,0

+ FILEVERSION 2,7,3,0

+ PRODUCTVERSION 2,7,3,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

  FILEOS 0x40004L

  FILETYPE 0x1L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"

-            VALUE "FileVersion", "2, 7, 2, 0\0"

+            VALUE "FileVersion", "2, 7, 3, 0\0"

             VALUE "InternalName", "INSTALL\0"

-            VALUE "LegalCopyright", "Copyright © 1997-2006 Klever Group (http://www.klever.net/)\0"

+            VALUE "LegalCopyright", "Copyright © 1997-2011 Klever Group (http://www.klever.net/)\0"

             VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"

             VALUE "OriginalFilename", "INSTALL.EXE\0"

             VALUE "ProductName", "PumpKIN\0"

-            VALUE "ProductVersion", "2, 7, 2, 0\0"

+            VALUE "ProductVersion", "2, 7, 3, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

 #endif    // English (U.S.) resources

 /////////////////////////////////////////////////////////////////////////////

 

 

 

 #ifndef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

 //

 // Generated from the TEXTINCLUDE 3 resource.

 //

 #include "custom.rch"

 /////////////////////////////////////////////////////////////////////////////

 #endif    // not APSTUDIO_INVOKED

 

diff --git a/pumpkin.rc b/pumpkin.rc
index babd066..6f01fdf 100755
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -40,99 +40,99 @@ END
 

 3 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

     "#define _AFX_NO_OLE_RESOURCES\r\n"

     "#define _AFX_NO_TRACKER_RESOURCES\r\n"

     "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

     "\r\n"

     "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

     "#ifdef _WIN32\r\n"

     "LANGUAGE 9, 1\r\n"

     "#pragma code_page(1252)\r\n"

     "#endif\r\n"

     "#include ""res\\PumpKIN.rc2""  // non-Microsoft Visual C++ edited resources\r\n"

     "#include ""afxres.rc""         // Standard components\r\n"

     "#endif\0"

 END

 

 #endif    // APSTUDIO_INVOKED

 

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // Icon

 //

 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_RRQ                 ICON    DISCARDABLE     "res\\wrq.ico"

 IDI_WRQ                 ICON    DISCARDABLE     "res\\rrq.ico"

 IDI_BROWSE              ICON    DISCARDABLE     "shared-data/browse-icon.ico"

 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"

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // Dialog

 //

 

 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 217, 74

 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "About PumpKIN"

 FONT 8, "MS Sans Serif"

 BEGIN

     ICON            IDR_MAINFRAME,IDC_STATIC,7,17,18,20

-    LTEXT           "PumpKIN, Version 2.7.2",IDC_STATIC,40,15,119,8,

+    LTEXT           "PumpKIN, Version 2.7.3",IDC_STATIC,40,15,119,8,

                     SS_NOPREFIX

-    LTEXT           "Copyright © 1997-2006 Klever Group",IDC_STATIC,40,30,

+    LTEXT           "Copyright © 1997-2011 Klever Group",IDC_STATIC,40,30,

                     170,8

     DEFPUSHBUTTON   "OK",IDOK,178,7,32,14,WS_GROUP

     PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14

 END

 

 IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 193

 STYLE DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW

 CAPTION "  PumpKIN"

 FONT 8, "MS Sans Serif", 0, 0, 0x1

 BEGIN

     CONTROL         "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT | 

                     LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,7,295,108,

                     WS_EX_DLGMODALFRAME

     PUSHBUTTON      "&Get File",IDC_GET,305,7,50,17,BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Put File",IDC_PUT,305,25,50,17,BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Abort xfer",IDC_ABORT,305,43,50,17,BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Options",IDC_OPTIONS,305,61,50,17,BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     PUSHBUTTON      "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE

     LISTBOX         IDC_LOG,7,115,348,64,LBS_USETABSTOPS | 

                     LBS_NOINTEGRALHEIGHT | 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,

                     181,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE

 END

 

 IDD_PROPS_SERVER DIALOG DISCARDABLE  0, 0, 300, 201

 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

 CAPTION "Server"

 FONT 8, "MS Sans Serif"

 BEGIN

     GROUPBOX        "TFTP filesystem &root (download path)",IDC_STATIC,7,7,

                     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,243,56

     CONTROL         "Give &all files",IDC_RRQ_GIVEALL,"Button",

                     BS_AUTORADIOBUTTON | BS_NOTIFY | WS_GROUP,13,63,53,10

     CONTROL         "&Prompt before giving file",IDC_RRQ_ALWAYSCONFIRM,

@@ -283,121 +283,121 @@ BEGIN
     LTEXT           "xfer &finished:",IDC_STATIC,7,25,57,8

     COMBOBOX        IDC_FINISHED,70,22,188,100,CBS_DROPDOWN | 

                     CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP

     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,188,100,CBS_DROPDOWN | CBS_AUTOHSCROLL | 

                     CBS_SORT | WS_VSCROLL | WS_TABSTOP

     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

 

 

 #ifndef _MAC

 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 2,7,2,0

- PRODUCTVERSION 2,7,2,0

+ FILEVERSION 2,7,3,0

+ PRODUCTVERSION 2,7,3,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

  FILEOS 0x4L

  FILETYPE 0x1L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"

-            VALUE "FileVersion", "2, 7, 2, 0\0"

+            VALUE "FileVersion", "2, 7, 3, 0\0"

             VALUE "InternalName", "PUMPKIN\0"

-            VALUE "LegalCopyright", "Copyright © 1997-2006 Klever Group (http://www.klever.net)\0"

+            VALUE "LegalCopyright", "Copyright © 1997-2011 Klever Group (http://www.klever.net)\0"

             VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"

             VALUE "OriginalFilename", "PUMPKIN.EXE\0"

             VALUE "ProductName", "PumpKIN\0"

-            VALUE "ProductVersion", "2, 7, 2, 0\0"

+            VALUE "ProductVersion", "2, 7, 3, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // DESIGNINFO

 //

 

 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO DISCARDABLE 

 BEGIN

     IDD_ABOUTBOX, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 210

         TOPMARGIN, 7

         BOTTOMMARGIN, 67

     END

 

     IDD_PUMPKIN_DIALOG, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 355

         TOPMARGIN, 7

         BOTTOMMARGIN, 186

         HORZGUIDE, 115

     END

 

     IDD_PROPS_SERVER, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 293

         TOPMARGIN, 7

         BOTTOMMARGIN, 194

     END

 

     IDD_PROPS_NETWORK, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 293