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

Merge branch 'debian/latest' into raspbian/bullseye

This commit is contained in:
Hibby 2024-09-25 01:40:19 +01:00
parent 21e3dccbac b18a579b0c
commit f99a7cf031
Signed by: hibby
SSH Key Fingerprint: SHA256:Y6XbnzN0FEB1R/exPF5hUbHUgE/Nn7M1uT566fxo6pE
47 changed files with 3638 additions and 5634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2129
6pack.c Normal file
View File

File diff suppressed because it is too large Load Diff

12
ARDOP.c
View File

@ -880,6 +880,17 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
} }
} }
// Check ATTACH time limit
if (STREAM->Attached)
{
if (STREAM->AttachTime && TNC->AttachTimeLimit && time(NULL) > (TNC->AttachTimeLimit + STREAM->AttachTime))
{
STREAM->ReportDISC = 1;
STREAM->AttachTime = 0;
}
}
if (TNC->ARDOPCommsMode != 'T') // S I or E if (TNC->ARDOPCommsMode != 'T') // S I or E
{ {
ARDOPSCSCheckRX(TNC); ARDOPSCSCheckRX(TNC);
@ -1190,6 +1201,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
Debugprintf("ARDOP New Attach Stream %d DEDStream %d", Stream, STREAM->DEDStream); Debugprintf("ARDOP New Attach Stream %d DEDStream %d", Stream, STREAM->DEDStream);
STREAM->Attached = TRUE; STREAM->Attached = TRUE;
STREAM->AttachTime = time(NULL);
calllen = ConvFromAX25(TNC->PortRecord->ATTACHEDSESSIONS[Stream]->L4USER, TNC->Streams[Stream].MyCall); calllen = ConvFromAX25(TNC->PortRecord->ATTACHEDSESSIONS[Stream]->L4USER, TNC->Streams[Stream].MyCall);
TNC->Streams[Stream].MyCall[calllen] = 0; TNC->Streams[Stream].MyCall[calllen] = 0;

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);
} }

473
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);
@ -11742,303 +11762,258 @@ BOOL CheckforMIME(SocketConn * sockptr, char * Msg, char ** Body, int * MsgLen);
#include <sys/wait.h> #include <sys/wait.h>
#include <signal.h> #include <signal.h>
typedef struct _POPENRET // G8BPQ Version of Steve G7TAJ's code
{
FILE * fp;
pid_t pid;
} POPENRET;
/* int pgret = 9999;
* Check if the PG is still running after 5 sec int pindex = 0;
* if so, kill it
void sigchild_handler(int sig , siginfo_t * siginfo, void * ucontext)
{
/* • SIGCHLD fills in si_pid, si_uid, si_status, si_utime, and
si_stime, providing information about the child. The si_pid
field is the process ID of the child; si_uid is the child's
real user ID. The si_status field contains the exit status of
the child (if si_code is CLD_EXITED), or the signal number
that caused the process to change state.
*/ */
void run_pgTimeoutThread( pid_t process ) // printf("SIGCHLD PID %d Code %d status %d\n", siginfo->si_pid, siginfo->si_code, siginfo->si_status);
{ pgret = siginfo->si_status;
printf("watchdog thread: PID of subprocess: %d\n", process);
fflush(stdout);
Sleep(5000);
// if still running PID (?) then kill.
if ( getpgid(process) >= 0 )
{
Debugprintf("watchdog thread: Still running, so killing %d ... ", process);
if ( kill( -process, SIGKILL ) == 0 )
Debugprintf("Killed PG watchdog Process %d", process);
else
Debugprintf("Failed to kill PG watchdog Process %d", process);
} }
Debugprintf("watchdog thread: PID=%d Exit", process); void run_pg(CIRCUIT * conn, struct UserInfo * user)
fflush(stdout);
//return;
}
//https://sources.debian.org/src/cron/3.0pl1-45/popen.c/
POPENRET my_popen(char *program, char *type, CIRCUIT *conn)
{ {
register char *cp; register char *cp;
FILE *iop; FILE *iop;
int argc, pdes[2]; int argc, pdes[2];
pid_t pid; pid_t pid;
POPENRET PRET;
if (*type != 'r' && *type != 'w' || type[1]) pgret = 9999;
return(PRET);
if (pipe(pdes) < 0) int index = user->Temp->PG_INDEX;
return(PRET);
iop = NULL; iop = NULL;
switch(pid = fork()) {
conn->InputBuffer[conn->InputLen] = 0;
strlop(conn->InputBuffer, 13);
conn->InputLen = 0;
if (!user->Temp->RUNPGPARAMS)
user->Temp->RUNPGPARAMS = (RUNPGARGS_PTR) zalloc(sizeof(RUNPGARGS));
user->Temp->RUNPGPARAMS->user = user;
user->Temp->RUNPGPARAMS->conn = conn;
strncpy(user->Temp->RUNPGPARAMS->InputBuffer, conn->InputBuffer, 80); // needs to be length of actual input!
user->Temp->RUNPGPARAMS->Len = conn->InputLen;
if (conn == 0 || user == 0)
{
Debugprintf("run_pg conn or user null");
return;
}
// Build command line. Parmas are:
// - Callsign (format as F6FBB-8).
// - Level number (0 is the first time, up to 99).
// - Flags of the user (binary number as user`s mask of INIT.SRV).
// - Record number of the user in INF.SYS.
// - Received data (each word is a new argument).
// BPQ doesn't support params 3 and 4 (but may supply copy of user record later)
char cmd[20];
char *ptr = cmd;
char pg_dir[MAX_PATH];
char log_file[50] = "pg.log";
char call[10];
char data[80];
char line[80];
size_t bufsize = 80;
strcpy(pg_dir, BaseDir);
strcat(pg_dir, "/PG/");
sprintf(cmd, "./%s", SERVERLIST[user->Temp->PG_SERVER][1] );
sprintf(line, "%s%s", pg_dir, SERVERLIST[user->Temp->PG_SERVER][1]);
// printf("PG Prog %s%s\n", pg_dir, SERVERLIST[user->Temp->PG_SERVER][1]);
// check file exists and is executable
if (access(line, F_OK) == -1 || access(line, X_OK) == -1)
{
Debugprintf("%s FileNotFound || not executable", line);
BBSputs(conn, "Error running PG Server\r");
conn->InputMode=0;
SendPrompt(conn, user);
return;
}
strcpy(call, conn->UserPointer->Call);
index = user->Temp->PG_INDEX;
// remove ';' from input for security reasons
ptr = strchr(user->Temp->RUNPGPARAMS->InputBuffer, ';');
if (ptr)
*ptr = '\0';
sprintf(data, "%s %d 0 0 %s", call, index, user->Temp->RUNPGPARAMS->InputBuffer);
// printf("PG Params %s\n", data);
conn->InputBufferLen = 0;
char buf[256];
sprintf (buf, "%s %s", line, data); // buf is command to exec
// printf ("PG exec cmd %s\n", buf);
// Create pipe for reading PG program STDOUT
if (pipe(pdes) < 0)
{
Debugprintf("run_pg pipe failed");
BBSputs(conn, "Error running PG Server (pipe() failed)\r");
conn->InputMode=0;
SendPrompt(conn, user);
return;
}
// We will just fork and execute program. For now don't create a new thread
// Trap sigchild so we can tell when it exits and get return code
struct sigaction act;
memset(&act, 0, sizeof(struct sigaction));
act.sa_flags = SA_RESETHAND | SA_SIGINFO; // Restore default handler when called
act.sa_sigaction = sigchild_handler;
sigaction(SIGCHLD, &act, NULL);
switch(pid = fork())
{
case -1: /* error */ case -1: /* error */
(void)close(pdes[0]); (void)close(pdes[0]);
(void)close(pdes[1]); (void)close(pdes[1]);
return PRET; Debugprintf("run_pg fork failed");
BBSputs(conn, "Error running PG Server (fork() failed)\r");
conn->InputMode=0;
SendPrompt(conn, user);
return;
case 0: /* child */ case 0: /* child */
if (*type == 'r') {
if (pdes[1] != 1) { if (pdes[1] != 1)
{
dup2(pdes[1], 1); dup2(pdes[1], 1);
dup2(pdes[1], 2); dup2(pdes[1], 2);
(void)close(pdes[1]); (void)close(pdes[1]);
} }
(void)close(pdes[0]); (void)close(pdes[0]);
} else {
if (pdes[0] != 0) { setpgid(0, pid);
dup2(pdes[0], 0);
(void)close(pdes[0]); char *args[] = {"sh", "-c", buf, NULL};
}
(void)close(pdes[1]);
}
setpgid(-pid,pid);
char *args[] = {"sh", "-c", program, NULL};
execve("/bin/sh", args, NULL); execve("/bin/sh", args, NULL);
_exit(1); _exit(1);
} }
/* parent */ /* parent */
_beginthread((void (*)(void *))run_pgTimeoutThread, 0, (VOID *) pid ); // printf("child PID %d\n", pid);
if (*type == 'r') { struct timespec duration;
iop = fdopen(pdes[0], type); duration.tv_sec = 5;
(void)close(pdes[1]); duration.tv_nsec = 0;
} else {
iop = fdopen(pdes[1], type); nanosleep(&duration, &duration); // Will be interrupted by SIGCHLD
(void)close(pdes[0]);
// printf("PG retcode %d\n", pgret);
if (pgret == 9999) // Process still running
{
BBSputs(conn, "PG Program Looping\r");
kill(pid, SIGKILL);
user->Temp->PG_INDEX = 0;
conn->InputMode=0;
SendPrompt(conn, user);
return;
} }
if (pgret > 127)
{
// Probably killed by signal
int err = pgret - 128;
char errmsg[256];
sprintf(errmsg, "PG Signal %s received\n", strsignal(err));
BBSputs(conn, errmsg);
user->Temp->PG_INDEX = 0;
conn->InputMode=0;
SendPrompt(conn, user);
return;
}
// Send STDOUT from PG program to BBS user
iop = fdopen(pdes[0], "r");
(void)close(pdes[1]);
char buffer[128]; char buffer[128];
while (fgets(buffer, sizeof(buffer), iop) != NULL) while (fgets(buffer, sizeof(buffer), iop) != NULL)
{ {
BBSputs(conn, buffer); BBSputs(conn, buffer);
buffer[0] = '\0'; buffer[0] = '\0';
} }
PRET.fp = iop;
PRET.pid= pid;
return(PRET); switch (pgret)
}
int
my_pclose( POPENRET pret )
{
register int fdes;
sigset_t omask, mask;
int stat_loc;
pid_t pid;
FILE * iop = pret.fp;
fdes = fileno(iop);
(void)fclose(iop);
sigemptyset(&mask);
sigaddset(&mask, SIGQUIT);
sigaddset(&mask, SIGINT);
sigaddset(&mask, SIGHUP);
sigprocmask(SIG_BLOCK, &mask, &omask);
pid = waitpid(pret.pid, &stat_loc, 0);
sigprocmask(SIG_SETMASK, &omask, NULL);
if (pid == -1 || !WIFEXITED(stat_loc))
return -1;
return stat_loc;
}
int run_server (char **cmd, int nb_cmd, int mode, char *log, char *pgdir, char *data, CIRCUIT * conn)
{
int i;
int ret = 0;
FILE *fp;
POPENRET PRET;
pid_t pid;
char *ptr;
char file[256];
char buf[256];
char dir[256];
char arg[256];
if (mode)
// sprintf (file, " >>%s", log);
// sprintf (file, " | tee -a %s", log);
sprintf(file, "" );
else
sprintf (file, " </dev/null");
if (pgdir)
{
/* remove ';' security reasons */
ptr = strchr(pgdir, ';');
if (ptr)
*ptr = '\0';
sprintf (dir, "cd %s ; ", pgdir);
}
else
*dir = '\0';
*arg = '\0';
if (data)
{
/* remove ';' security reasons */
ptr = strchr(data, ';');
if (ptr)
*ptr = '\0';
sprintf (arg, " %s ", data);
}
for (i = 0; i < nb_cmd; i++)
{
/* remove ';' security reasons */
ptr = strchr(cmd[i], ';');
if (ptr)
*ptr = '\0';
sprintf (buf, "%s%s%s%s", dir, cmd[i], arg, file);
PRET = my_popen (buf, "r", conn);
if (PRET.fp == NULL)
Debugprintf ("Failed to run PG command %s\n", cmd[i] );
ret = my_pclose( PRET );
ret = ret >> 8;
if (verbose) {
Debugprintf ("Debug: command = {%s}\n", buf);
Debugprintf ("Debug: exit code = %d\n", ret);
}
/* fail-safe bypass if executable isn't found (exit code 127) (was ret ==127)*/
if (ret > 5) // should never be more than 5
ret = 0;
}
return ( ret );
}
void run_pg( CIRCUIT * conn, struct UserInfo * user )
{
if (!user->Temp->RUNPGPARAMS) {
user->Temp->RUNPGPARAMS = (RUNPGARGS_PTR) zalloc(sizeof(RUNPGARGS));
}
user->Temp->RUNPGPARAMS->user = user;
user->Temp->RUNPGPARAMS->conn = conn;
strncpy(user->Temp->RUNPGPARAMS->InputBuffer, conn->InputBuffer, 80); // needs to be length of actual input!
user->Temp->RUNPGPARAMS->Len = conn->InputLen;
if ( conn == 0 || user == 0 ) {
Debugprintf("run_pg null err");
return;
}
_beginthread((void (*)(void *))startrun_pgThread, 0, user->Temp->RUNPGPARAMS );
return;
}
void startrun_pgThread( RUNPGARGS_PTR Args ) {
CIRCUIT * conn = Args->conn;
struct UserInfo * user = Args->user;
char cmd[20];
sprintf( cmd, "./%s", SERVERLIST[user->Temp->PG_SERVER][1] );
char *ptr = cmd;
char pg_dir[MAX_PATH];
char log_file[50] = "pg.log";
char call[6];
char data[80];
char line[80];
char *line_ptr = line;
int index;
char *data_ptr = data;
size_t bufsize = 80;
strcpy(pg_dir, BaseDir);
strcat(pg_dir, "/PG/");
sprintf(line, "%s%s", pg_dir, SERVERLIST[user->Temp->PG_SERVER][1]);
// check file exists and is executable
if (access(line, F_OK) == -1 || access(line, X_OK) == -1) {
Debugprintf("%s FileNotFound || Not EXE", line);
BBSputs(conn, "Error running PG Server\r");
conn->InputMode=0;
SendPrompt(conn, user);
return;
}
strcpy( call, conn->UserPointer->Call);
// sprintf( log_file, "%s-%d.log", call, conn);
index = user->Temp->PG_INDEX;
line[0] = '\0';
int Len = Args->Len;
UCHAR * Msg = Args->InputBuffer;
strncpy( line, Msg, Len);
line[ Len - 1 ] = 0; //remove LF
sprintf( data, "%s %d 0 0 %s", call, index, line);
// clear the input queue
conn->InputLen = 0;
conn->InputBufferLen = 0;
int ret = run_server (&ptr, 1, 1, log_file, pg_dir, data_ptr, conn);
switch (ret)
{ {
case -1: // ERROR or forced closed case -1: // ERROR or forced closed
case 0: index=0; // Goodbye/Exit case 0:
index=0; // Goodbye/Exit
conn->InputMode=0; conn->InputMode=0;
SendPrompt(conn, user); SendPrompt(conn, user);
break; break;
case 1: index++; // inc & keep in PG case 1:
index++; // inc & keep in PG
break; break;
case 2: index=0; // disconnect
case 2:
index=0; // disconnect
conn->InputMode=0; conn->InputMode=0;
Disconnect(conn->BPQStream); Disconnect(conn->BPQStream);
break; break;
case 3: Debugprintf("data->BBS & end");
break; case 3:
case 4: Debugprintf("data->BBS and inc %d", index++); Debugprintf("data->BBS & end");
break;
case 5: Debugprintf("call no inc %d", ret);
break; break;
case 4:
Debugprintf("data->BBS and inc %d", pindex++);
break;
case 5:
Debugprintf("call no inc %d", pgret);
break;
default:
BBSputs(conn, "PG unexexpected response\r");
user->Temp->PG_INDEX = 0;
conn->InputMode=0;
SendPrompt(conn, user);
return;
} }
user->Temp->PG_INDEX = index; user->Temp->PG_INDEX = index;
// printf("runpg return index = %d\n", index);
} }
/*---- G7TAJ END ----- */ /*---- G7TAJ END ----- */
#else #else
@ -12059,7 +12034,7 @@ void ReadFromPipe(void);
void run_pg( CIRCUIT * conn, struct UserInfo * user ) void run_pg( CIRCUIT * conn, struct UserInfo * user )
{ {
// Run PG program, rend anything from program's stdout to the user // Run PG program, read anything from program's stdout to the user
int retcode = -1; int retcode = -1;
SECURITY_ATTRIBUTES saAttr; SECURITY_ATTRIBUTES saAttr;
@ -12234,7 +12209,7 @@ void run_pg( CIRCUIT * conn, struct UserInfo * user )
case 4: case 4:
// Send Output to BBS - was down above // Send Output to BBS - was done above
break; break;
case 5: case 5:
@ -12638,7 +12613,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 +15731,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 +15761,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.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.

8
BPQMail.c
View File

@ -1133,6 +1133,11 @@
// 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)
// Rewrite PG server code on Lunux (41)
#include "bpqmail.h" #include "bpqmail.h"
#include "winstdint.h" #include "winstdint.h"
@ -1150,6 +1155,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 +1930,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

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

10
Bpq32.c
View File

@ -1217,6 +1217,12 @@ 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)
// Change default of SECURETELNET to 1 (41)
// Add optional ATTACH time limit for ARDOP (42)
// Fix buffer overflow risk in HTTP Terminal(42)
#define CKernel #define CKernel
@ -1310,6 +1316,7 @@ void * KISSHFExtInit(EXTPORTDATA * PortEntry);
void * WinRPRExtInit(EXTPORTDATA * PortEntry); void * WinRPRExtInit(EXTPORTDATA * PortEntry);
void * HSMODEMExtInit(EXTPORTDATA * PortEntry); void * HSMODEMExtInit(EXTPORTDATA * PortEntry);
void * FreeDataExtInit(EXTPORTDATA * PortEntry); void * FreeDataExtInit(EXTPORTDATA * PortEntry);
void * SIXPACKExtInit(EXTPORTDATA * PortEntry);
extern char * ConfigBuffer; // Config Area extern char * ConfigBuffer; // Config Area
VOID REMOVENODE(dest_list * DEST); VOID REMOVENODE(dest_list * DEST);
@ -3947,6 +3954,9 @@ VOID * InitializeExtDriver(PEXTPORTDATA PORTVEC)
if (strstr(Value, "FREEDATA")) if (strstr(Value, "FREEDATA"))
return FreeDataExtInit; return FreeDataExtInit;
if (strstr(Value, "6PACK"))
return SIXPACKExtInit;
ExtDriver = LoadLibrary(Value); ExtDriver = LoadLibrary(Value);
if (ExtDriver == NULL) if (ExtDriver == NULL)

6
CBPQ32.vcproj
View File

@ -57,7 +57,7 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
AssemblerOutput="2" AssemblerOutput="2"
AssemblerListingLocation="c:\devprogs\bpq32\listings\debug\" AssemblerListingLocation="c:\devprogs\bpq32\listings\debug\"
BrowseInformation="0" BrowseInformation="1"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="4" DebugInformationFormat="4"
@ -234,6 +234,10 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File
RelativePath=".\6pack.c"
>
</File>
<File <File
RelativePath="..\CommonSource\adif.c" RelativePath="..\CommonSource\adif.c"
> >

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

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

@ -37,7 +37,7 @@
Name="Release|Win32" Name="Release|Win32"
> >
<DebugSettings <DebugSettings
Command="C:\DevProgs\BPQ32\bpq32.exe" Command=""
WorkingDirectory="" WorkingDirectory=""
CommandArguments="" CommandArguments=""
Attach="false" Attach="false"

16
CommonCode.c
View File

@ -4859,7 +4859,6 @@ DllExport uint64_t APIENTRY GetPortFrequency(int PortNo, char * FreqString)
struct TNCINFO * TNC; struct TNCINFO * TNC;
struct RIGINFO * RIG = 0; struct RIGINFO * RIG = 0;
int RigPort;
if (PORT->RIGPort) if (PORT->RIGPort)
TNC = TNCInfo[PORT->RIGPort]; TNC = TNCInfo[PORT->RIGPort];
@ -5089,6 +5088,8 @@ void BuildPortMH(char * MHJSON, struct PORTCONTROL * PORT)
int len; int len;
char * ptr; char * ptr;
char mhstr[400]; char mhstr[400];
int i;
char c;
if (MH == NULL) if (MH == NULL)
return; return;
@ -5110,7 +5111,16 @@ void BuildPortMH(char * MHJSON, struct PORTCONTROL * PORT)
continue; continue;
} }
Normcall[len++] = 0; // validate call to prevent corruption of json
for (i=0; i < len; i++)
{
c = Normcall[i];
if (!isalnum(c) && !(c == '#') && !(c == ' ') && !(c == '-'))
goto skipit;
}
//format TIME //format TIME
@ -5123,7 +5133,7 @@ void BuildPortMH(char * MHJSON, struct PORTCONTROL * PORT)
Normcall, PORT->PORTNUMBER, MH->MHCOUNT, MHTIME); Normcall, PORT->PORTNUMBER, MH->MHCOUNT, MHTIME);
strcat( MHJSON, mhstr ); strcat( MHJSON, mhstr );
skipit:
MH++; MH++;
} }
} }

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>

2
HFCommon.c
View File

@ -1876,6 +1876,8 @@ int standardParams(struct TNCINFO * TNC, char * buf)
TNC->WL2K = DecodeWL2KReportLine(buf); TNC->WL2K = DecodeWL2KReportLine(buf);
else if (_memicmp(buf, "SESSIONTIMELIMIT", 16) == 0) else if (_memicmp(buf, "SESSIONTIMELIMIT", 16) == 0)
TNC->SessionTimeLimit = TNC->DefaultSessionTimeLimit = atoi(&buf[17]) * 60; TNC->SessionTimeLimit = TNC->DefaultSessionTimeLimit = atoi(&buf[17]) * 60;
else if (_memicmp(buf, "ATTACHTIMELIMIT", 15) == 0)
TNC->AttachTimeLimit = atoi(&buf[16]) * 60;
else if (_memicmp(buf, "BUSYHOLD", 8) == 0) // Hold Time for Busy Detect else if (_memicmp(buf, "BUSYHOLD", 8) == 0) // Hold Time for Busy Detect
TNC->BusyHold = atoi(&buf[8]); TNC->BusyHold = atoi(&buf[8]);
else if (_memicmp(buf, "BUSYWAIT", 8) == 0) // Wait time before failing connect if busy else if (_memicmp(buf, "BUSYWAIT", 8) == 0) // Wait time before failing connect if busy

17
HTTPcode.c
View File

@ -600,6 +600,7 @@ VOID HTTPTimer()
for (n = Last;;) for (n = Last;;)
{ {
if ((strlen(Session->ScreenLines[n]) + strlen(_REPLYBUFFER)) < 99999)
strcat(_REPLYBUFFER, Session->ScreenLines[n]); strcat(_REPLYBUFFER, Session->ScreenLines[n]);
if (n == 99) if (n == 99)
@ -680,13 +681,15 @@ struct HTTPConnectionInfo * FindSession(char * Key)
void ProcessTermInput(SOCKET sock, char * MsgPtr, int MsgLen, char * Key) void ProcessTermInput(SOCKET sock, char * MsgPtr, int MsgLen, char * Key)
{ {
char _REPLYBUFFER[1024]; char _REPLYBUFFER[2048];
int ReplyLen; int ReplyLen;
char Header[256]; char Header[256];
int HeaderLen; int HeaderLen;
int State; int State;
struct HTTPConnectionInfo * Session = FindSession(Key); struct HTTPConnectionInfo * Session = FindSession(Key);
int Stream; int Stream;
int maxlen = 1000;
if (Session == NULL) if (Session == NULL)
{ {
@ -701,12 +704,24 @@ void ProcessTermInput(SOCKET sock, char * MsgPtr, int MsgLen, char * Key)
char c; char c;
UCHAR hex; UCHAR hex;
int msglen = end - input;
struct TNCINFO * TNC = Session->TNC; struct TNCINFO * TNC = Session->TNC;
struct TCPINFO * TCP = 0; struct TCPINFO * TCP = 0;
if (TNC) if (TNC)
TCP = TNC->TCPInfo; TCP = TNC->TCPInfo;
if (TCP && TCP->WebTermCSS)
maxlen -= strlen(TCP->WebTermCSS);
if (MsgLen > maxlen)
{
Session->KillTimer = 99999; // close session
return;
}
if (TCP && TCP->WebTermCSS) if (TCP && TCP->WebTermCSS)
ReplyLen = sprintf(_REPLYBUFFER, InputLine, Key, TCP->WebTermCSS); ReplyLen = sprintf(_REPLYBUFFER, InputLine, Key, TCP->WebTermCSS);
else else

5
LinBPQ.c
View File

@ -1229,10 +1229,7 @@ int main(int argc, char * argv[])
strcpy(pgm, "LINBPQ"); strcpy(pgm, "LINBPQ");
Debugprintf("POP3 Debug Before Init TCP Timer = %d", POP3Timer);
InitialiseTCP(); InitialiseTCP();
Debugprintf("POP3 Debug Before Init NNTP Timer = %d", POP3Timer);
InitialiseNNTP(); InitialiseNNTP();
SetupListenSet(); // Master set of listening sockets SetupListenSet(); // Master set of listening sockets
@ -1286,8 +1283,6 @@ int main(int argc, char * argv[])
} }
} }
Debugprintf("POP3 Debug After Mail Init Timer = %d", POP3Timer);
if (NUMBEROFTNCPORTS) if (NUMBEROFTNCPORTS)
InitializeTNCEmulator(); InitializeTNCEmulator();

0
MHSave.txt Normal file
View File

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

7
Moncode.c
View File

@ -196,6 +196,9 @@ KC6OAR*>ID:
Port = msg->PORT; Port = msg->PORT;
if (Port == 40)
Port = Port;
if (Port & 0x80) if (Port & 0x80)
{ {
if ((MTX & 1) == 0) if ((MTX & 1) == 0)
@ -250,11 +253,9 @@ KC6OAR*>ID:
ptr += 7; ptr += 7;
n--; n--;
if (n == 0) if (n < 0)
{
return 0; // Corrupt - no end of address bit return 0; // Corrupt - no end of address bit
} }
}
// Reached End of digis // Reached End of digis

4322
SCSPactor.c.bak
View File

File diff suppressed because it is too large Load Diff

3
SerialPort.c
View File

@ -452,8 +452,7 @@ ok:
if (buffptr == 0) return (0); // No buffers, so ignore if (buffptr == 0) return (0); // No buffers, so ignore
buffptr->Len = 36; buffptr->Len = sprintf(&buffptr->Data[0], "No Connection to TNC\r");
memcpy(&buffptr->Data[0], "No Connection to TNC\r", 36);
C_Q_ADD(&TNC->Streams[Stream].PACTORtoBPQ_Q, buffptr); C_Q_ADD(&TNC->Streams[Stream].PACTORtoBPQ_Q, buffptr);

1
TelnetV6.c
View File

@ -427,6 +427,7 @@ int ProcessLine(char * buf, int Port)
TCP->MaxSessions = 10; // Default Values TCP->MaxSessions = 10; // Default Values
TNC->Hardware = H_TELNET; TNC->Hardware = H_TELNET;
TCP->IPV4 = TRUE; TCP->IPV4 = TRUE;
TCP->SecureTelnet = 1;
strcpy(TCP->CMSServer, "cms.winlink.org"); strcpy(TCP->CMSServer, "cms.winlink.org");
} }

2
VARA.c
View File

@ -2586,7 +2586,7 @@ VOID VARAProcessDataPacket(struct TNCINFO * TNC, UCHAR * Data, int Length)
STREAM->BytesRXed += Length; STREAM->BytesRXed += Length;
Data[Length] = 0; Data[Length] = 0;
Debugprintf("VARA: RXD %d bytes", Length); // Debugprintf("VARA: RXD %d bytes", Length);
sprintf(TNC->WEB_TRAFFIC, "Sent %d RXed %d Queued %d", sprintf(TNC->WEB_TRAFFIC, "Sent %d RXed %d Queued %d",
STREAM->BytesTXed, STREAM->BytesRXed,STREAM->BytesOutstanding); STREAM->BytesTXed, STREAM->BytesRXed,STREAM->BytesOutstanding);

6
Versions.h
View File

@ -10,14 +10,14 @@
#endif #endif
#define KVers 6,0,24,38 #define KVers 6,0,24,42
#define KVerstring "6.0.24.38\0" #define KVerstring "6.0.24.42\0"
#ifdef CKernel #ifdef CKernel
#define Vers KVers #define Vers KVers
#define Verstring KVerstring #define Verstring KVerstring
#define Datestring "January 2024" #define Datestring "August 2024"
#define VerComments "G8BPQ Packet Switch (C Version)" KVerstring #define VerComments "G8BPQ Packet Switch (C Version)" KVerstring
#define VerCopyright "Copyright © 2001-2024 John Wiseman G8BPQ\0" #define VerCopyright "Copyright © 2001-2024 John Wiseman G8BPQ\0"
#define VerDesc "BPQ32 Switch\0" #define VerDesc "BPQ32 Switch\0"

3
bpqchat.c
View File

@ -70,8 +70,9 @@
// Allow /History to be shortened to /Hi (45) // Allow /History to be shortened to /Hi (45)
// Fix extra r charater in Chat Config Web Page // Fix extra r charater in Chat Config Web Page
//.25
// Increase sise of status display buffers (7) // Increase size of status display buffers (7)
#include "BPQChat.h" #include "BPQChat.h"
#include "Dbghelp.h" #include "Dbghelp.h"

5
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
@ -1194,8 +1194,7 @@ int CountMessagestoForward(struct UserInfo * user);
VOID * GetMultiLineDialogParam(HWND hDialog, int DLGItem); VOID * GetMultiLineDialogParam(HWND hDialog, int DLGItem);
#define LIBCONFIG_STATIC
#include "libconfig.h"
VOID * GetMultiStringValue(config_setting_t * hKey, char * ValueName); VOID * GetMultiStringValue(config_setting_t * hKey, char * ValueName);
VOID * RegGetMultiStringValue(HKEY hKey, char * ValueName); VOID * RegGetMultiStringValue(HKEY hKey, char * ValueName);

1
debian/bpq32.cfg vendored
View File

@ -34,6 +34,7 @@ PORT
LOGGING=1 LOGGING=1
CMS=1 CMS=1
DisconnectOnClose=1 DisconnectOnClose=1
SECURETELNET=1
TCPPORT=8010 TCPPORT=8010
FBBPORT=8011 FBBPORT=8011
HTTPPORT=8008 HTTPPORT=8008

16
debian/changelog vendored
View File

@ -1,3 +1,19 @@
linbpq (6.0.24.42-1) unstable; urgency=medium
* Install config to /etc
* New upstream update
* Add in new repo for continued updates
-- Dave Hibberd <hibby@debian.org> Wed, 25 Sep 2024 01:36:59 +0100
linbpq (6.0.24.40-1) unstable; urgency=medium
* Fresh upstream release
- Patches refreshed
* Secure by default patch
-- Dave Hibberd <hibby@debian.org> Sun, 07 Jul 2024 16:09:28 +0100
linbpq (6.0.24.38-1~bpo11+1) bullseye; urgency=medium linbpq (6.0.24.38-1~bpo11+1) bullseye; urgency=medium
* Rebuild for bullseye. * Rebuild for bullseye.

2
debian/control vendored
View File

@ -11,7 +11,7 @@ Rules-Requires-Root: no
Package: linbpq Package: linbpq
Architecture: linux-any Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, hibbian-archive-keyring
Description: Packet node and ax25 stack Description: Packet node and ax25 stack
LINBPQ is a Linux version of the BPQ32 Node, BBS and Chat Server components. LINBPQ is a Linux version of the BPQ32 Node, BBS and Chat Server components.
It is actively developed by John G8BPQ and contains a complete, independent It is actively developed by John G8BPQ and contains a complete, independent

1
debian/install vendored Normal file
View File

@ -0,0 +1 @@
debian/bpq32.cfg etc/

66
debian/patches/ftbfs-gcc14.patch vendored Normal file
View File

@ -0,0 +1,66 @@
--- a/Multicast.c
+++ b/Multicast.c
@@ -620,7 +620,7 @@
int r;
UINT rlen;
- UINT outlen;
+ long outlen;
memcpy(&rlen, &Decoded[5], 4);
--- a/MBLRoutines.c
+++ b/MBLRoutines.c
@@ -23,7 +23,7 @@
#include "bpqmail.h"
-void SendMessageReadEvent(struct UserInfo * user, struct MsgInfo * Msg);
+void SendMessageReadEvent(char * Call, struct MsgInfo * Msg);
VOID ProcessMBLLine(CIRCUIT * conn, struct UserInfo * user, UCHAR* Buffer, int len)
--- a/bpqmail.h
+++ b/bpqmail.h
@@ -695,8 +695,8 @@
unsigned char Type;
unsigned char changed;
unsigned short seen;
- long long last_modif;
- long long last_seen;
+ time_t last_modif;
+ time_t last_seen;
char first_homebbs[41];
char secnd_homebbs[41];
char first_zip[9];
--- a/AGWAPI.c
+++ b/AGWAPI.c
@@ -128,7 +128,7 @@
int AGWGetSessionKey(char * key, struct AGWSocketConnectionInfo * sockptr);
int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr);
int SendDataToAppl(int Stream, byte * Buffer, int Length);
-int InternalAGWDecodeFrame(char * msg, char * buffer, int Stamp, int * FrameType, int useLocalTime, int doNodes);
+int InternalAGWDecodeFrame(char * msg, char * buffer, time_t Stamp, int * FrameType, int useLocalTime, int doNodes);
int AGWDataSocket_Disconnect( struct AGWSocketConnectionInfo * sockptr);
int SendRawPacket(struct AGWSocketConnectionInfo * sockptr, char *txmsg, int Length);
int ShowApps();
--- a/AGWMoncode.c
+++ b/AGWMoncode.c
@@ -68,7 +68,7 @@
static UCHAR * DISPLAYARPDATAGRAM(UCHAR * Datagram, UCHAR * Output);
-int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, int Stamp, int * FrameType, int useLocalTime, int DoNodes)
+int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, time_t Stamp, int * FrameType, int useLocalTime, int DoNodes)
{
UCHAR * ptr;
int n;
@@ -364,7 +364,7 @@
}
if (Output == NULL)
- return NULL;
+ return 0;
if (Output[-1] != 13)
Output += sprintf((char *)Output, "\r");

258
debian/patches/headers.patch vendored Normal file
View File

@ -0,0 +1,258 @@
--- /dev/null
+++ b/bpqheaders.h
@@ -0,0 +1,8 @@
+//Header for an easier build under debian GCC-14
+#include <stdio.h>
+#include <time.h>
+#include <fcntl.h>
+
+int CanPortDigi(int Port);
+
+int KissEncode(unsigned char * inbuff, unsigned char * outbuff, int len);
--- a/cMain.c
+++ b/cMain.c
@@ -29,9 +29,10 @@
//#include "windows.h"
//#include "winerror.h"
-#include "time.h"
-#include "stdio.h"
+#include <time.h>
+#include <stdio.h>
#include <fcntl.h>
+#include "bpqheaders.h"
#include "kernelresource.h"
#include "CHeaders.h"
--- a/CHeaders.h
+++ b/CHeaders.h
@@ -93,7 +93,7 @@
char * MOVEANDCHECK(TRANSPORTENTRY * Session, char * Bufferptr, char * Source, int Len);
VOID DISPLAYCIRCUIT(TRANSPORTENTRY * L4, char * Buffer);
char * FormatUptime(int Uptime);
-char * strlop(char * buf, char delim);
+char * strlop(const char * buf, char delim);
BOOL CompareCalls(UCHAR * c1, UCHAR * c2);
VOID PostDataAvailable(TRANSPORTENTRY * Session);
@@ -427,4 +427,4 @@
extern int MinCounter[MaxBPQPortNo + 1]; // Interval Countdown
extern BOOL SendFromFile[MaxBPQPortNo + 1];
-DllExport uint64_t APIENTRY GetPortFrequency(int PortNo, char * FreqStringMhz);
\ No newline at end of file
+DllExport uint64_t APIENTRY GetPortFrequency(int PortNo, char * FreqStringMhz);
--- a/WinRPR.c
+++ b/WinRPR.c
@@ -63,7 +63,6 @@
static RECT Rect;
VOID __cdecl Debugprintf(const char * format, ...);
-char * strlop(char * buf, char delim);
char NodeCall[11]; // Nodecall, Null Terminated
--- a/bpqmail.h
+++ b/bpqmail.h
@@ -877,7 +877,6 @@
};
VOID __cdecl nprintf(CIRCUIT * conn, const char * format, ...);
-char * strlop(char * buf, char delim);
int rt_cmd(CIRCUIT *circuit, char * Buffer);
CIRCUIT *circuit_new(CIRCUIT *circuit, int flags);
VOID BBSputs(CIRCUIT * conn, char * buf);
--- a/APRSCode.c
+++ b/APRSCode.c
@@ -63,7 +63,6 @@
VOID __cdecl Consoleprintf(const char * format, ...);
BOOL APIENTRY Send_AX(PMESSAGE Block, DWORD Len, UCHAR Port);
VOID Send_AX_Datagram(PDIGIMESSAGE Block, DWORD Len, UCHAR Port);
-char * strlop(char * buf, char delim);
int APRSDecodeFrame(char * msg, char * buffer, time_t Stamp, uint64_t Mask); // Unsemaphored DecodeFrame
APRSHEARDRECORD * UpdateHeard(UCHAR * Call, int Port);
BOOL CheckforDups(char * Call, char * Msg, int Len);
--- a/FLDigi.c
+++ b/FLDigi.c
@@ -101,8 +101,6 @@
VOID ReleaseOtherPorts(struct TNCINFO * ThisTNC);
VOID WritetoTrace(struct TNCINFO * TNC, char * Msg, int Len);
-char * strlop(char * buf, char delim);
-
extern UCHAR BPQDirectory[];
#define MAXMPSKPORTS 16
--- a/MULTIPSK.c
+++ b/MULTIPSK.c
@@ -71,8 +71,6 @@
static VOID DoMonitorHddr(struct TNCINFO * TNC, struct AGWHEADER * RXHeader, UCHAR * Msg);
VOID SendRPBeacon(struct TNCINFO * TNC);
-char * strlop(char * buf, char delim);
-
extern UCHAR BPQDirectory[];
#define MAXMPSKPORTS 16
--- a/AGWMoncode.c
+++ b/AGWMoncode.c
@@ -61,7 +61,6 @@
#define NODES_SIG 0xFF
-char * strlop(char * buf, char delim);
UCHAR * DisplayINP3RIF(UCHAR * ptr1, UCHAR * ptr2, int msglen);
static UCHAR * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen, int DoNodes);
--- a/Bpq32.c
+++ b/Bpq32.c
@@ -1406,7 +1406,6 @@
VOID FindLostBuffers();
BOOL InitializeTNCEmulator();
VOID TNCTimer();
-char * strlop(char * buf, char delim);
DllExport int APIENTRY Get_APPLMASK(int Stream);
DllExport int APIENTRY GetStreamPID(int Stream);
--- a/CMSAuth.c
+++ b/CMSAuth.c
@@ -31,7 +31,7 @@
#include <windows.h>
#endif
-char * strlop(char * buf, char delim);
+char * strlop(const char * buf, char delim);
VOID APIENTRY md5 (char *arg, unsigned char * checksum);
--- a/FLDigi64.c
+++ b/FLDigi64.c
@@ -102,8 +102,6 @@
VOID SuspendOtherPorts(struct TNCINFO * ThisTNC);
VOID ReleaseOtherPorts(struct TNCINFO * ThisTNC);
-char * strlop(char * buf, char delim);
-
extern UCHAR BPQDirectory[];
#define MAXBPQPORTS 32
--- a/HTTPcode.c
+++ b/HTTPcode.c
@@ -102,7 +102,6 @@
extern UCHAR ConfigDirectory[260];
-char * strlop(char * buf, char delim);
VOID sendandcheck(SOCKET sock, const char * Buffer, int Len);
int CompareNode(const void *a, const void *b);
int CompareAlias(const void *a, const void *b);
--- a/MULTIPSK64.c
+++ b/MULTIPSK64.c
@@ -74,8 +74,6 @@
static VOID DoMonitorHddr(struct TNCINFO * TNC, struct AGWHEADER * RXHeader, UCHAR * Msg);
VOID SendRPBeacon(struct TNCINFO * TNC);
-char * strlop(char * buf, char delim);
-
extern UCHAR BPQDirectory[];
#define MAXBPQPORTS 32
--- a/Moncode.c
+++ b/Moncode.c
@@ -59,7 +59,6 @@
#define NODES_SIG 0xFF
-char * strlop(char * buf, char delim);
UCHAR * DisplayINP3RIF(UCHAR * ptr1, UCHAR * ptr2, unsigned int msglen);
char * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen);
--- a/NodeMapTest.c
+++ b/NodeMapTest.c
@@ -201,7 +201,6 @@
int ConvFromAX25(unsigned char * incall, char * outcall);
void GenerateOutputFiles(time_t Now);
void UpdateHeardData(struct NodeData * Node, struct NodeData * Call, char * Freq, char * LOC, char * Flags);
-char * strlop(char * buf, char delim);
void ProcessChatUpdate(char * From, char * Msg);
void ProcessNodeUpdate(char * From, char * Msg);
--- a/SCSTracker.c
+++ b/SCSTracker.c
@@ -52,7 +52,6 @@
static RECT Rect;
VOID __cdecl Debugprintf(const char * format, ...);
-char * strlop(char * buf, char delim);
char NodeCall[11]; // Nodecall, Null Terminated
--- a/TelnetV6.c
+++ b/TelnetV6.c
@@ -127,8 +127,6 @@
static int ProcessLine(char * buf, int Port);
VOID __cdecl Debugprintf(const char * format, ...);
-char * strlop(char * buf, char delim);
-
int DisplaySessions(struct TNCINFO * TNC);
int DoStateChange(int Stream);
--- a/UIARQ.c
+++ b/UIARQ.c
@@ -78,7 +78,6 @@
VOID Send_AX_Datagram(PDIGIMESSAGE Block, DWORD Len, UCHAR Port);
int DoScanLine(struct TNCINFO * TNC, char * Buff, int Len);
VOID ProcessARQPacket(struct PORTCONTROL * PORT, MESSAGE * Buffer);
-char * strlop(char * buf, char delim);
extern UCHAR BPQDirectory[];
extern char MYALIASLOPPED[10];
--- a/bpqchat.h
+++ b/bpqchat.h
@@ -603,7 +603,6 @@
VOID nputs(ChatCIRCUIT * conn, char * buf);
#endif
BOOL matchi(char * p1, char * p2);
-char * strlop(char * buf, char delim);
int rt_cmd(ChatCIRCUIT *circuit, char * Buffer);
ChatCIRCUIT *circuit_new(ChatCIRCUIT *circuit, int flags);
void makelinks(void);
@@ -775,4 +774,4 @@
struct ConsoleInfo * ConsHeader[2];
-extern BOOL LogCHAT;
\ No newline at end of file
+extern BOOL LogCHAT;
--- a/SCSTrackeMulti.c
+++ b/SCSTrackeMulti.c
@@ -48,7 +48,6 @@
static RECT Rect;
VOID __cdecl Debugprintf(const char * format, ...);
-char * strlop(char * buf, char delim);
BOOL KAMStartPort(struct PORTCONTROL * PORT);
BOOL KAMStopPort(struct PORTCONTROL * PORT);
--- a/SCSTrackeMulti64.c
+++ b/SCSTrackeMulti64.c
@@ -52,7 +52,6 @@
struct TNCINFO * TNCInfo[34]; // Records are Malloc'd
VOID __cdecl Debugprintf(const char * format, ...);
-char * strlop(char * buf, char delim);
BOOL KAMStartPort(struct PORTCONTROL * PORT);
BOOL KAMStopPort(struct PORTCONTROL * PORT);
--- a/CommonCode.c
+++ b/CommonCode.c
@@ -568,7 +568,7 @@
return ptr;
}
-char * strlop(char * buf, char delim)
+char * strlop(const char * buf, char delim)
{
// Terminate buf at delim, and return rest of string

10
debian/patches/secure-by-default.patch vendored Normal file
View File

@ -0,0 +1,10 @@
--- a/TelnetV6.c
+++ b/TelnetV6.c
@@ -429,6 +429,7 @@
TCP->IPV4 = TRUE;
TCP->SecureTelnet = 1;
strcpy(TCP->CMSServer, "cms.winlink.org");
+ TCP->SecureTelnet = 1;
}
TNC = TNCInfo[Port];

3
debian/patches/series vendored
View File

@ -1,2 +1,5 @@
headers.patch
ftbfs-gcc14.patch
spelling-errors.patch spelling-errors.patch
makefile makefile
secure-by-default.patch

6
debian/patches/spelling-errors.patch vendored
View File

@ -22,7 +22,7 @@
--- a/BPQMail.rc --- a/BPQMail.rc
+++ b/BPQMail.rc +++ b/BPQMail.rc
@@ -1042,7 +1042,7 @@ @@ -1045,7 +1045,7 @@
CONTROL "Delete Log and Message Files to Recycle Bin", CONTROL "Delete Log and Message Files to Recycle Bin",
IDC_DELETETORECYCLE,"Button",BS_AUTOCHECKBOX | IDC_DELETETORECYCLE,"Button",BS_AUTOCHECKBOX |
BS_LEFTTEXT | BS_MULTILINE | WS_TABSTOP,5,142,115,20 BS_LEFTTEXT | BS_MULTILINE | WS_TABSTOP,5,142,115,20
@ -108,7 +108,7 @@
goto SeeifMore; // SEE IF ANYTHING ELSE goto SeeifMore; // SEE IF ANYTHING ELSE
--- a/templatedefs.c --- a/templatedefs.c
+++ b/templatedefs.c +++ b/templatedefs.c
@@ -1158,7 +1158,7 @@ @@ -1165,7 +1165,7 @@
"Send Non-delivery Notifications<br>\r\n" "Send Non-delivery Notifications<br>\r\n"
"for P and T messages <input %sname=\"SendND\" value=\"SendND\" type=\"checkbox\" /><br>\r\n" "for P and T messages <input %sname=\"SendND\" value=\"SendND\" type=\"checkbox\" /><br>\r\n"
" <br />\r\n" " <br />\r\n"
@ -117,7 +117,7 @@
"Housekeeping Result <input %sname=\"NoMail\" value=\"Yes\" type=\"checkbox\"><br><br>\r\n" "Housekeeping Result <input %sname=\"NoMail\" value=\"Yes\" type=\"checkbox\"><br><br>\r\n"
"Generate Traffic Report<input %sname=\"GenTraffic\" value=\"Yes\" type=\"checkbox\"><br><br>\r\n" "Generate Traffic Report<input %sname=\"GenTraffic\" value=\"Yes\" type=\"checkbox\"><br><br>\r\n"
"<div style=\"text-align: center;\"><input class='btn' name=RunNow value=\"Run Housekeeping\" type=submit class='btn'></div>\r\n" "<div style=\"text-align: center;\"><input class='btn' name=RunNow value=\"Run Housekeeping\" type=submit class='btn'></div>\r\n"
@@ -1446,7 +1446,7 @@ @@ -1454,7 +1454,7 @@
"<div style=\"text-align: left; width: 680px; margin: auto;\">The Nodes to link to box defines which other Chat Nodes should be connected to, or from which " "<div style=\"text-align: left; width: 680px; margin: auto;\">The Nodes to link to box defines which other Chat Nodes should be connected to, or from which "
"connections may be accepted. The format is ALIAS:CALL, eg BPQCHT:G8BPQ-4. If the node is not directly " "connections may be accepted. The format is ALIAS:CALL, eg BPQCHT:G8BPQ-4. If the node is not directly "
"connectable (ie is not in your NODES table) you can add a connect script. This consists of a series of commands " "connectable (ie is not in your NODES table) you can add a connect script. This consists of a series of commands "

2
debian/rules vendored
View File

@ -1,6 +1,6 @@
#!/usr/bin/make -f #!/usr/bin/make -f
#export DEB_BUILD_MAINT_OPTIONS=hardening=+all export DEB_BUILD_MAINT_OPTIONS=hardening=+all
CFLAGS = $(shell dpkg-buildflags --get CFLAGS) CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
CFLAGS += -fcommon CFLAGS += -fcommon

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"

11
tncinfo.h
View File

@ -225,6 +225,8 @@ struct STREAMINFO
char AGWKey[21]; // Session Key for AGW Session Based Drivers char AGWKey[21]; // Session Key for AGW Session Based Drivers
time_t ConnectTime; // Time connection made time_t ConnectTime; // Time connection made
time_t AttachTime;
int BytesTXed; int BytesTXed;
int BytesAcked; int BytesAcked;
int BytesRXed; int BytesRXed;
@ -258,6 +260,7 @@ struct STREAMINFO
HWND xIDC_DIRN; HWND xIDC_DIRN;
int RelaySyncStream; int RelaySyncStream;
int VaraACMode;
}; };
typedef struct AGWINFO typedef struct AGWINFO
@ -409,7 +412,7 @@ struct FreeDataINFO
char * SSIDS[16]; char * SSIDS[16];
}; };
struct sixPackInfo;
typedef struct TNCINFO typedef struct TNCINFO
{ {
@ -427,6 +430,9 @@ typedef struct TNCINFO
time_t SessionTimeLimit; // Optional limit to total session time time_t SessionTimeLimit; // Optional limit to total session time
time_t DefaultSessionTimeLimit; // Configured value time_t DefaultSessionTimeLimit; // Configured value
time_t AttachTimeLimit; // to trap port left attached for a long time without other activity
time_t AttachTime;
int Hardware; // Hardware Type int Hardware; // Hardware Type
#define H_WINMOR 1 #define H_WINMOR 1
@ -449,6 +455,7 @@ typedef struct TNCINFO
#define H_WINRPR 17 #define H_WINRPR 17
#define H_HSMODEM 18 #define H_HSMODEM 18
#define H_FREEDATA 19 #define H_FREEDATA 19
#define H_SIXPACK 20
int Port; // BPQ Port Number int Port; // BPQ Port Number
@ -839,6 +846,8 @@ typedef struct TNCINFO
char * NRNeighbour; char * NRNeighbour;
int NRCloseTimer; int NRCloseTimer;
struct _LINKTABLE * DummyLink; // Simulated link to simplify interface to ax,25 netrom code struct _LINKTABLE * DummyLink; // Simulated link to simplify interface to ax,25 netrom code
struct sixPackPortInfo * sixPack;
int VaraACMode;
} *PTNCINFO; } *PTNCINFO;

9
upnp.c
View File

@ -85,6 +85,7 @@ char * leaseDuration = NULL;
struct UPNPDev * devlist = 0; struct UPNPDev * devlist = 0;
char lanaddr[64] = "unset"; /* my ip address on the LAN */ char lanaddr[64] = "unset"; /* my ip address on the LAN */
char wanaddr[64] = "unset"; /* my ip address on the LAN */
struct UPNPUrls urls; struct UPNPUrls urls;
struct IGDdatas data; struct IGDdatas data;
@ -126,7 +127,11 @@ int upnpInit()
return 0; return 0;
} }
#if MINIUPNPC_API_VERSION == 18
i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), wanaddr, sizeof(wanaddr));
#else
i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
#endif
} }
AddMap(devlist->descURL, Config->LANport, Config->WANPort, Config->Protocol); AddMap(devlist->descURL, Config->LANport, Config->WANPort, Config->Protocol);
@ -153,7 +158,11 @@ int upnpClose()
return 0; return 0;
} }
#if MINIUPNPC_API_VERSION == 18
i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), wanaddr, sizeof(wanaddr));
#else
i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
#endif
} }
DeleteMap(devlist->descURL, Config->LANport, Config->WANPort, Config->Protocol); DeleteMap(devlist->descURL, Config->LANport, Config->WANPort, Config->Protocol);