gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor thread safety fix

Browse source
This commit is contained in:
Richard Frith-Macdonald 2021-05-31 14:27:42 +01:00
parent e42d9fdc6b
commit 29f76a5cba
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Source/NSSocketPort.m
View file

@ -126,6 +126,7 @@ static uint32_t maxDataLength = 32 * 1024 * 1024;
/* Options for TLS encryption of connections
*/
static NSDictionary *tlsOptions;
static NSLock *tlsLock;
#if 0
#define M_LOCK(X) {NSDebugMLLog(@"GSTcpHandleLock",@"lock %@ in %@",X,[NSThread currentThread]); [X lock];}
@ -546,6 +547,8 @@ static Class runLoopClass;
{
if (self == [GSTcpHandle class])
{
tlsLock = [NSLock new];
[[NSObject leakAt: &tlsLock] release];
#ifdef _WIN32
WORD wVersionRequested;
WSADATA wsaData;
@ -1888,7 +1891,12 @@ static Class tcpPortClass;
NSMapInsert(thePorts, (void*)aHost, (void*)port);
NSDebugMLLog(@"NSPort", @"Created speaking port: %@", port);
}
[port setOptionsForTLS: tlsOptions];
if (tlsOptions != nil)
{
[tlsLock lock];
[port setOptionsForTLS: tlsOptions];
[tlsLock unlock];
}
}
else
{
@ -1903,7 +1911,12 @@ static Class tcpPortClass;
+ (void) setOptionsForTLS: (NSDictionary*)options
{
ASSIGNCOPY(tlsOptions, options);
if (options != tlsOptions)
{
[tlsLock lock];
ASSIGNCOPY(tlsOptions, options);
[tlsLock unlock];
}
}
- (void) addHandle: (GSTcpHandle*)handle forSend: (BOOL)send