KB8PMY
/
linbpq
mirror of git://vps1.g8bpq.net/linbpq
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

6.0.24.38

Browse Source
master 24.40
John Wiseman 2 years ago
parent 2bb96a93de
commit 26c435872f
21 changed files with 4777 additions and 194 deletions
Show Stats Download Patch File Download Diff File

2
APRSCode.c
Unescape View File

@ -2187,7 +2187,7 @@ static int APRSProcessLine(char * buf)
CrossPortMap[Port][0] = FALSE; // Cancel Default APRSIS CrossPortMap[Port][0] = FALSE; // Cancel Default APRSIS
if (Context == NULL || Context[0] == 0) if (Context == NULL || Context[0] == 0)
return FALSE; return TRUE;
ptr = strtok_s(NULL, ",\t\n\r", &Context); ptr = strtok_s(NULL, ",\t\n\r", &Context);

354
BBSUtilities.c
Unescape View File

@ -225,7 +225,7 @@ extern BOOL EventsEnabled;
extern BPQVECSTRUC BPQHOSTVECTOR[BPQHOSTSTREAMS + 5]; extern BPQVECSTRUC BPQHOSTVECTOR[BPQHOSTSTREAMS + 5];
/* --- TAJ PG Server--- */ /* --- G7TAJ PG Server--- */
void run_pg( CIRCUIT * conn, struct UserInfo * user ); void run_pg( CIRCUIT * conn, struct UserInfo * user );
void startrun_pgThread( RUNPGARGS_PTR Args ); void startrun_pgThread( RUNPGARGS_PTR Args );
@ -234,7 +234,7 @@ char * SERVERLIST[256][3];
int NUM_SERVERS = 0; int NUM_SERVERS = 0;
/*------- TAJ END ----------*/ /*------- G7TAJ END ----------*/
#ifdef LINBPQ #ifdef LINBPQ
@ -1038,20 +1038,6 @@ Next:
} }
SortBBSChain(); SortBBSChain();
/*------- TAJ PG SERVER ----------*/
#ifndef WIN32
printf("Number of PG Servers = %d\n", NUM_SERVERS );
for ( int i=0; i< NUM_SERVERS; i++ ) {
printf("Server #%d\t%s\tExec->%s\tDESC->%s\n", i, SERVERLIST[i][0], SERVERLIST[i][1], SERVERLIST[i][2]);
}
#endif
/*------- TAJ END ----------*/
} }
VOID CopyUserDatabase() VOID CopyUserDatabase()
@ -8241,6 +8227,7 @@ InBand:
else else
Delay = 1000; Delay = 1000;
conn->BBSFlags &= ~RunningConnectScript; // so it doesn't get reentered conn->BBSFlags &= ~RunningConnectScript; // so it doesn't get reentered
Disconnect(conn->BPQStream); Disconnect(conn->BPQStream);
@ -8385,6 +8372,14 @@ InBand:
goto LoopBack; goto LoopBack;
} }
if (_memicmp(Cmd, "IDLETIME ", 9) == 0)
{
int idle = atoi(&Cmd[9]);
ChangeSessionIdletime(conn->BPQStream, idle);
goto LoopBack;
}
if (_memicmp(Cmd, "RADIO AUTH", 10) == 0) if (_memicmp(Cmd, "RADIO AUTH", 10) == 0)
{ {
// Generate a Password to enable RADIO commands on a remote node // Generate a Password to enable RADIO commands on a remote node
@ -10854,15 +10849,15 @@ int Disconnected (int Stream)
conn->InputBufferLen = 0; conn->InputBufferLen = 0;
} }
/* ---- TAJ PG SERVER ---- */ /* ---- G7TAJ PG SERVER ---- */
if (conn->UserPointer && conn->UserPointer->Temp && conn->UserPointer->Temp->RUNPGPARAMS) if (conn->UserPointer && conn->UserPointer->Temp && conn->UserPointer->Temp->RUNPGPARAMS)
{ {
printf("Freeing RUNPGPARAMS\n"); Debugprintf("Freeing RUNPGPARAMS");
free(conn->UserPointer->Temp->RUNPGPARAMS); free(conn->UserPointer->Temp->RUNPGPARAMS);
conn->UserPointer->Temp->RUNPGPARAMS = NULL; conn->UserPointer->Temp->RUNPGPARAMS = NULL;
} }
/*------- TAJ END --------- */ /*------- G7TAJ END --------- */
if (conn->InputMode == 'B') if (conn->InputMode == 'B')
{ {
@ -10979,7 +10974,7 @@ int DoReceivedData(int Stream)
} }
/* ---------- TAJ START - PG server --------- */ /* ---------- G7TAJ START - PG server --------- */
if (conn->InputMode == 'P') // Inside PG Server if (conn->InputMode == 'P') // Inside PG Server
{ {
@ -10987,7 +10982,7 @@ int DoReceivedData(int Stream)
run_pg(conn, user); run_pg(conn, user);
return 0; return 0;
} }
/* ---------- TAJ END --------- */ /* ---------- G7TAJ END --------- */
if (conn->InputMode == 'B') if (conn->InputMode == 'B')
{ {
@ -11738,7 +11733,7 @@ extern UCHAR * infile;
BOOL CheckforMIME(SocketConn * sockptr, char * Msg, char ** Body, int * MsgLen); BOOL CheckforMIME(SocketConn * sockptr, char * Msg, char ** Body, int * MsgLen);
/* ---TAJ PG Server --- */ /* ---G7TAJ PG Server --- */
#ifndef WIN32 #ifndef WIN32
#define verbose 1 #define verbose 1
@ -11760,22 +11755,23 @@ 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 )
printf("watchdog thread: Still running, so killing %d ... ", process); {
// if ( kill( process, SIGTERM ) == 0 ) { Debugprintf("watchdog thread: Still running, so killing %d ... ", process);
if ( kill( -process, SIGKILL ) == 0 ) { if ( kill( -process, SIGKILL ) == 0 )
printf("Killed\n"); Debugprintf("Killed PG watchdog Process %d", process);
} else { else
printf("Failed\n"); Debugprintf("Failed to kill PG watchdog Process %d", process);
} }
}
printf("watchdog thread: PID=%d Exit\n", process);
fflush(stdout); Debugprintf("watchdog thread: PID=%d Exit", process);
//return; fflush(stdout);
//return;
} }
@ -11804,7 +11800,7 @@ POPENRET my_popen(char *program, char *type, CIRCUIT *conn)
if (*type == 'r') { if (*type == 'r') {
if (pdes[1] != 1) { if (pdes[1] != 1) {
dup2(pdes[1], 1); dup2(pdes[1], 1);
dup2(pdes[1], 2); /* stderr, too! */ dup2(pdes[1], 2);
(void)close(pdes[1]); (void)close(pdes[1]);
} }
(void)close(pdes[0]); (void)close(pdes[0]);
@ -11821,9 +11817,8 @@ POPENRET my_popen(char *program, char *type, CIRCUIT *conn)
_exit(1); _exit(1);
} }
/* parent; assume fdopen can't fail... */ /* parent */
printf("PID=%d\n", pid );
_beginthread((void (*)(void *))run_pgTimeoutThread, 0, (VOID *) pid ); _beginthread((void (*)(void *))run_pgTimeoutThread, 0, (VOID *) pid );
if (*type == 'r') { if (*type == 'r') {
@ -11835,17 +11830,13 @@ POPENRET my_popen(char *program, char *type, CIRCUIT *conn)
} }
char buffer[128]; char buffer[128];
while (fgets(buffer, sizeof(buffer), iop) != NULL) { while (fgets(buffer, sizeof(buffer), iop) != NULL)
BBSputs(conn, buffer); {
// printf("%s", buffer); BBSputs(conn, buffer);
// sleep(200); buffer[0] = '\0';
buffer[0] = '\0';
} }
// BBSputs(conn,"\n");
PRET.fp = iop; PRET.fp = iop;
PRET.pid= pid; PRET.pid= pid;
// (void)close(pdes[0]);
// (void)close(pdes[1]);
return(PRET); return(PRET);
} }
@ -11871,92 +11862,82 @@ my_pclose( POPENRET pret )
sigprocmask(SIG_SETMASK, &omask, NULL); sigprocmask(SIG_SETMASK, &omask, NULL);
if (pid == -1 || !WIFEXITED(stat_loc)) if (pid == -1 || !WIFEXITED(stat_loc))
return -1; return -1;
// return WEXITSTATUS(stat_loc);
printf( "return = %d\n", WEXITSTATUS(stat_loc));
return stat_loc; return stat_loc;
} }
int run_server (char **cmd, int nb_cmd, int mode, char *log, char *pgdir, char *data, CIRCUIT * conn) int run_server (char **cmd, int nb_cmd, int mode, char *log, char *pgdir, char *data, CIRCUIT * conn)
{ {
int i; int i;
int ret = 0; int ret = 0;
FILE *fp; FILE *fp;
POPENRET PRET; POPENRET PRET;
pid_t pid; pid_t pid;
char *ptr; char *ptr;
char file[256]; char file[256];
char buf[256]; char buf[256];
char dir[256]; char dir[256];
char arg[256]; char arg[256];
if (mode) if (mode)
// sprintf (file, " </dev/null >%s", log); // sprintf (file, " >>%s", log);
// sprintf (file, " >>%s", log); // sprintf (file, " | tee -a %s", log);
// sprintf (file, " | tee -a %s", log);
sprintf(file, "" ); sprintf(file, "" );
else else
sprintf (file, " </dev/null"); sprintf (file, " </dev/null");
if (pgdir)
{
/* remove ';' security reasons */
ptr = strchr(pgdir, ';');
if (ptr)
*ptr = '\0';
sprintf (dir, "cd %s ; ", pgdir); if (pgdir)
} {
else /* remove ';' security reasons */
*dir = '\0'; ptr = strchr(pgdir, ';');
if (ptr)
*ptr = '\0';
*arg = '\0'; sprintf (dir, "cd %s ; ", pgdir);
}
else
*dir = '\0';
if (data) *arg = '\0';
{
/* remove ';' security reasons */
ptr = strchr(data, ';');
if (ptr)
*ptr = '\0';
sprintf (arg, " %s ", data); 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); for (i = 0; i < nb_cmd; i++)
{
/* remove ';' security reasons */
ptr = strchr(cmd[i], ';');
if (ptr)
*ptr = '\0';
PRET = my_popen (buf, "r", conn); sprintf (buf, "%s%s%s%s", dir, cmd[i], arg, file);
if (PRET.fp == NULL) PRET = my_popen (buf, "r", conn);
printf ("Failed to run command\n" );
// else {
/* start timeout thread to kill process if it runs for more than 5 sec (make configurable?)*/
// _beginthread((void (*)(void *))run_pgTimeoutThread, 0, (VOID *) PRET.pid );
// }
if (PRET.fp == NULL)
Debugprintf ("Failed to run PG command %s\n", cmd[i] );
//ret = (int)PRET.pid;
//wait(&ret);
ret = my_pclose( PRET ); ret = my_pclose( PRET );
ret = ret >> 8; ret = ret >> 8;
if (verbose) { if (verbose) {
printf ("Debug: command = {%s}\n", buf); Debugprintf ("Debug: command = {%s}\n", buf);
printf ("Debug: exit code = %d\n", ret); Debugprintf ("Debug: exit code = %d\n", ret);
} }
/* fail-safe bypass if filter executable isn't found (exit code 127) (was ret ==127)*/ /* fail-safe bypass if executable isn't found (exit code 127) (was ret ==127)*/
if (ret > 5) // should never be more than 5 if (ret > 5) // should never be more than 5
ret = 0; ret = 0;
} }
return ( ret ); return ( ret );
} }
@ -11964,7 +11945,6 @@ void run_pg( CIRCUIT * conn, struct UserInfo * user )
{ {
if (!user->Temp->RUNPGPARAMS) { if (!user->Temp->RUNPGPARAMS) {
// printf("Allocating new RUNPGPARAMS\n");
user->Temp->RUNPGPARAMS = (RUNPGARGS_PTR) zalloc(sizeof(RUNPGARGS)); user->Temp->RUNPGPARAMS = (RUNPGARGS_PTR) zalloc(sizeof(RUNPGARGS));
} }
@ -11974,7 +11954,7 @@ void run_pg( CIRCUIT * conn, struct UserInfo * user )
user->Temp->RUNPGPARAMS->Len = conn->InputLen; user->Temp->RUNPGPARAMS->Len = conn->InputLen;
if ( conn == 0 || user == 0 ) { if ( conn == 0 || user == 0 ) {
printf("run_pg null err\n"); Debugprintf("run_pg null err");
return; return;
} }
@ -11986,65 +11966,80 @@ void run_pg( CIRCUIT * conn, struct UserInfo * user )
void startrun_pgThread( RUNPGARGS_PTR Args ) { void startrun_pgThread( RUNPGARGS_PTR Args ) {
CIRCUIT * conn = Args->conn; CIRCUIT * conn = Args->conn;
struct UserInfo * user = Args->user; struct UserInfo * user = Args->user;
char cmd[20]; char cmd[20];
sprintf( cmd, "./%s", SERVERLIST[user->Temp->PG_SERVER][1] ); sprintf( cmd, "./%s", SERVERLIST[user->Temp->PG_SERVER][1] );
char *ptr = cmd; char *ptr = cmd;
char pg_dir[] = "/home/pi/linbpq/linbpq/downloads/new/linbpq/pg/"; char pg_dir[MAX_PATH];
char log_file[50] = "pg.log"; char log_file[50] = "pg.log";
char call[6]; char call[6];
char data[80]; char data[80];
char line[80]; char line[80];
char *line_ptr = line; char *line_ptr = line;
int index; int index;
char *data_ptr = data; char *data_ptr = data;
size_t bufsize = 80; size_t bufsize = 80;
strcpy( call, conn->UserPointer->Call); strcpy(pg_dir, BaseDir);
// sprintf( log_file, "%s-%d.log", call, conn); strcat(pg_dir, "/PG/");
index = user->Temp->PG_INDEX;
sprintf(line, "%s%s", pg_dir, SERVERLIST[user->Temp->PG_SERVER][1]);
line[0] = '\0';
int Len = Args->Len; // check file exists and is executable
UCHAR * Msg = Args->InputBuffer; if (access(line, F_OK) == -1 || access(line, X_OK) == -1) {
strncpy( line, Msg, Len); Debugprintf("%s FileNotFound || Not EXE", line);
line[ Len - 1 ] = 0; //remove LF BBSputs(conn, "Error running PG Server\r");
conn->InputMode=0;
sprintf( data, "%s %d 0 0 %s", call, index, line); SendPrompt(conn, user);
return;
// 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 0: index=0; // Goodbye/Exit
conn->InputMode=0;
SendPrompt(conn, user);
break;
case 1: index++; // inc & keep in PG
break;
case 2: index=0; // disconnect
conn->InputMode=0;
Disconnect(conn->BPQStream);
break;
case 3: printf("data->BBS & end\n");
break;
case 4: printf("data->BBS and inc %d\n", index++);
break;
case 5: printf("call no inc %d\n", ret);
break;
}
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 0: index=0; // Goodbye/Exit
conn->InputMode=0;
SendPrompt(conn, user);
break;
case 1: index++; // inc & keep in PG
break;
case 2: index=0; // disconnect
conn->InputMode=0;
Disconnect(conn->BPQStream);
break;
case 3: Debugprintf("data->BBS & end");
break;
case 4: Debugprintf("data->BBS and inc %d", index++);
break;
case 5: Debugprintf("call no inc %d", ret);
break;
}
user->Temp->PG_INDEX=index; user->Temp->PG_INDEX=index;
} }
/*---- TAJ END ----- */ /*---- G7TAJ END ----- */
#else #else
@ -12077,7 +12072,7 @@ void run_pg( CIRCUIT * conn, struct UserInfo * user )
int index = 0; int index = 0;
int ret = 0; int ret = 0;
// if first entay allocate RUNPGPARAMS // if first entry allocate RUNPGPARAMS
if (!user->Temp->RUNPGPARAMS) if (!user->Temp->RUNPGPARAMS)
{ {
user->Temp->RUNPGPARAMS = (RUNPGARGS_PTR) zalloc(sizeof(RUNPGARGS)); user->Temp->RUNPGPARAMS = (RUNPGARGS_PTR) zalloc(sizeof(RUNPGARGS));
@ -13065,7 +13060,7 @@ VOID ProcessLine(CIRCUIT * conn, struct UserInfo * user, char* Buffer, int len)
return; return;
} }
/*---- TAJ PG Server ----- */ /*---- G7TAJ PG Server ----- */
if (_stricmp(Cmd, "PG") == 0) if (_stricmp(Cmd, "PG") == 0)
@ -13108,11 +13103,13 @@ VOID ProcessLine(CIRCUIT * conn, struct UserInfo * user, char* Buffer, int len)
return; return;
} }
} }
BBSputs(conn, "No server found\r");
SendPrompt(conn, user);
return;
} }
} }
/*---- TAJ END ---- */ /*---- G7TAJ END ---- */
if (conn->Flags == 0) if (conn->Flags == 0)
{ {
@ -15752,6 +15749,7 @@ VOID GetPGConfig()
char buf[256],errbuf[256]; char buf[256],errbuf[256];
char * p_prog, * p_name, * p_desc; char * p_prog, * p_name, * p_desc;
int n = 0; int n = 0;
int i = 0;
strcpy(FN, BaseDir); strcpy(FN, BaseDir);
@ -15763,6 +15761,9 @@ VOID GetPGConfig()
while(fgets(buf, 255, file) != NULL) while(fgets(buf, 255, file) != NULL)
{ {
if ( buf[0] == '#')
continue;
strcpy(errbuf,buf); // save in case of error strcpy(errbuf,buf); // save in case of error
p_prog = strtok(buf, ",\n\r"); p_prog = strtok(buf, ",\n\r");
@ -15786,6 +15787,15 @@ VOID GetPGConfig()
NUM_SERVERS = n; NUM_SERVERS = n;
fclose(file); fclose(file);
/*------- G7TAJ PG SERVER ----------*/
Debugprintf("Number of PG Servers = %d", NUM_SERVERS );
for (i=0; i< NUM_SERVERS; i++ )
{
Debugprintf("Server #%d,%s,%s,%s", i, SERVERLIST[i][0], SERVERLIST[i][1], SERVERLIST[i][2]);
}
/*------- G7TAJ END ----------*/
} }
void SendMessageReadEvent(char * call, struct MsgInfo * Msg) void SendMessageReadEvent(char * call, struct MsgInfo * Msg)

1
BPQMail.c
Unescape View File

@ -1132,6 +1132,7 @@
// Fix Traffic stats for T messages received via B2 forwarding (31) // Fix Traffic stats for T messages received via B2 forwarding (31)
// 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)
#include "bpqmail.h" #include "bpqmail.h"
#include "winstdint.h" #include "winstdint.h"

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

@ -0,0 +1,65 @@
<?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>

4
Bpq32.c
Unescape View File

@ -1212,8 +1212,12 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
// Add NodeAPI call sendLinks and remove get from other calls (32) // Add NodeAPI call sendLinks and remove get from other calls (32)
// Improve validation of Web Beacon Config (33) // Improve validation of Web Beacon Config (33)
// Support SNMP via host ip stack as well as IPGateway (34) // Support SNMP via host ip stack as well as IPGateway (34)
// Switch APRS Map to OSM tile servers (36) // Switch APRS Map to OSM tile servers (36)
// Fix potential buffer overflow in Telnet login (36) // Fix potential buffer overflow in Telnet login (36)
// Allow longer serial device names (37)
// Fix ICF8101 Mode setting (37)
#define CKernel #define CKernel

2
CBPQ32.vcproj.NOTTSDESKTOP.John.user
Unescape View File

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

11
CommonCode.c
Unescape View File

@ -2184,7 +2184,7 @@ int OpenCOMMPort(struct TNCINFO * conn, char * Port, int Speed, BOOL Quiet)
HANDLE OpenCOMPort(char * pPort, int speed, BOOL SetDTR, BOOL SetRTS, BOOL Quiet, int Stopbits) HANDLE OpenCOMPort(char * pPort, int speed, BOOL SetDTR, BOOL SetRTS, BOOL Quiet, int Stopbits)
{ {
char szPort[80]; char szPort[256];
BOOL fRetVal ; BOOL fRetVal ;
COMMTIMEOUTS CommTimeOuts ; COMMTIMEOUTS CommTimeOuts ;
int Err; int Err;
@ -2576,8 +2576,9 @@ BOOL WriteCOMBlock(HANDLE fd, char * Block, int BytesToWrite)
int ToSend = BytesToWrite; int ToSend = BytesToWrite;
int Sent = 0, ret; int Sent = 0, ret;
int loops = 100;
while (ToSend) while (ToSend && loops-- > 0)
{ {
ret = write(fd, &Block[Sent], ToSend); ret = write(fd, &Block[Sent], ToSend);
@ -2596,6 +2597,12 @@ BOOL WriteCOMBlock(HANDLE fd, char * Block, int BytesToWrite)
Sent += ret; Sent += ret;
ToSend -= ret; ToSend -= ret;
} }
// if (ToSend)
// {
// // Send timed out. Close and reopen device
//
// }
return TRUE; return TRUE;
} }

4
HSMODEM.c
Unescape View File

@ -639,8 +639,8 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
if (buffptr == 0) return (0); // No buffers, so ignore if (buffptr == 0) return (0); // No buffers, so ignore
buffptr->Len = 36; buffptr->Len = 21;
memcpy(&buffptr->Data[0], "No Connection to TNC\r", 36); memcpy(&buffptr->Data[0], "No Connection to TNC\r", 21);
C_Q_ADD(&TNC->Streams[Stream].PACTORtoBPQ_Q, buffptr); C_Q_ADD(&TNC->Streams[Stream].PACTORtoBPQ_Q, buffptr);

10
IPCode.c
Unescape View File

@ -2220,7 +2220,10 @@ BOOL CheckIPChecksum(PIPMSG IPptr)
checksum = cksum((unsigned short *)IPptr, 20); checksum = cksum((unsigned short *)IPptr, 20);
if (checksum == 0xffff) return TRUE; else return FALSE; if (checksum == 0xffff)
return TRUE;
else
return FALSE;
} }
BOOL Check_Checksum(VOID * ptr1, int Len) BOOL Check_Checksum(VOID * ptr1, int Len)
@ -2229,7 +2232,10 @@ BOOL Check_Checksum(VOID * ptr1, int Len)
checksum = cksum((unsigned short *)ptr1, Len); checksum = cksum((unsigned short *)ptr1, Len);
if (checksum == 0xffff) return TRUE; else return FALSE; if (checksum == 0xffff)
return TRUE;
else
return FALSE;
} }
USHORT Generate_CHECKSUM(VOID * ptr1, int Len) USHORT Generate_CHECKSUM(VOID * ptr1, int Len)

20
L2Code.c
Unescape View File

@ -174,7 +174,7 @@ VOID L2Routine(struct PORTCONTROL * PORT, PMESSAGE Buffer)
if (c == ' ') // Blank Call if (c == ' ') // Blank Call
{ {
Debugprintf("BPQ32 Blank Call Port &%", PORT->PORTNUMBER); Debugprintf("BPQ32 Blank Call Port %d", PORT->PORTNUMBER);
ReleaseBuffer(Buffer); ReleaseBuffer(Buffer);
return; return;
} }
@ -1775,7 +1775,7 @@ VOID L2_PROCESS(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * B
switch (CTL & 0x0f) switch (CTL & 0x0f)
{ {
// is there any harm in accepoting SREJ even if we don't // is there any harm in accepting SREJ even if we don't
// otherwise support 2.2? // otherwise support 2.2?
case REJ: case REJ:
@ -3004,6 +3004,8 @@ VOID ACKMSG(struct _LINKTABLE * LINK)
Debugprintf("Missing frame to ack Seq %d Calls %s %s", LINK->LINKOWS, Call1, Call2); Debugprintf("Missing frame to ack Seq %d Calls %s %s", LINK->LINKOWS, Call1, Call2);
} }
LINK->IFrameRetryCounter = 0;
LINK->LINKOWS++; // INCREMENT OLD WINDOW START LINK->LINKOWS++; // INCREMENT OLD WINDOW START
LINK->LINKOWS &= 7; // MODULO 8 LINK->LINKOWS &= 7; // MODULO 8
@ -3018,6 +3020,18 @@ VOID ACKMSG(struct _LINKTABLE * LINK)
{ {
// NOT ALL I-FRAMES HAVE BEEN ACK'ED - RESTART TIMER // NOT ALL I-FRAMES HAVE BEEN ACK'ED - RESTART TIMER
// Need to 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)
if (LINK->IFrameRetryCounter++ > LINK->LINKPORT->PORTN2)
{
Debugprintf("Too many repeats of same I frame - closing connection");
LINK->L2TIMER = 1; // USE TIMER TO SEND DISC
LINK->L2STATE = 4; // DISCONNECTING
return;
}
LINK->L2TIMER = LINK->L2TIME; LINK->L2TIMER = LINK->L2TIME;
return; return;
} }
@ -3033,7 +3047,7 @@ VOID ACKMSG(struct _LINKTABLE * LINK)
// IF DISCONNECT REQUEST OUTSTANDING, AND NO FRAMES ON TX QUEUE, SEND DISC // IF DISCONNECT REQUEST OUTSTANDING, AND NO FRAMES ON TX QUEUE, SEND DISC
if (LINK->L2FLAGS & DISCPENDING && LINK->TX_Q == 0) if ((LINK->L2FLAGS & DISCPENDING) && LINK->TX_Q == 0)
{ {
LINK->L2FLAGS &= ~DISCPENDING; LINK->L2FLAGS &= ~DISCPENDING;

2
LinBPQ.c
Unescape View File

@ -75,6 +75,7 @@ int upnpClose();
void SaveAIS(); void SaveAIS();
void initAIS(); void initAIS();
void DRATSPoll(); void DRATSPoll();
VOID GetPGConfig();
extern uint64_t timeLoadedMS; extern uint64_t timeLoadedMS;
@ -1138,6 +1139,7 @@ int main(int argc, char * argv[])
GetBIDDatabase(); GetBIDDatabase();
GetBadWordFile(); GetBadWordFile();
GetHTMLForms(); GetHTMLForms();
GetPGConfig();
// Make sure there is a user record for the BBS, with BBS bit set. // Make sure there is a user record for the BBS, with BBS bit set.

2
MailCommands.c
Unescape View File

@ -351,7 +351,7 @@ VOID DoSetIdleTime(CIRCUIT * conn, struct UserInfo * user, char * Arg1, char * C
return; return;
} }
nodeprintf(conn, "Idle Tine set to %d\r", IdleTime); nodeprintf(conn, "Idle Time set to %d\r", IdleTime);
SendPrompt(conn, user); SendPrompt(conn, user);
return; return;
} }

29
RigControl.c
Unescape View File

@ -1543,11 +1543,19 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
*(CmdPtr++) = 0x1A; *(CmdPtr++) = 0x1A;
*(CmdPtr++) = 0x36; // Set mode command *(CmdPtr++) = 0x36; // Set mode command
*(CmdPtr++) = 0; *(CmdPtr++) = 0;
if (ModeNo > 10) if (ModeNo > 19)
*(CmdPtr++) = ModeNo + 12;
else if (ModeNo > 9)
*(CmdPtr++) = ModeNo + 6; *(CmdPtr++) = ModeNo + 6;
else else
*(CmdPtr++) = ModeNo; *(CmdPtr++) = ModeNo;
*(CmdPtr++) = 0xFD; *(CmdPtr++) = 0xFD;
// Mode = (Msg[7] >> 4);
// Mode *= 10;
// Mode += Msg[7] & 0xf;
} }
} }
else else
@ -3980,6 +3988,8 @@ SetFinished:
strcpy(RIG->ModeString, Modes[Mode]); strcpy(RIG->ModeString, Modes[Mode]);
SetWindowText(RIG->hMODE, RIG->WEB_MODE); SetWindowText(RIG->hMODE, RIG->WEB_MODE);
return; return;
} }
} }
@ -6995,7 +7005,10 @@ CheckScan:
*(CmdPtr++) = 0x1A; *(CmdPtr++) = 0x1A;
*(CmdPtr++) = 0x36; // Set mode command *(CmdPtr++) = 0x36; // Set mode command
*(CmdPtr++) = 0; *(CmdPtr++) = 0;
if (ModeNo > 10)
if (ModeNo > 19)
*(CmdPtr++) = ModeNo + 12;
else if (ModeNo > 9)
*(CmdPtr++) = ModeNo + 6; *(CmdPtr++) = ModeNo + 6;
else else
*(CmdPtr++) = ModeNo; *(CmdPtr++) = ModeNo;
@ -7480,7 +7493,11 @@ VOID PTTCATThread(struct RIGINFO *RIG)
if (Handle[HIndex] == (HANDLE) -1) if (Handle[HIndex] == (HANDLE) -1)
{ {
int Err = GetLastError(); int Err = GetLastError();
Consoleprintf("PTTMUX port BPQCOM%s Open failed code %d - trying real com port", RIG->PTTCATPort[PIndex], Err); char errmsg[256] = "";
// Only report if both BPQCOM and Real COM fail
sprintf(errmsg, "PTTMUX port BPQCOM%s Open failed code %d - trying real com port", RIG->PTTCATPort[PIndex], Err);
// See if real com port // See if real com port
@ -7494,7 +7511,11 @@ VOID PTTCATThread(struct RIGINFO *RIG)
if (Handle[HIndex] == (HANDLE) -1) if (Handle[HIndex] == (HANDLE) -1)
{ {
int Err = GetLastError(); int Err = GetLastError();
Consoleprintf("PTTMUX port COM%s Open failed code %d", RIG->PTTCATPort[PIndex], Err); if (errmsg[0])
{
Consoleprintf("%s", errmsg);
Consoleprintf("PTTMUX port COM%s Open failed code %d", RIG->PTTCATPort[PIndex], Err);
}
} }
else else
{ {

2
SCSPactor.c
Unescape View File

@ -423,7 +423,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
if (TNC->PortRecord->PORTCONTROL.PortStopped == 0) if (TNC->PortRecord->PORTCONTROL.PortStopped == 0)
OpenCOMMPort(TNC, TNC->PortRecord->PORTCONTROL.SerialPortName, TNC->PortRecord->PORTCONTROL.BAUDRATE, TRUE); OpenCOMMPort(TNC, TNC->PortRecord->PORTCONTROL.SerialPortName, TNC->PortRecord->PORTCONTROL.BAUDRATE, TRUE);
if (TNC->hDevice == 0) if (TNC->hDevice == 0)
return 0; return 0;

4322
SCSPactor.c.bak
View File

File diff suppressed because it is too large Load Diff

4
Versions.h
Unescape View File

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

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

@ -0,0 +1,65 @@
<?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.NOTTSDESKTOP.John.user
Unescape View File

@ -0,0 +1,65 @@
<?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
asmstrucs.h
Unescape View File

@ -903,6 +903,8 @@ typedef struct _LINKTABLE
VOID * L2FRAG_Q; // DEFRAGMENTATION QUEUE VOID * L2FRAG_Q; // DEFRAGMENTATION QUEUE
int IFrameRetryCounter; // Number of times an I frame in repeated without a frame being acked
} LINKTABLE; } LINKTABLE;
#pragma pack(1) #pragma pack(1)

1
config.c
Unescape View File

@ -1,6 +1,5 @@
/* /*
Copyright 2001-2022 John Wiseman G8BPQ Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32. This file is part of LinBPQ/BPQ32.
LinBPQ/BPQ32 is free software: you can redistribute it and/or modify LinBPQ/BPQ32 is free software: you can redistribute it and/or modify

4
rigcontrol.h
Unescape View File

@ -214,8 +214,8 @@ struct RIGPORTINFO
{ {
int PortType; // ICOM, Yaesu, Etc int PortType; // ICOM, Yaesu, Etc
int YaesuVariant; // Yaesu seems to have lots of incompatible subtypes int YaesuVariant; // Yaesu seems to have lots of incompatible subtypes
char IOBASE[80]; char IOBASE[256];
char PTTIOBASE[80]; // Port for Hardware PTT - may be same as control port. char PTTIOBASE[256]; // Port for Hardware PTT - may be same as control port.
int SPEED; int SPEED;
char * HIDDevice; char * HIDDevice;
struct RIGINFO Rigs[10]; // Rigs off a port struct RIGINFO Rigs[10]; // Rigs off a port

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.