6.0.23.59

This commit is contained in:
John Wiseman 2023-04-06 13:41:09 +01:00
parent f1bf68a545
commit 60ff21fb31
14 changed files with 44 additions and 14 deletions

View File

@ -1,6 +1,6 @@
#include <string.h>
#include <malloc.h>
#include <stdlib.h>
#ifndef WIN32

View File

@ -14714,7 +14714,7 @@ char * FormatSYNCMessage(CIRCUIT * conn, struct MsgInfo * Msg)
sprintf_s(Date, sizeof(Date), "%04d%02d%02d%02d%02d%02d",
tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
tm = gmtime(&Msg->datecreated);
tm = gmtime((time_t *)&Msg->datecreated);
sprintf_s(MsgTime, sizeof(Date), "%04d/%02d/%02d %02d:%02d",
tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min);

View File

@ -1153,6 +1153,7 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
// Fix TNC Emulator Monitoring (53)
// Fix attach and connect on Telnet port bug introduced in .55 (56)
// Fix stopping WinRPR TNC and Start/Stop UZ7HO TNCX on Linux (57)
// Fix stack size in beginthread for MAC
#define CKernel

View File

@ -12,10 +12,6 @@
#include "asmstrucs.h"
#ifndef WIN32
__asm__(".symver fcntl,fcntl@GLIBC_2.4");
#endif
BOOL CheckExcludeList(UCHAR * Call);
Dll int ConvFromAX25(unsigned char * incall,unsigned char * outcall);

View File

@ -1392,8 +1392,10 @@ void * InitializeExtDriver(PEXTPORTDATA PORTVEC)
_strupr(Value);
#ifndef FREEBSD
#ifndef MACBPQ
if (strstr(Value, "BPQETHER"))
return ETHERExtInit;
#endif
#endif
if (strstr(Value, "BPQAXIP"))
return AXIPExtInit;
@ -1587,6 +1589,7 @@ struct TNCINFO * TNC;
#include <time.h>
#include <sys/time.h>
#ifndef MACBPQ
#ifdef __MACH__
#include <mach/mach_time.h>
@ -1606,6 +1609,7 @@ int clock_gettime(int clk_id, struct timespec *t){
return 0;
}
#endif
#endif
int GetTickCount()
{

View File

@ -228,8 +228,12 @@ typedef struct _SERIAL_STATUS {
#endif
#ifndef WIN32
// #include <pty.h>
#ifdef MACBPQ
#include <util.h>
#endif
extern int posix_openpt (int __oflag);
extern int grantpt (int __fd);

View File

@ -10,8 +10,8 @@
#endif
#define KVers 6,0,23,58
#define KVerstring "6.0.23.58\0"
#define KVers 6,0,23,59
#define KVerstring "6.0.23.59\0"
#ifdef CKernel

View File

@ -68,6 +68,7 @@
// Fix History (31)
// Stop buffer overflow in History
// Allow /History to be shortened to /Hi (45)
// Fix extra r charater in Chat Config Web Page
#include "BPQChat.h"
#include "Dbghelp.h"

View File

@ -139,7 +139,30 @@ pthread_t _beginthread(void(*start_address)(), unsigned stack_size, VOID * argli
{
pthread_t thread;
if (pthread_create(&thread, NULL, (void * (*)(void *))start_address, (void*) arglist) != 0)
// Need to set stack size for Mac
int s, tnum, opt, num_threads;
struct thread_info *tinfo;
pthread_attr_t attr;
void *res;
s = pthread_attr_init(&attr);
if (s != 0)
{
perror("pthread_attr_init");
return 0;
}
if (stack_size > 0)
{
s = pthread_attr_setstacksize(&attr, stack_size);
if (s != 0)
{
perror("pthread_attr_setstacksize");
return 0;
}
}
if (pthread_create(&thread, &attr, (void * (*)(void *))start_address, (void*) arglist) != 0)
perror("New Thread");
else
pthread_detach(thread);

View File

@ -11,10 +11,7 @@ Stuff to make compiling on WINDOWS and LINUX easier
#include <ctype.h>
#include <string.h>
#include <time.h>
#ifndef MACBPQ
#include <malloc.h>
#include <stdlib.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>

Binary file not shown.

View File

@ -22,6 +22,7 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
// Normally uses a Raw socket, but that can't send to other apps on same machine.
// so can use a TAP device instead (or maybe as well??)
#ifndef MACBPQ
#include <stdio.h>
@ -496,3 +497,4 @@ static int ProcessLine(char * buf, int Port, BOOL CheckPort)
}
#endif

View File

@ -16,6 +16,8 @@
#define PNG_INTERNAL
#include "png.h"
void Myabort();
static void /* PRIVATE */
png_default_error PNGARG((png_structp png_ptr,
png_const_charp error_message));

View File

@ -1437,7 +1437,7 @@ char * ChatConfigtxt()
"seperared by |, eg NOTCHT:G8BPQ-4|C 3 GM8BPQ-9|CHAT"
"<br><br>The Callsign of the Chat Node is not defined here - it is obtained from the bpq32.cfg APPLICATION line corresponding to the Chat Appl Number.<br>\r\n"
"<br></div>r\n"
"<br></div>\n"
"&nbsp;<textarea cols=\"70\" rows=\"5\" name=\"nodes\">%s</textarea><br>\r\n"
"<br>\r\n"
"&nbsp;Map Position <input onchange=CheckLen() maxlength=\"80\" value=\"%s\" size=\"20\" name=\"Posn\" id=pos> <br>\r\n"