Hibbian
/
linbpq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstream source from tag 'upstream/6.0.24.40' 

Update to upstream version '6.0.24.40'
with Debian dir 5582820246
This commit is contained in:
Hibby 2024-07-07 16:06:15 +01:00
parent d122a87dd1 766bbe358d
commit ca2a16b7fc
34 changed files with 699 additions and 1726 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +0,0 @@
.pc/

4
BBSHTMLConfig.c
View File

@ -158,6 +158,7 @@ char MailPage[] = "<html><head><title>%s's BBS Web Server</title>"
"<td><a href=/Mail/Wel?%s>Welcome Msgs & Prompts</a></td>" "<td><a href=/Mail/Wel?%s>Welcome Msgs & Prompts</a></td>"
"<td><a href=/Mail/HK?%s>Housekeeping</a></td>" "<td><a href=/Mail/HK?%s>Housekeeping</a></td>"
"<td><a href=/Mail/WP?%s>WP Update</a></td>" "<td><a href=/Mail/WP?%s>WP Update</a></td>"
"<td><a href=/Webmail>WebMail</a></td>"
"<td><a href=/>Node Menu</a></td>" "<td><a href=/>Node Menu</a></td>"
"</tr></table>"; "</tr></table>";
@ -178,6 +179,7 @@ char RefreshMainPage[] = "<html><head>"
"<td><a href=/Mail/Wel?%s>Welcome Msgs & Prompts</a></td>" "<td><a href=/Mail/Wel?%s>Welcome Msgs & Prompts</a></td>"
"<td><a href=/Mail/HK?%s>Housekeeping</a></td>" "<td><a href=/Mail/HK?%s>Housekeeping</a></td>"
"<td><a href=/Mail/WP?%s>WP Update</a></td>" "<td><a href=/Mail/WP?%s>WP Update</a></td>"
"<td><a href=/Webmail>WebMail</a></td>"
"<td><a href=/>Node Menu</a></td>" "<td><a href=/>Node Menu</a></td>"
"</tr></table>"; "</tr></table>";
@ -1887,6 +1889,7 @@ VOID SaveFwdCommon(struct HTTPConnectionInfo * Session, char * MsgPtr, char * Re
GetCheckBox(input, "WarnNoRoute=", &WarnNoRoute); GetCheckBox(input, "WarnNoRoute=", &WarnNoRoute);
GetCheckBox(input, "LocalTime=", &Localtime); GetCheckBox(input, "LocalTime=", &Localtime);
GetCheckBox(input, "SendPtoMultiple=", &SendPtoMultiple); GetCheckBox(input, "SendPtoMultiple=", &SendPtoMultiple);
GetCheckBox(input, "FourCharCont=", &FOURCHARCONT);
// Reinitialise Aliases // Reinitialise Aliases
@ -2716,6 +2719,7 @@ VOID SendFwdMainPage(char * Reply, int * RLen, char * Key)
(WarnNoRoute) ? CHKD : UNC, (WarnNoRoute) ? CHKD : UNC,
(Localtime) ? CHKD : UNC, (Localtime) ? CHKD : UNC,
(SendPtoMultiple) ? CHKD : UNC, (SendPtoMultiple) ? CHKD : UNC,
(FOURCHARCONT) ? CHKD : UNC,
ALIASES); ALIASES);
} }

37
BBSUtilities.c
View File

@ -213,6 +213,7 @@ BOOL UserCantKillT = FALSE;
typedef int (WINAPI FAR *FARPROCX)(); typedef int (WINAPI FAR *FARPROCX)();
FARPROCX pRunEventProgram; FARPROCX pRunEventProgram;
FARPROCX pGetPortFrequency;
int RunEventProgram(char * Program, char * Param); int RunEventProgram(char * Program, char * Param);
@ -9680,6 +9681,7 @@ VOID SaveConfig(char * ConfigName)
SaveIntValue(group, "WarnNoRoute", WarnNoRoute); SaveIntValue(group, "WarnNoRoute", WarnNoRoute);
SaveIntValue(group, "Localtime", Localtime); SaveIntValue(group, "Localtime", Localtime);
SaveIntValue(group, "SendPtoMultiple", SendPtoMultiple); SaveIntValue(group, "SendPtoMultiple", SendPtoMultiple);
SaveIntValue(group, "FOURCHARCONT", FOURCHARCONT);
SaveMultiStringValue(group, "FWDAliases", AliasText); SaveMultiStringValue(group, "FWDAliases", AliasText);
@ -10116,6 +10118,8 @@ BOOL GetConfig(char * ConfigName)
ReaddressReceived = GetIntValue(group, "ReaddressReceived"); ReaddressReceived = GetIntValue(group, "ReaddressReceived");
WarnNoRoute = GetIntValue(group, "WarnNoRoute"); WarnNoRoute = GetIntValue(group, "WarnNoRoute");
SendPtoMultiple = GetIntValue(group, "SendPtoMultiple"); SendPtoMultiple = GetIntValue(group, "SendPtoMultiple");
FOURCHARCONT = GetIntValue(group, "FOURCHARCONT");
Localtime = GetIntValue(group, "Localtime"); Localtime = GetIntValue(group, "Localtime");
AliasText = GetMultiStringValue(group, "FWDAliases"); AliasText = GetMultiStringValue(group, "FWDAliases");
GetStringValue(group, "BBSName", BBSName); GetStringValue(group, "BBSName", BBSName);
@ -10588,8 +10592,24 @@ int Connected(int Stream)
if (SendNewUserMessage) if (SendNewUserMessage)
{ {
int64_t LongFreq = Freq;
char * MailBuffer = malloc(100); char * MailBuffer = malloc(100);
Length += sprintf(MailBuffer, "New User %s Connected to Mailbox on Port %d Freq %d Mode %d\r\n", callsign, port, Freq, Mode);
if (Freq == 0 && port)
{
// Get Port Freq if available
char FreqString[256];
#ifdef WIN32
if (pGetPortFrequency)
LongFreq = pGetPortFrequency(port, FreqString);
#else
LongFreq = GetPortFrequency(port, FreqString);
#endif
}
Length += sprintf(MailBuffer, "New User %s Connected to Mailbox on Port %d Freq %d Mode %ld\r\n", callsign, port, LongFreq, Mode);
sprintf(Title, "New User %s", callsign); sprintf(Title, "New User %s", callsign);
@ -11754,9 +11774,8 @@ typedef struct _POPENRET
*/ */
void run_pgTimeoutThread( pid_t process ) void run_pgTimeoutThread( pid_t process )
{ {
// printf("watchdog thread: PID of subprocess: %d\n", process);
printf("watchdog thread: PID of subprocess: %d\n", process); // fflush(stdout);
fflush(stdout);
Sleep(5000); Sleep(5000);
// if still running PID (?) then kill. // if still running PID (?) then kill.
if ( getpgid(process) >= 0 ) if ( getpgid(process) >= 0 )
@ -11768,10 +11787,8 @@ void run_pgTimeoutThread( pid_t process )
Debugprintf("Failed to kill PG watchdog Process %d", process); Debugprintf("Failed to kill PG watchdog Process %d", process);
} }
// Debugprintf("watchdog thread: PID=%d Exit", process);
Debugprintf("watchdog thread: PID=%d Exit", process); // fflush(stdout);
fflush(stdout);
//return;
} }
@ -12638,7 +12655,6 @@ VOID ProcessLine(CIRCUIT * conn, struct UserInfo * user, char* Buffer, int len)
#endif #endif
return; return;
} }
if (_memicmp(Cmd, "Node", 4) == 0) if (_memicmp(Cmd, "Node", 4) == 0)
{ {
ExpandAndSendMessage(conn, SignoffMsg, LOG_BBS); ExpandAndSendMessage(conn, SignoffMsg, LOG_BBS);
@ -15757,7 +15773,9 @@ VOID GetPGConfig()
strcat(FN, "PG/PGList.txt"); strcat(FN, "PG/PGList.txt");
if ((file = fopen(FN, "r")) == NULL) if ((file = fopen(FN, "r")) == NULL)
{
return; return;
}
while(fgets(buf, 255, file) != NULL) while(fgets(buf, 255, file) != NULL)
{ {
@ -15785,6 +15803,7 @@ VOID GetPGConfig()
break; break;
} }
NUM_SERVERS = n; NUM_SERVERS = n;
fclose(file); fclose(file);

65
BPQChat.vcproj.LAPTOP-Q6S4RP5Q.johnw.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="LAPTOP-Q6S4RP5Q"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="LAPTOP-Q6S4RP5Q"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
BPQChat.vcproj.NOTTSDESKTOP.John.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
BPQChat.vcproj.SKIGACER.johnw.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

BIN
BPQMail.aps
View File

Binary file not shown.

7
BPQMail.c
View File

@ -1133,6 +1133,10 @@
// Fix possible failure to update last listed count when user disconnects without using B command // Fix possible failure to update last listed count when user disconnects without using B command
// Add short random delay (<30 secs) when forward new Messages immediately is enabled (35) // Add short random delay (<30 secs) when forward new Messages immediately is enabled (35)
// Fix Connect Script IDLETIME (38) // Fix Connect Script IDLETIME (38)
// Add "Mail Mgmt" to Webmail menu bar and "WebMail" to Mail Mgmt Menu (39)
// Improve "New User" frequency determination (39)
// Allow selection of 2 or 4 character country codes for forward processing (39)
// Fix Send P to multiple BBS's when routing on HR (40)
#include "bpqmail.h" #include "bpqmail.h"
#include "winstdint.h" #include "winstdint.h"
@ -1150,6 +1154,7 @@ FARPROCX pDllBPQTRACE;
FARPROCZ pGetLOC; FARPROCZ pGetLOC;
FARPROCX pRefreshWebMailIndex; FARPROCX pRefreshWebMailIndex;
FARPROCX pRunEventProgram; FARPROCX pRunEventProgram;
FARPROCX pGetPortFrequency;
BOOL WINE = FALSE; BOOL WINE = FALSE;
@ -1924,6 +1929,8 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
pGetLOC = GetProcAddress(ExtDriver,"_GetLOC@0"); pGetLOC = GetProcAddress(ExtDriver,"_GetLOC@0");
pRefreshWebMailIndex = GetProcAddress(ExtDriver,"_RefreshWebMailIndex@0"); pRefreshWebMailIndex = GetProcAddress(ExtDriver,"_RefreshWebMailIndex@0");
pRunEventProgram = GetProcAddress(ExtDriver,"_RunEventProgram@8"); pRunEventProgram = GetProcAddress(ExtDriver,"_RunEventProgram@8");
pGetPortFrequency = GetProcAddress(ExtDriver,"_GetPortFrequency@8");
if (pGetLOC) if (pGetLOC)
{ {

11
BPQMail.rc
View File

@ -387,16 +387,16 @@ BEGIN
CONTROL "Warn if no route for P or T",IDC_WARNNOROUTE,"Button", CONTROL "Warn if no route for P or T",IDC_WARNNOROUTE,"Button",
BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_MULTILINE | BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_MULTILINE |
WS_TABSTOP,5,101,103,8 WS_TABSTOP,5,101,103,8
LTEXT "Aliases",IDC_STATIC,5,144,57,13 LTEXT "Aliases",IDC_STATIC,5,165,57,13
EDITTEXT IDC_ALIAS,4,162,99,81,ES_MULTILINE | ES_UPPERCASE | EDITTEXT IDC_ALIAS,4,183,99,81,ES_MULTILINE | ES_UPPERCASE |
ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN |
WS_VSCROLL WS_VSCROLL
CONTROL "Readdress Locally Input",IDC_READDRESSLOCAL,"Button", CONTROL "Readdress Locally Input",IDC_READDRESSLOCAL,"Button",
BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_MULTILINE | BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_MULTILINE |
WS_DISABLED | WS_TABSTOP,4,246,97,8 WS_DISABLED | WS_TABSTOP,4,267,97,8
CONTROL "Readdress Received",IDC_READDRESSRXED,"Button", CONTROL "Readdress Received",IDC_READDRESSRXED,"Button",
BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_MULTILINE | BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_MULTILINE |
WS_DISABLED | WS_TABSTOP,4,260,97,8 WS_DISABLED | WS_TABSTOP,4,281,97,8
GROUPBOX "Per-BBS Params",IDC_STATIC,121,33,326,263 GROUPBOX "Per-BBS Params",IDC_STATIC,121,33,326,263
LTEXT "BBS",IDC_STATIC,128,46,57,10 LTEXT "BBS",IDC_STATIC,128,46,57,10
COMBOBOX IDC_BBS,122,59,50,60,CBS_SIMPLE | CBS_OEMCONVERT | COMBOBOX IDC_BBS,122,59,50,60,CBS_SIMPLE | CBS_OEMCONVERT |
@ -471,6 +471,9 @@ BEGIN
WS_TABSTOP,5,130,103,8 WS_TABSTOP,5,130,103,8
LTEXT "Incoming Connect Timeout",IDC_STATIC,125,278,95,12 LTEXT "Incoming Connect Timeout",IDC_STATIC,125,278,95,12
EDITTEXT IDC_CONTIMEOUT,219,276,22,12,ES_AUTOHSCROLL EDITTEXT IDC_CONTIMEOUT,219,276,22,12,ES_AUTOHSCROLL
CONTROL "Use 4 Char Continent Codes",IDC_FOURCHARCONTINENT,
"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_MULTILINE |
WS_TABSTOP,6,146,103,8
END END
IDD_USERADDED_BOX DIALOG DISCARDABLE 176, 132, 129, 68 IDD_USERADDED_BOX DIALOG DISCARDABLE 176, 132, 129, 68

20
BPQMail.sln Normal file
View File

@ -0,0 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BPQMail", "BPQMail.vcproj", "{3766AA10-C777-4ED8-A83D-F1452DE9B665}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3766AA10-C777-4ED8-A83D-F1452DE9B665}.Debug|Win32.ActiveCfg = Debug|Win32
{3766AA10-C777-4ED8-A83D-F1452DE9B665}.Debug|Win32.Build.0 = Debug|Win32
{3766AA10-C777-4ED8-A83D-F1452DE9B665}.Release|Win32.ActiveCfg = Release|Win32
{3766AA10-C777-4ED8-A83D-F1452DE9B665}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

65
BPQMail.vcproj.NOTTSDESKTOP.John.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
BPQMail.vcproj.SKIGACER.johnw.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

4
BPQMail.vcxproj.user
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>

2
BPQMailConfig.c
View File

@ -1867,6 +1867,7 @@ VOID SaveFWDConfig(HWND hDlg)
MaxRXSize = GetDlgItemInt(hDlg, IDC_MAXRECV, &OK, FALSE); MaxRXSize = GetDlgItemInt(hDlg, IDC_MAXRECV, &OK, FALSE);
MaxAge = GetDlgItemInt(hDlg, IDC_MAXAGE, &OK, FALSE); MaxAge = GetDlgItemInt(hDlg, IDC_MAXAGE, &OK, FALSE);
SendPtoMultiple = IsDlgButtonChecked(hDlg, IDC_MULTIP); SendPtoMultiple = IsDlgButtonChecked(hDlg, IDC_MULTIP);
FOURCHARCONT = IsDlgButtonChecked(hDlg, IDC_FOURCHARCONTINENT);
// Reinitialise Aliases // Reinitialise Aliases
@ -3249,6 +3250,7 @@ INT_PTR CALLBACK FwdEditDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARA
CheckDlgButton(hDlg, IDC_WARNNOROUTE, WarnNoRoute); CheckDlgButton(hDlg, IDC_WARNNOROUTE, WarnNoRoute);
CheckDlgButton(hDlg, IDC_USELOCALTIME, Localtime); CheckDlgButton(hDlg, IDC_USELOCALTIME, Localtime);
CheckDlgButton(hDlg, IDC_MULTIP, SendPtoMultiple); CheckDlgButton(hDlg, IDC_MULTIP, SendPtoMultiple);
CheckDlgButton(hDlg, IDC_FOURCHARCONTINENT, FOURCHARCONT);
CurrentBBS = NULL; CurrentBBS = NULL;

1
BPQMailrc.h
View File

@ -319,6 +319,7 @@
#define ID_MULTICAST 40024 #define ID_MULTICAST 40024
#define IDC_DEFAULTNOWINLINK 41001 #define IDC_DEFAULTNOWINLINK 41001
#define IDC_MULTIP 41002 #define IDC_MULTIP 41002
#define IDC_FOURCHARCONTINENT 41003
// Next default values for new objects // Next default values for new objects
// //

65
BPQWinAPP.vcproj.LAPTOP-Q6S4RP5Q.johnw.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="LAPTOP-Q6S4RP5Q"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="LAPTOP-Q6S4RP5Q"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
BPQWinAPP.vcproj.NOTTSDESKTOP.John.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

3
Bpq32.c
View File

@ -1217,6 +1217,9 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
// Fix potential buffer overflow in Telnet login (36) // Fix potential buffer overflow in Telnet login (36)
// Allow longer serial device names (37) // Allow longer serial device names (37)
// Fix ICF8101 Mode setting (37) // Fix ICF8101 Mode setting (37)
// Kill link if we are getting repeated RR(F) after timeout
// (Indicating other station is seeing our RR(P) but not the resent I frame) (40)
#define CKernel #define CKernel

65
CBPQ32.vcproj.LAPTOP-Q6S4RP5Q.johnw.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="C:\Devprogs\BPQ32\bpq32.exe"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="LAPTOP-Q6S4RP5Q"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command=""
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="LAPTOP-Q6S4RP5Q"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
CBPQ32.vcproj.NOTTSDESKTOP.John-notpi4-64.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="C:\Devprogs\BPQ32\bpq32.exe"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command=""
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
CBPQ32.vcproj.NOTTSDESKTOP.John.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="C:\Devprogs\BPQ32\bpq32.exe"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="C:\Devprogs\BPQ32\bpq32.exe"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
CBPQ32.vcproj.SKIGACER.johnw-notpi4-64.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="C:\DevProgs\BPQ32\bpq32.exe"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="C:\DevProgs\BPQ32\bpq32.exe"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
CBPQ32.vcproj.SKIGACER.johnw.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="C:\DevProgs\BPQ32\bpq32.exe"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="C:\DevProgs\BPQ32\bpq32.exe"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

4
ConfigWinRPR.vcxproj.user
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>

65
MailNode.vcproj.NOTTSDESKTOP.John.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory="c:\linbpq"
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor="0"
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
MailNode.vcproj.SKIGACER.johnw.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

8
MailNode.vcxproj.user
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LocalDebuggerCommand>c:\linbpq\linbpq.exe</LocalDebuggerCommand>
<LocalDebuggerWorkingDirectory>c:\linbpq</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>

238
MailRouting.c
View File

@ -29,9 +29,9 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
// Bulls should not be distributed outside their designated area. // Bulls should not be distributed outside their designated area.
// Use 4 char continent codes if this isn't defined // Use 4 char continent codes if this is set
#define TWOCHARCONT int FOURCHARCONT = 0;
#include "bpqmail.h" #include "bpqmail.h"
@ -95,21 +95,21 @@ struct Continent Continents[] =
struct Country Countries[] = struct Country Countries[] =
{ {
"AFG", "****", "AS", // Afghanistan "AFG", "ASIA", "AS", // Afghanistan
"ALA", "EURO", "EU", // Åland Islands "ALA", "EURO", "EU", // Åland Islands
"ALB", "EURO", "EU", // Albania "ALB", "EURO", "EU", // Albania
"DZA", "NAFR", "AF", // Algeria "DZA", "NAFR", "AF", // Algeria
"ASM", "****", "AS", // American Samoa "ASM", "ASIA", "AS", // American Samoa
"AND", "EURO", "EU", // Andorra "AND", "EURO", "EU", // Andorra
"AGO", "CAFR", "AF", // Angola "AGO", "CAFR", "AF", // Angola
"AIA", "CARB", "NA", // Anguilla "AIA", "CARB", "NA", // Anguilla
"ATG", "CARB", "NA", // Antigua and Barbuda "ATG", "CARB", "NA", // Antigua and Barbuda
"ARG", "SOAM", "SA", // Argentina "ARG", "SOAM", "SA", // Argentina
"ARM", "****", "AS", // Armenia "ARM", "ASIA", "AS", // Armenia
"ABW", "CARB", "NA", // Aruba "ABW", "CARB", "NA", // Aruba
"AUS", "AUNZ", "OC", // Australia "AUS", "AUNZ", "OC", // Australia
"AUT", "EURO", "EU", // Austria "AUT", "EURO", "EU", // Austria
"AZE", "****", "AS", // Azerbaijan "AZE", "ASIA", "AS", // Azerbaijan
"BHS", "CARB", "NA", // Bahamas "BHS", "CARB", "NA", // Bahamas
"BHR", "MDLE", "AS", // Bahrain "BHR", "MDLE", "AS", // Bahrain
"BGD", "INDE", "AS", // Bangladesh "BGD", "INDE", "AS", // Bangladesh
@ -122,14 +122,14 @@ struct Country Countries[] =
"BTN", "ASIA", "AS", // Bhutan "BTN", "ASIA", "AS", // Bhutan
"BOL", "SOAM", "SA", // Bolivia (Plurinational State of) "BOL", "SOAM", "SA", // Bolivia (Plurinational State of)
"BIH", "EURO", "EU", // Bosnia and Herzegovina "BIH", "EURO", "EU", // Bosnia and Herzegovina
"BWA", "****", "AF", // Botswana "BWA", "SAFR", "AF", // Botswana
"BRA", "SOAM", "SA", // Brazil "BRA", "SOAM", "SA", // Brazil
"VGB", "CARB", "NA", // British Virgin Islands "VGB", "CARB", "NA", // British Virgin Islands
"BRN", "ASIA", "AS", // Brunei Darussalam "BRN", "ASIA", "AS", // Brunei Darussalam
"BGR", "EURO", "EU", // Bulgaria "BGR", "EURO", "EU", // Bulgaria
"BFA", "CAFR", "AF", // Burkina Faso "BFA", "CAFR", "AF", // Burkina Faso
"BDI", "CAFR", "AF", // Burundi "BDI", "CAFR", "AF", // Burundi
"KHM", "****", "AS", // Cambodia "KHM", "ASIA", "AS", // Cambodia
"CMR", "CAFR", "AF", // Cameroon "CMR", "CAFR", "AF", // Cameroon
"CAN", "NOAM", "NA", // Canada "CAN", "NOAM", "NA", // Canada
"CPV", "NAFR", "AF", // Cape Verde "CPV", "NAFR", "AF", // Cape Verde
@ -137,12 +137,12 @@ struct Country Countries[] =
"CAF", "CAFR", "AF", // Central African Republic "CAF", "CAFR", "AF", // Central African Republic
"TCD", "CAFR", "AF", // Chad "TCD", "CAFR", "AF", // Chad
"CHL", "SOAM", "SA", // Chile "CHL", "SOAM", "SA", // Chile
"CHN", "****", "AS", // China "CHN", "ASIA", "AS", // China
"HKG", "****", "AS", // Hong Kong Special Administrative Region of China "HKG", "ASIA", "AS", // Hong Kong Special Administrative Region of China
"MAC", "****", "AS", // Macao Special Administrative Region of China "MAC", "ASIA", "AS", // Macao Special Administrative Region of China
"COL", "****", "SA", // Colombia "COL", "ASIA", "SA", // Colombia
"COM", "SAFR", "AF", // Comoros "COM", "SAFR", "AF", // Comoros
"COG", "****", "AF", // Congo "COG", "CAFR", "AF", // Congo
"COK", "SPAC", "OC", // Cook Islands "COK", "SPAC", "OC", // Cook Islands
"CRI", "CEAM", "NA", // Costa Rica "CRI", "CEAM", "NA", // Costa Rica
"CIV", "CAFR", "AF", // Côte d'Ivoire "CIV", "CAFR", "AF", // Côte d'Ivoire
@ -150,8 +150,8 @@ struct Country Countries[] =
"CUB", "CARB", "NA", // Cuba "CUB", "CARB", "NA", // Cuba
"CYP", "EURO", "EU", // Cyprus "CYP", "EURO", "EU", // Cyprus
"CZE", "EURO", "EU", // Czech Republic "CZE", "EURO", "EU", // Czech Republic
"PRK", "****", "AS", // Democratic People's Republic of Korea "PRK", "ASIA", "AS", // Democratic People's Republic of Korea
"COD", "****", "AF", // Democratic Republic of the Congo "COD", "CAFR", "AF", // Democratic Republic of the Congo
"DNK", "EURO", "EU", // Denmark "DNK", "EURO", "EU", // Denmark
"DJI", "NAFR", "AF", // Djibouti "DJI", "NAFR", "AF", // Djibouti
"DMA", "CARB", "NA", // Dominica "DMA", "CARB", "NA", // Dominica
@ -160,9 +160,9 @@ struct Country Countries[] =
"EGY", "MDLE", "AF", // Egypt "EGY", "MDLE", "AF", // Egypt
"SLV", "CEAM", "NA", // El Salvador "SLV", "CEAM", "NA", // El Salvador
"GNQ", "CAFR", "AF", // Equatorial Guinea "GNQ", "CAFR", "AF", // Equatorial Guinea
"ERI", "****", "AF", // Eritrea "ERI", "NAFR", "AF", // Eritrea
"EST", "EURO", "EU", // Estonia "EST", "EURO", "EU", // Estonia
"ETH", "****", "AF", // Ethiopia "ETH", "NAFR", "AF", // Ethiopia
"FRO", "EURO", "EU", // Faeroe Islands "FRO", "EURO", "EU", // Faeroe Islands
"FLK", "SOAM", "SA", // Falkland Islands (Malvinas) "FLK", "SOAM", "SA", // Falkland Islands (Malvinas)
"FJI", "SPAC", "OC", // Fiji "FJI", "SPAC", "OC", // Fiji
@ -192,7 +192,7 @@ struct Country Countries[] =
"HUN", "EURO", "EU", // Hungary "HUN", "EURO", "EU", // Hungary
"ISL", "EURO", "EU", // Iceland "ISL", "EURO", "EU", // Iceland
"IND", "INDI", "AS", // India "IND", "INDI", "AS", // India
"IDN", "****", "AS", // Indonesia "IDN", "ASIA", "AS", // Indonesia
"IRN", "MDLE", "AS", // Iran (Islamic Republic of) "IRN", "MDLE", "AS", // Iran (Islamic Republic of)
"IRQ", "MDLE", "AS", // Iraq "IRQ", "MDLE", "AS", // Iraq
"IRL", "EURO", "EU", // Ireland "IRL", "EURO", "EU", // Ireland
@ -200,11 +200,11 @@ struct Country Countries[] =
"ISR", "MDLE", "AS", // Israel "ISR", "MDLE", "AS", // Israel
"ITA", "EURO", "EU", // Italy "ITA", "EURO", "EU", // Italy
"JAM", "CEAM", "NA", // Jamaica "JAM", "CEAM", "NA", // Jamaica
"JPN", "****", "AS", // Japan "JPN", "ASIA", "AS", // Japan
"JEY", "EURO", "EU", // Jersey "JEY", "EURO", "EU", // Jersey
"JOR", "MDLE", "AS", // Jordan "JOR", "MDLE", "AS", // Jordan
"KAZ", "****", "AS", // Kazakhstan "KAZ", "ASIA", "AS", // Kazakhstan
"KEN", "****", "AF", // Kenya "KEN", "CAFR", "AF", // Kenya
"KIR", "EPAC", "OC", // Kiribati "KIR", "EPAC", "OC", // Kiribati
"KWT", "MDLE", "AS", // Kuwait "KWT", "MDLE", "AS", // Kuwait
"KGZ", "ASIA", "AS", // Kyrgyzstan "KGZ", "ASIA", "AS", // Kyrgyzstan
@ -228,25 +228,25 @@ struct Country Countries[] =
"MRT", "NAFR", "AF", // Mauritania "MRT", "NAFR", "AF", // Mauritania
"MUS", "SAFR", "AF", // Mauritius "MUS", "SAFR", "AF", // Mauritius
"MYT", "SAFR", "AF", // Mayotte "MYT", "SAFR", "AF", // Mayotte
"MEX", "****", "NA", // Mexico "MEX", "NOAM", "NA", // Mexico
"FSM", "WPAC", "OC", // Micronesia (Federated States of) "FSM", "WPAC", "OC", // Micronesia (Federated States of)
"MCO", "EURO", "EU", // Monaco "MCO", "EURO", "EU", // Monaco
"MNG", "****", "AS", // Mongolia "MNG", "ASIA", "AS", // Mongolia
"MNE", "EURO", "EU", // Montenegro "MNE", "EURO", "EU", // Montenegro
"MSR", "CARB", "NA", // Montserrat "MSR", "CARB", "NA", // Montserrat
"MAR", "NAFR", "AF", // Morocco "MAR", "NAFR", "AF", // Morocco
"MOZ", "SAFR", "AF", // Mozambique "MOZ", "SAFR", "AF", // Mozambique
"MMR", "ASIA", "AS", // Myanmar "MMR", "ASIA", "AS", // Myanmar
"NAM", "****", "AF", // Namibia "NAM", "SAFR", "AF", // Namibia
"NRU", "WPAC", "OC", // Nauru "NRU", "WPAC", "OC", // Nauru
"NPL", "****", "AS", // Nepal "NPL", "ASIA", "AS", // Nepal
"NLD", "EURO", "EU", // Netherlands "NLD", "EURO", "EU", // Netherlands
"ANT", "CARB", "NA", // Netherlands Antilles "ANT", "CARB", "NA", // Netherlands Antilles
"NCL", "SPAC", "OC", // New Caledonia "NCL", "SPAC", "OC", // New Caledonia
"NZL", "AUNZ", "OC", // New Zealand "NZL", "AUNZ", "OC", // New Zealand
"NIC", "****", "SA", // Nicaragua "NIC", "CEAM", "SA", // Nicaragua
"NER", "NAFR", "AF", // Niger "NER", "NAFR", "AF", // Niger
"NGA", "****", "AF", // Nigeria "NGA", "CAFR", "AF", // Nigeria
"NIU", "SPAC", "OC", // Niue "NIU", "SPAC", "OC", // Niue
"NFK", "SPAC", "OC", // Norfolk Island "NFK", "SPAC", "OC", // Norfolk Island
"MNP", "WPAC", "OC", // Northern Mariana Islands "MNP", "WPAC", "OC", // Northern Mariana Islands
@ -270,7 +270,7 @@ struct Country Countries[] =
"REU", "SAFR", "AF", // Réunion "REU", "SAFR", "AF", // Réunion
"ROU", "EURO", "EU", // Romania "ROU", "EURO", "EU", // Romania
"RUS", "ASIA", "AS", // Russian Federation "RUS", "ASIA", "AS", // Russian Federation
"RWA", "****", "AF", // Rwanda "RWA", "CAFR", "AF", // Rwanda
"BLM", "CARB", "NA", // Saint-Barthélemy "BLM", "CARB", "NA", // Saint-Barthélemy
"SHN", "SOAM", "SA", // Saint Helena "SHN", "SOAM", "SA", // Saint Helena
"KNA", "CARB", "NA", // Saint Kitts and Nevis "KNA", "CARB", "NA", // Saint Kitts and Nevis
@ -285,50 +285,50 @@ struct Country Countries[] =
"SEN", "CAFR", "AF", // Senegal "SEN", "CAFR", "AF", // Senegal
"SRB", "EURO", "EU", // Serbia "SRB", "EURO", "EU", // Serbia
"SYC", "SAFR", "AF", // Seychelles "SYC", "SAFR", "AF", // Seychelles
"SLE", "****", "AF", // Sierra Leone "SLE", "NAFR", "AF", // Sierra Leone
"SGP", "****", "AS", // Singapore "SGP", "ASIA", "AS", // Singapore
"SVK", "EURO", "EU", // Slovakia "SVK", "EURO", "EU", // Slovakia
"SVN", "EURO", "EU", // Slovenia "SVN", "EURO", "EU", // Slovenia
"SLB", "SPAC", "OC", // Solomon Islands "SLB", "SPAC", "OC", // Solomon Islands
"SOM", "****", "AF", // Somalia "SOM", "NAFR", "AF", // Somalia
"ZAF", "SAFR", "AF", // South Africa "ZAF", "SAFR", "AF", // South Africa
"ESP", "EURO", "EU", // Spain "ESP", "EURO", "EU", // Spain
"LKA", "INDE", "AS", // Sri Lanka "LKA", "INDE", "AS", // Sri Lanka
"SDN", "****", "AF", // Sudan "SDN", "NAFR", "AF", // Sudan
"SUR", "SOAM", "SA", // Suriname "SUR", "SOAM", "SA", // Suriname
"SJM", "EURO", "EU", // Svalbard and Jan Mayen Islands "SJM", "EURO", "EU", // Svalbard and Jan Mayen Islands
"SWZ", "****", "AF", // Swaziland "SWZ", "SAFR", "AF", // Swaziland
"SWE", "EURO", "EU", // Sweden "SWE", "EURO", "EU", // Sweden
"CHE", "EURO", "EU", // Switzerland "CHE", "EURO", "EU", // Switzerland
"SYR", "MDLE", "AS", // Syrian Arab Republic "SYR", "MDLE", "AS", // Syrian Arab Republic
"TJK", "ASIA", "AS", // Tajikistan "TJK", "ASIA", "AS", // Tajikistan
"THA", "****", "AS", // Thailand "THA", "ASIA", "AS", // Thailand
"MKD", "EURO", "EU", // The former Yugoslav Republic of Macedonia "MKD", "EURO", "EU", // The former Yugoslav Republic of Macedonia
"TLS", "ASIA", "AS", // Timor-Leste "TLS", "ASIA", "AS", // Timor-Leste
"TGO", "CAFR", "AF", // Togo "TGO", "CAFR", "AF", // Togo
"TKL", "AUNZ", "OC", // Tokelau "TKL", "AUNZ", "OC", // Tokelau
"TON", "SPAC", "OC", // Tonga "TON", "SPAC", "OC", // Tonga
"TTO", "CARB", "NA", // Trinidad and Tobago "TTO", "CARB", "NA", // Trinidad and Tobago
"TUN", "****", "AF", // Tunisia "TUN", "NAFR", "AF", // Tunisia
"TUR", "EURO", "EU", // Turkey "TUR", "EURO", "EU", // Turkey
"TKM", "****", "AS", // Turkmenistan "TKM", "ASIA", "AS", // Turkmenistan
"TCA", "CARB", "NA", // Turks and Caicos Islands "TCA", "CARB", "NA", // Turks and Caicos Islands
"TUV", "SPAC", "OC", // Tuvalu "TUV", "SPAC", "OC", // Tuvalu
"UGA", "****", "AF", // Uganda "UGA", "SAFR", "AF", // Uganda
"UKR", "EURO", "EU", // Ukraine "UKR", "EURO", "EU", // Ukraine
"ARE", "MDLE", "AS", // United Arab Emirates "ARE", "MDLE", "AS", // United Arab Emirates
"GBR", "EURO", "EU", // United Kingdom of Great Britain and Northern Ireland "GBR", "EURO", "EU", // United Kingdom of Great Britain and Northern Ireland
"TZA", "****", "AF", // United Republic of Tanzania "TZA", "SAFR", "AF", // United Republic of Tanzania
"USA", "NOAM", "NA", // United States of America "USA", "NOAM", "NA", // United States of America
"VIR", "CARB", "NA", // United States Virgin Islands "VIR", "CARB", "NA", // United States Virgin Islands
"URY", "SOAM", "SA", // Uruguay "URY", "SOAM", "SA", // Uruguay
"UZB", "ASIA", "AS", // Uzbekistan "UZB", "ASIA", "AS", // Uzbekistan
"VUT", "SPAC", "OC", // Vanuatu "VUT", "SPAC", "OC", // Vanuatu
"VEN", "SOAM", "SA", // Venezuela (Bolivarian Republic of) "VEN", "SOAM", "SA", // Venezuela (Bolivarian Republic of)
"VNM", "****", "AS", // Viet Nam "VNM", "ASIA", "AS", // Viet Nam
"WLF", "SPAC", "OC", // Wallis and Futuna Islands "WLF", "SPAC", "OC", // Wallis and Futuna Islands
"ESH", "****", "AF", // Western Sahara "ESH", "CAFR", "AF", // Western Sahara
"YEM", "****", "AF", // Yemen "YEM", "NAFR", "AF", // Yemen
"ZMB", "SAFR", "AF", // Zambia "ZMB", "SAFR", "AF", // Zambia
"ZWE", "SAFR", "AF" // Zimbabwe "ZWE", "SAFR", "AF" // Zimbabwe
}; };
@ -435,7 +435,8 @@ VOID SetupMyHA()
if (MyElements[1]) if (MyElements[1])
{ {
#ifdef TWOCHARCONT if (FOURCHARCONT == 0)
{
if (strlen(MyElements[1]) == 4) if (strlen(MyElements[1]) == 4)
{ {
// Convert to 2 char Continent; // Convert to 2 char Continent;
@ -446,7 +447,9 @@ VOID SetupMyHA()
MyElements[1] = _strdup(Continent->TwoCharCode); MyElements[1] = _strdup(Continent->TwoCharCode);
} }
} }
#else }
else
{
if (strlen(MyElements[1]) == 2) if (strlen(MyElements[1]) == 2)
{ {
// Convert to 4 char Continent; // Convert to 4 char Continent;
@ -457,7 +460,7 @@ VOID SetupMyHA()
MyElements[1] = _strdup(Continent->FourCharCode); MyElements[1] = _strdup(Continent->FourCharCode);
} }
} }
#endif }
} }
} }
@ -579,7 +582,8 @@ VOID SetupHAElements(struct BBSForwardingInfo * ForwardingInfo)
if (ForwardingInfo->BBSHAElements[1]) if (ForwardingInfo->BBSHAElements[1])
{ {
#ifdef TWOCHARCONT if (FOURCHARCONT == 0)
{
if (strlen(ForwardingInfo->BBSHAElements[1]) == 4) if (strlen(ForwardingInfo->BBSHAElements[1]) == 4)
{ {
// Convert to 2 char Continent; // Convert to 2 char Continent;
@ -590,7 +594,9 @@ VOID SetupHAElements(struct BBSForwardingInfo * ForwardingInfo)
ForwardingInfo->BBSHAElements[1] = _strdup(Continent->TwoCharCode); ForwardingInfo->BBSHAElements[1] = _strdup(Continent->TwoCharCode);
} }
} }
#else }
else
{
if (strlen(ForwardingInfo->BBSHAElements[1]) == 2) if (strlen(ForwardingInfo->BBSHAElements[1]) == 2)
{ {
// Convert to 4 char Continent; // Convert to 4 char Continent;
@ -601,8 +607,7 @@ VOID SetupHAElements(struct BBSForwardingInfo * ForwardingInfo)
ForwardingInfo->BBSHAElements[1] = _strdup(Continent->FourCharCode); ForwardingInfo->BBSHAElements[1] = _strdup(Continent->FourCharCode);
} }
} }
#endif }
} }
free(SaveHText); free(SaveHText);
@ -694,7 +699,9 @@ FullHR:
if (ForwardingInfo->HADDRS[Count][1]) if (ForwardingInfo->HADDRS[Count][1])
{ {
#ifdef TWOCHARCONT if (FOURCHARCONT == 0)
{
if (strlen(ForwardingInfo->HADDRS[Count][1]) == 4) if (strlen(ForwardingInfo->HADDRS[Count][1]) == 4)
{ {
// Convert to 2 char Continent; // Convert to 2 char Continent;
@ -705,7 +712,9 @@ FullHR:
ForwardingInfo->HADDRS[Count][1] = _strdup(Continent->TwoCharCode); ForwardingInfo->HADDRS[Count][1] = _strdup(Continent->TwoCharCode);
} }
} }
#else }
else
{
if (strlen(ForwardingInfo->HADDRS[Count][1]) == 2) if (strlen(ForwardingInfo->HADDRS[Count][1]) == 2)
{ {
// Convert to 4 char Continent; // Convert to 4 char Continent;
@ -716,8 +725,7 @@ FullHR:
ForwardingInfo->HADDRS[Count][1] = _strdup(Continent->FourCharCode); ForwardingInfo->HADDRS[Count][1] = _strdup(Continent->FourCharCode);
} }
} }
#endif }
} }
free(SaveHText); free(SaveHText);
HText++; HText++;
@ -781,7 +789,9 @@ VOID SetupHAddresesP(struct BBSForwardingInfo * ForwardingInfo)
if (ForwardingInfo->HADDRSP[Count][1]) if (ForwardingInfo->HADDRSP[Count][1])
{ {
#ifdef TWOCHARCONT if (FOURCHARCONT == 0)
{
if (strlen(ForwardingInfo->HADDRSP[Count][1]) == 4) if (strlen(ForwardingInfo->HADDRSP[Count][1]) == 4)
{ {
// Convert to 2 char Continent; // Convert to 2 char Continent;
@ -792,7 +802,9 @@ VOID SetupHAddresesP(struct BBSForwardingInfo * ForwardingInfo)
ForwardingInfo->HADDRSP[Count][1] = _strdup(Continent->TwoCharCode); ForwardingInfo->HADDRSP[Count][1] = _strdup(Continent->TwoCharCode);
} }
} }
#else }
else
{
if (strlen(ForwardingInfo->HADDRSP[Count][1]) == 2) if (strlen(ForwardingInfo->HADDRSP[Count][1]) == 2)
{ {
// Convert to 4 char Continent; // Convert to 4 char Continent;
@ -803,7 +815,7 @@ VOID SetupHAddresesP(struct BBSForwardingInfo * ForwardingInfo)
ForwardingInfo->HADDRSP[Count][1] = _strdup(Continent->FourCharCode); ForwardingInfo->HADDRSP[Count][1] = _strdup(Continent->FourCharCode);
} }
} }
#endif }
} }
free(SaveHText); free(SaveHText);
HText++; HText++;
@ -1223,11 +1235,11 @@ int MatchMessagetoBBSList(struct MsgInfo * Msg, CIRCUIT * conn)
if (Country) if (Country)
{ {
// Just need to add Continent and WW // Just need to add Continent and WW
#ifdef TWOCHARCONT if (FOURCHARCONT == 0)
sprintf_s(FullRoute, sizeof(FullRoute),"%s.%s.WW", RouteElements, Country->Continent2); sprintf_s(FullRoute, sizeof(FullRoute),"%s.%s.WW", RouteElements, Country->Continent2);
#else else
sprintf_s(FullRoute, sizeof(FullRoute),"%s.%s.WW", RouteElements, Country->Continent4); sprintf_s(FullRoute, sizeof(FullRoute),"%s.%s.WW", RouteElements, Country->Continent4);
#endif
goto FULLHA; goto FULLHA;
} }
@ -1270,7 +1282,8 @@ FULLHA:
if (HElements[1]) if (HElements[1])
{ {
#ifdef TWOCHARCONT if (FOURCHARCONT == 0)
{
if (strlen(HElements[1]) == 4) if (strlen(HElements[1]) == 4)
{ {
// Convert to 2 char Continent; // Convert to 2 char Continent;
@ -1281,7 +1294,9 @@ FULLHA:
HElements[1] = _strdup(Continent->TwoCharCode); HElements[1] = _strdup(Continent->TwoCharCode);
} }
} }
#else }
else
{
if (strlen(HElements[1]) == 2) if (strlen(HElements[1]) == 2)
{ {
// Convert to 4 char Continent; // Convert to 4 char Continent;
@ -1292,7 +1307,7 @@ FULLHA:
HElements[1] = _strdup(Continent->FourCharCode); HElements[1] = _strdup(Continent->FourCharCode);
} }
} }
#endif }
} }
@ -1386,6 +1401,62 @@ NOHA:
goto CheckWildCardedAT; goto CheckWildCardedAT;
} }
// First check P message to multiple destinations
// We should choose the BBS with most matching elements (ie match on #23.GBR better that GBR)
// If SendPtoMultiple is set I think we send to any with same match level
// So if SendPtoMultiple is set I think I need to find the best depth then send to all with the same depth
// If none are found on HA match drop through.
if (SendPtoMultiple && Msg->type == 'P')
{
struct UserInfo * bestbbs = NULL;
int bestmatch = 0;
int depth;
int Matched = 0;
int MultiPDepth = 0;
Count = 0;
Logprintf(LOG_BBS, conn, '?', "SendPtoMultiple is set. Checking for best match level");
for (bbs = BBSChain; bbs; bbs = bbs->BBSNext)
{
ForwardingInfo = bbs->ForwardingInfo;
depth = CheckBBSHElements(Msg, bbs, ForwardingInfo, ATBBS, &HElements[0]);
if (depth)
{
if (depth > MultiPDepth)
{
MultiPDepth = depth;
bestbbs = bbs;
}
}
}
if (MultiPDepth)
{
for (bbs = BBSChain; bbs; bbs = bbs->BBSNext)
{
ForwardingInfo = bbs->ForwardingInfo;
depth = CheckBBSHElements(Msg, bbs, ForwardingInfo, ATBBS, &HElements[0]);
if (depth == MultiPDepth)
{
Logprintf(LOG_BBS, conn, '?', "Routing Trace HR Matches BBS %s Depth %d", bbs->Call, depth);
CheckAndSend(Msg, conn, bbs);
Count++;
}
}
return Count;
}
else
Logprintf(LOG_BBS, conn, '?', "SendPtoMultiple is set but no match on HA");
}
if (Msg->type == 'P' || Flood == 0) if (Msg->type == 'P' || Flood == 0)
{ {
@ -1467,50 +1538,7 @@ NOHA:
return 1; return 1;
} }
// We should choose the BBS with most matching elements (ie match on #23.GBR better that GBR) // Normal HA match (not SendPToMultiple)
// If SendPtoMultiple is set I think we send to any with same match level
// So if SendPtoMultiple is set I think I need to find the best depth then send to all with the same depth
if (SendPtoMultiple && Msg->type == 'P')
{
Logprintf(LOG_BBS, conn, '?', "SendPtoMultiple is set. Checking for best match level");
for (bbs = BBSChain; bbs; bbs = bbs->BBSNext)
{
ForwardingInfo = bbs->ForwardingInfo;
depth = CheckBBSHElements(Msg, bbs, ForwardingInfo, ATBBS, &HElements[0]);
if (depth)
{
if (depth > MultiPDepth)
{
MultiPDepth = depth;
bestbbs = bbs;
}
}
if (MultiPDepth)
{
for (bbs = BBSChain; bbs; bbs = bbs->BBSNext)
{
ForwardingInfo = bbs->ForwardingInfo;
depth = CheckBBSHElements(Msg, bbs, ForwardingInfo, ATBBS, &HElements[0]);
if (depth == MultiPDepth)
{
Logprintf(LOG_BBS, conn, '?', "Routing Trace HR Matches BBS %s Depth %d", bbs->Call, depth);
CheckAndSend(Msg, conn, bbs);
}
}
return 1;
}
}
}
for (bbs = BBSChain; bbs; bbs = bbs->BBSNext) for (bbs = BBSChain; bbs; bbs = bbs->BBSNext)
{ {

4
Versions.h
View File

@ -10,8 +10,8 @@
#endif #endif
#define KVers 6,0,24,38 #define KVers 6,0,24,40
#define KVerstring "6.0.24.38\0" #define KVerstring "6.0.24.40\0"
#ifdef CKernel #ifdef CKernel

65
WinRPRHelper.vcproj.NOTTSDESKTOP.John.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
WinmorControl.vcproj.LAPTOP-Q6S4RP5Q.johnw.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="LAPTOP-Q6S4RP5Q"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="LAPTOP-Q6S4RP5Q"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
WinmorControl.vcproj.NOTTSDESKTOP.John.user
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

2
bpqmail.h
View File

@ -43,7 +43,7 @@
#define NEWROUTING #define NEWROUTING
extern int FOURCHARCONT;
// Standard __except handler for try/except // Standard __except handler for try/except

16
templatedefs.c
View File

@ -101,7 +101,7 @@ char * FwdPagetxt()
"{" "{"
"position: absolute;" "position: absolute;"
"width:290px;" "width:290px;"
"height:510px;" "height:550px;"
"border:0px solid;" "border:0px solid;"
"overflow: auto;" "overflow: auto;"
"}" "}"
@ -109,7 +109,7 @@ char * FwdPagetxt()
"{" "{"
"position: absolute;" "position: absolute;"
"width:180px;" "width:180px;"
"height:500px;" "height:540px;"
"border:2px solid;" "border:2px solid;"
"overflow: auto;" "overflow: auto;"
"}" "}"
@ -118,7 +118,7 @@ char * FwdPagetxt()
"position: absolute;" "position: absolute;"
"width:95px;" "width:95px;"
"left:190px;" "left:190px;"
"height:500px;" "height:540px;"
"border:2px solid;" "border:2px solid;"
"overflow: auto;" "overflow: auto;"
"}" "}"
@ -255,6 +255,7 @@ char * FwdPagetxt()
" <td><a href=\"/Mail/Wel?%s\">Welcome Msgs &amp; Prompts</a></td>" " <td><a href=\"/Mail/Wel?%s\">Welcome Msgs &amp; Prompts</a></td>"
" <td><a href=\"/Mail/HK?%s\">Housekeeping</a></td>" " <td><a href=\"/Mail/HK?%s\">Housekeeping</a></td>"
" <td><a href=\"/Mail/WP?%s\">WP Update</a></td>" " <td><a href=\"/Mail/WP?%s\">WP Update</a></td>"
"<td><a href=/Webmail>WebMail</a></td>"
" <td><a href=\"/\">Node Menu</a></td>" " <td><a href=\"/\">Node Menu</a></td>"
" </tr>" " </tr>"
" </tbody>" " </tbody>"
@ -279,7 +280,8 @@ char * FwdPagetxt()
" <br />" " <br />"
"Send P Msgs to more than one BBS&nbsp;<input %sname=SendPtoMultiple type=checkbox /><br />" "Send P Msgs to more than one BBS&nbsp;<input %sname=SendPtoMultiple type=checkbox /><br />"
" <br />" " <br />"
"Use 4 Char Continent Codes&nbsp;<input %sname=FourCharCont type=checkbox /><br />"
" <br />"
"Aliases<br />" "Aliases<br />"
" <br />" " <br />"
" <textarea rows=8 cols=12 name=Aliases>%s</textarea><br><br>" " <textarea rows=8 cols=12 name=Aliases>%s</textarea><br><br>"
@ -400,6 +402,7 @@ char * WebMailPagetxt()
"<td><a href=/WebMail/WMAuto?%s>Auto Refresh</a></td>\r\n" "<td><a href=/WebMail/WMAuto?%s>Auto Refresh</a></td>\r\n"
"<td><a href=\"#\" onclick=\"newmsg('%s'); return false;\">Send Message</a></td>\r\n" "<td><a href=\"#\" onclick=\"newmsg('%s'); return false;\">Send Message</a></td>\r\n"
"<td><a href=/WebMail/WMLogout?%s>Logout</a></td>\r\n" "<td><a href=/WebMail/WMLogout?%s>Logout</a></td>\r\n"
"<td><a href=/Mail/Header>Mail Mgmt</a></td>\r\n"
"<td><a href=/>Node Menu</a></td></tr></table>\r\n" "<td><a href=/>Node Menu</a></td></tr></table>\r\n"
"<br>\r\n" "<br>\r\n"
"<div align=left id=\"main\" style=\"overflow:scroll;\">\r\n" "<div align=left id=\"main\" style=\"overflow:scroll;\">\r\n"
@ -452,6 +455,7 @@ char * MainConfigtxt()
" <td><a href=\"/Mail/Wel?%s\">Welcome Msgs &amp; Prompts</a></td>\r\n" " <td><a href=\"/Mail/Wel?%s\">Welcome Msgs &amp; Prompts</a></td>\r\n"
" <td><a href=\"/Mail/HK?%s\">Housekeeping</a></td>\r\n" " <td><a href=\"/Mail/HK?%s\">Housekeeping</a></td>\r\n"
" <td><a href=\"/Mail/WP?%s\">WP Update</a></td>\r\n" " <td><a href=\"/Mail/WP?%s\">WP Update</a></td>\r\n"
"<td><a href=/Webmail>WebMail</a></td>"
" <td><a href=\"/\">Node Menu</a></td>\r\n" " <td><a href=\"/\">Node Menu</a></td>\r\n"
"</tr></table>\r\n" "</tr></table>\r\n"
"<br>\r\n" "<br>\r\n"
@ -701,6 +705,7 @@ char * MsgPagetxt()
" <td><a href=\"/Mail/Wel?%s\">Welcome Msgs &amp; Prompts</a></td>\r\n" " <td><a href=\"/Mail/Wel?%s\">Welcome Msgs &amp; Prompts</a></td>\r\n"
" <td><a href=\"/Mail/HK?%s\">Housekeeping</a></td>\r\n" " <td><a href=\"/Mail/HK?%s\">Housekeeping</a></td>\r\n"
" <td><a href=\"/Mail/WP?%s\">WP Update</a></td>\r\n" " <td><a href=\"/Mail/WP?%s\">WP Update</a></td>\r\n"
"<td><a href=/Webmail>WebMail</a></td>"
" <td><a href=\"/\">Node Menu</a></td>\r\n" " <td><a href=\"/\">Node Menu</a></td>\r\n"
" </tr>\r\n" " </tr>\r\n"
" </tbody>\r\n" " </tbody>\r\n"
@ -1060,6 +1065,7 @@ char * UserPagetxt()
"<td><a href=/Mail/Wel?%s>Welcome Msgs & Prompts</a></td>\r\n" "<td><a href=/Mail/Wel?%s>Welcome Msgs & Prompts</a></td>\r\n"
"<td><a href=/Mail/HK?%s>Housekeeping</a></td>\r\n" "<td><a href=/Mail/HK?%s>Housekeeping</a></td>\r\n"
"<td><a href=/Mail/WP?%s>WP Update</a></td>\r\n" "<td><a href=/Mail/WP?%s>WP Update</a></td>\r\n"
"<td><a href=/Webmail>WebMail</a></td>"
"<td><a href=/>Node Menu</a></td></tr></table>\r\n" "<td><a href=/>Node Menu</a></td></tr></table>\r\n"
"<br>\r\n" "<br>\r\n"
"<div id=\"outer\">\r\n" "<div id=\"outer\">\r\n"
@ -1116,6 +1122,7 @@ char * Housekeepingtxt()
"<td><a href=/Mail/Wel?%s>Welcome Msgs & Prompts</a></td>\r\n" "<td><a href=/Mail/Wel?%s>Welcome Msgs & Prompts</a></td>\r\n"
"<td><a href=/Mail/HK?%s>Housekeeping</a></td>\r\n" "<td><a href=/Mail/HK?%s>Housekeeping</a></td>\r\n"
"<td><a href=/Mail/WP?%s>WP Update</a></td>\r\n" "<td><a href=/Mail/WP?%s>WP Update</a></td>\r\n"
"<td><a href=/Webmail>WebMail</a></td>"
"<td><a href=/>Node Menu</a></td></tr></table>\r\n" "<td><a href=/>Node Menu</a></td></tr></table>\r\n"
"<br>\r\n" "<br>\r\n"
"<div style=\"text-align: center;\"><font size=\"+1\"><span style=\"font-family: monospace; font-weight: bold;\">Housekeeping</span></font></div>\r\n" "<div style=\"text-align: center;\"><font size=\"+1\"><span style=\"font-family: monospace; font-weight: bold;\">Housekeeping</span></font></div>\r\n"
@ -1364,6 +1371,7 @@ char * WPtxt()
" <td><a href=\"/Mail/Wel?%s\">Welcome Msgs &amp; Prompts</a></td>\r\n" " <td><a href=\"/Mail/Wel?%s\">Welcome Msgs &amp; Prompts</a></td>\r\n"
" <td><a href=\"/Mail/HK?%s\">Housekeeping</a></td>\r\n" " <td><a href=\"/Mail/HK?%s\">Housekeeping</a></td>\r\n"
" <td><a href=\"/Mail/WP?%s\">WP Update</a></td>\r\n" " <td><a href=\"/Mail/WP?%s\">WP Update</a></td>\r\n"
"<td><a href=/Webmail>WebMail</a></td>"
" <td><a href=\"/\">Node Menu</a></td>\r\n" " <td><a href=\"/\">Node Menu</a></td>\r\n"
" </tr>\r\n" " </tr>\r\n"
" </tbody>\r\n" " </tbody>\r\n"