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

encryption fixes and debug improvements

Browse source
This commit is contained in:
Richard Frith-Macdonald 2021-06-03 14:59:09 +01:00
parent e9d3ba8179
commit 7ea49c252b
2 changed files with 47 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2021-06-03 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/GNUstepBase/GSTLS.h: New session ivar for I/O handle.
* Source/GSTLS.m: Report the I/O handle in debug logs so we can
more easily track which logs refer apply to the objects using a
session.
* Source/NSSocketPort.m: debug improvements plus fixes to the code
for initiating connections so that the initial port information is
reliably written to the handle.
2021-06-02 Gregory John Casamento <greg.casamento@gmail.com>

68
Source/NSSocketPort.m
View file

@ -806,8 +806,8 @@ static Class runLoopClass;
- (NSString*) description
{
return [NSString stringWithFormat: @"Handle (%d) to %@",
desc, GSPrivateSockaddrName(&sockAddr)];
return [NSString stringWithFormat: @"<Handle %p (%d) to %@>",
self, desc, GSPrivateSockaddrName(&sockAddr)];
}
- (int) descriptor
@ -951,7 +951,8 @@ static Class runLoopClass;
[self invalidate];
return;
}
res = 0; /* Interrupted - continue */
NSDebugMLLog(@"GSTcpHandle", @"read would block on %p", self);
return; /* Interrupted - continue */
}
NSDebugMLLog(@"GSTcpHandle", @"read %d bytes on %p", res, self);
rLength += res;
@ -1229,35 +1230,34 @@ static Class runLoopClass;
- (void) receivedEventWrite
{
if (state == GS_H_TRYCON) /* Connection attempt. */
if (GS_H_TRYCON == state) /* Connection attempt. */
{
int res = 0;
socklen_t len = sizeof(res);
if (getsockopt(desc, SOL_SOCKET, SO_ERROR, (char*)&res,
(OPTLEN*)&len) != 0)
if (nil == cData)
{
state = GS_H_UNCON;
NSLog(@"connect attempt failed - %@", [NSError _last]);
}
else if (res != 0)
{
state = GS_H_UNCON;
NSLog(@"connect attempt failed - %@", [NSError _systemError: res]);
}
else
{
unsigned l;
const void *b;
socklen_t len = sizeof(res);
/* We have established a new network (TCP/IP) connection and the
* first thing to do is send out port information (after setting
* up a TLS session if necessary).
*/
if (nil == cData)
{
if (getsockopt(desc, SOL_SOCKET, SO_ERROR, (char*)&res,
(OPTLEN*)&len) != 0)
{
state = GS_H_UNCON;
NSLog(@"connect attempt failed - %@", [NSError _last]);
}
else if (res != 0)
{
state = GS_H_UNCON;
NSLog(@"connect attempt failed - %@",
[NSError _systemError: res]);
}
else
{
NSSocketPort *p = [self recvPort];
/* We have established a new network (TCP/IP) connection and the
* first thing to do is send out port information (after setting
* up a TLS session if necessary).
*/
ASSIGN(cData, newDataWithEncodedPort(p));
cLength = 0;
@ -1266,17 +1266,23 @@ static Class runLoopClass;
DESTROY(session);
if (opts)
{
session = [[GSTLSSession alloc]
initWithOptions: opts
session = [[GSTLSSession alloc] initWithOptions: opts
direction: YES // as client
transport: self
push: GSTLSHandlePush
pull: GSTLSHandlePull];
NSDebugMLLog(@"GSTcpHandle",
@"%@ is connecting using %@", self, session);
}
#endif
}
b = [cData bytes];
l = [cData length];
}
}
if (GS_H_TRYCON == state)
{
unsigned l = [cData length];
const void *b = [cData bytes];
int len;
#if defined(HAVE_GNUTLS)
if (session)
@ -2387,6 +2393,8 @@ static Class tcpPortClass;
transport: handle
push: GSTLSHandlePush
pull: GSTLSHandlePull];
NSDebugMLLog(@"GSTcpHandle",
@"%@ is accepting using %@", handle, handle->session);
}
#endif
[self addHandle: handle forSend: NO];