master 24.50
John Wiseman 1 year ago
parent 4745452eb0
commit 46adaeaa05

@ -269,6 +269,8 @@ char FilesNames[4][100] = {"", "", "", ""};
char * Logs[4] = {"BBS", "CHAT", "TCP", "DEBUG"}; char * Logs[4] = {"BBS", "CHAT", "TCP", "DEBUG"};
extern struct SEM ConfigSEM;
BOOL OpenLogfile(int Flags) BOOL OpenLogfile(int Flags)
{ {
@ -2209,7 +2211,7 @@ BOOL CheckValidCall(char * From)
if (DontCheckFromCall) if (DontCheckFromCall)
return TRUE; return TRUE;
if (strcmp(From, "SYSOP") == 0 || strcmp(From, "SYSTEM") == 0 || if (strcmp(From, "SYSOP") == 0 || strcmp(From, "SYSTEM") == 0 || strcmp(From, "SERVIC") == 0 ||
strcmp(From, "IMPORT") == 0 || strcmp(From, "SMTP:") == 0 || strcmp(From, "RMS:") == 0) strcmp(From, "IMPORT") == 0 || strcmp(From, "SMTP:") == 0 || strcmp(From, "RMS:") == 0)
return TRUE; return TRUE;
@ -9531,6 +9533,8 @@ VOID SaveConfig(char * ConfigName)
char FBBString[8192]= ""; char FBBString[8192]= "";
FBBFilter * p = Filters; FBBFilter * p = Filters;
char * ptr = FBBString; char * ptr = FBBString;
GetSemaphore(&ConfigSEM, 60);
if (configSaved == 0) if (configSaved == 0)
{ {
@ -9954,10 +9958,11 @@ VOID SaveConfig(char * ConfigName)
#ifdef LINBPQ #ifdef LINBPQ
if(! config_write_file(&cfg,"/dev/shm/linmail.cfg.temp" )) if(!config_write_file(&cfg,"/dev/shm/linmail.cfg.temp" ))
{ {
print("Error while writing file.\n"); print("Error while writing file.\n");
config_destroy(&cfg); config_destroy(&cfg);
FreeSemaphore(&ConfigSEM);
return; return;
} }
@ -9969,6 +9974,8 @@ VOID SaveConfig(char * ConfigName)
{ {
fprintf(stderr, "Error while writing file.\n"); fprintf(stderr, "Error while writing file.\n");
config_destroy(&cfg); config_destroy(&cfg);
FreeSemaphore(&ConfigSEM);
return; return;
} }
@ -9997,6 +10004,8 @@ VOID SaveConfig(char * ConfigName)
} }
#endif #endif
*/ */
FreeSemaphore(&ConfigSEM);
} }
int GetIntValue(config_setting_t * group, char * name) int GetIntValue(config_setting_t * group, char * name)

@ -1140,6 +1140,8 @@
// Rewrite PG server code on Lunux (41) // Rewrite PG server code on Lunux (41)
// Fix SendPToMultiple not stopping at Implied AT match (45) // Fix SendPToMultiple not stopping at Implied AT match (45)
// Log Our HA when checking for flood bulls (45) // Log Our HA when checking for flood bulls (45)
// Semaphore calls to SaveConfig
// Include SERVIC as valid from call (for Winlink Service messages) (49)
#include "bpqmail.h" #include "bpqmail.h"
#include "winstdint.h" #include "winstdint.h"

@ -1229,7 +1229,7 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
// Add support for Qtsm Mgmt Interface (45) // Add support for Qtsm Mgmt Interface (45)
// NodeAPI improvements (46) // NodeAPI improvements (46)
// Add MQTT Interface (46) // Add MQTT Interface (46)
// Fix buffer leak in ARDOP codev(46) // Fix buffer leak in ARDOP code(46)
// Fix possible crash if MQTT not in use (47) // Fix possible crash if MQTT not in use (47)
// Add optional ATTACH time limit for VARA (48) // Add optional ATTACH time limit for VARA (48)
// API format fixes (48) // API format fixes (48)

@ -2838,12 +2838,6 @@ noFlip3:
RESET2(LINK); // RESET ALL FLAGS RESET2(LINK); // RESET ALL FLAGS
toCall[ConvFromAX25(LINK->LINKCALL, toCall)] = 0;
fromCall[ConvFromAX25(LINK->OURCALL, fromCall)] = 0;
hookL2SessionAttempt(CONNECTPORT, fromCall, toCall, LINK);
if (CMD->String[0] == 'N' && SUPPORT2point2) if (CMD->String[0] == 'N' && SUPPORT2point2)
LINK->L2STATE = 1; // New (2.2) send XID LINK->L2STATE = 1; // New (2.2) send XID
else else

File diff suppressed because it is too large Load Diff

@ -43,6 +43,7 @@ struct SEM AllocSemaphore = {0, 0};
struct SEM ConSemaphore = {0, 0}; struct SEM ConSemaphore = {0, 0};
struct SEM Semaphore = {0, 0}; struct SEM Semaphore = {0, 0};
struct SEM OutputSEM = {0, 0}; struct SEM OutputSEM = {0, 0};
struct SEM ConfigSEM = {0, 0};
struct UserInfo ** UserRecPtr=NULL; struct UserInfo ** UserRecPtr=NULL;
int NumberofUsers=0; int NumberofUsers=0;

@ -10,8 +10,8 @@
#endif #endif
#define KVers 6,0,24,48 #define KVers 6,0,24,49
#define KVerstring "6.0.24.48\0" #define KVerstring "6.0.24.49\0"
#ifdef CKernel #ifdef CKernel

Loading…
Cancel
Save

Powered by TurnKey Linux.