Differences From Artifact [7120aa762e]:
- File src/OFRunLoop.m — part of check-in [0509d7a844] at 2019-01-03 19:13:03 on branch trunk — Update copyright (user: js, size: 28155) [annotate] [blame] [check-ins using]
To Artifact [f76ad8e6f6]:
- File
src/OFRunLoop.m
— part of check-in
[ab89c47f42]
at
2019-01-07 22:59:58
on branch trunk
— Partially fix sockets on Nintendo 3DS/Wii
This does not fully fix it yet, but at least the socket tests in the
test suite pass on 3DS now. (user: js, size: 28332) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 |
# endif
OFString *_string;
of_string_encoding_t _encoding;
size_t _writtenLength;
}
@end
@interface OFRunLoop_ConnectQueueItem: OFRunLoop_QueueItem
@end
@interface OFRunLoop_AcceptQueueItem: OFRunLoop_QueueItem
{
@public
# ifdef OF_HAVE_BLOCKS
of_tcp_socket_async_accept_block_t _block;
# endif
| > > | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 |
# endif
OFString *_string;
of_string_encoding_t _encoding;
size_t _writtenLength;
}
@end
# if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
@interface OFRunLoop_ConnectQueueItem: OFRunLoop_QueueItem
@end
# endif
@interface OFRunLoop_AcceptQueueItem: OFRunLoop_QueueItem
{
@public
# ifdef OF_HAVE_BLOCKS
of_tcp_socket_async_accept_block_t _block;
# endif
|
| ︙ | ︙ | |||
598 599 600 601 602 603 604 605 606 607 608 609 610 611 |
[_block release];
# endif
[super dealloc];
}
@end
@implementation OFRunLoop_ConnectQueueItem
- (bool)handleObject: (id)object
{
id exception = nil;
int errNo;
if ((errNo = [object of_socketError]) != 0)
| > | 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 |
[_block release];
# endif
[super dealloc];
}
@end
# if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
@implementation OFRunLoop_ConnectQueueItem
- (bool)handleObject: (id)object
{
id exception = nil;
int errNo;
if ((errNo = [object of_socketError]) != 0)
|
| ︙ | ︙ | |||
619 620 621 622 623 624 625 626 627 628 629 630 631 632 |
@selector(of_socketDidConnect:exception:)])
[_delegate of_socketDidConnect: object
exception: exception];
return false;
}
@end
@implementation OFRunLoop_AcceptQueueItem
- (bool)handleObject: (id)object
{
OFTCPSocket *acceptedSocket;
id exception = nil;
| > | 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 |
@selector(of_socketDidConnect:exception:)])
[_delegate of_socketDidConnect: object
exception: exception];
return false;
}
@end
# endif
@implementation OFRunLoop_AcceptQueueItem
- (bool)handleObject: (id)object
{
OFTCPSocket *acceptedSocket;
id exception = nil;
|
| ︙ | ︙ | |||
939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 |
# endif
queueItem->_string = [string copy];
queueItem->_encoding = encoding;
QUEUE_ITEM
}
+ (void)of_addAsyncConnectForTCPSocket: (OFTCPSocket *)stream
mode: (of_run_loop_mode_t)mode
delegate: (id <OFTCPSocketDelegate_Private>)
delegate
{
NEW_WRITE(OFRunLoop_ConnectQueueItem, stream, mode)
queueItem->_delegate = [delegate retain];
QUEUE_ITEM
}
+ (void)of_addAsyncAcceptForTCPSocket: (OFTCPSocket *)stream
mode: (of_run_loop_mode_t)mode
# ifdef OF_HAVE_BLOCKS
block: (of_tcp_socket_async_accept_block_t)block
# endif
delegate: (id <OFTCPSocketDelegate>)delegate
| > > | 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 |
# endif
queueItem->_string = [string copy];
queueItem->_encoding = encoding;
QUEUE_ITEM
}
# if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
+ (void)of_addAsyncConnectForTCPSocket: (OFTCPSocket *)stream
mode: (of_run_loop_mode_t)mode
delegate: (id <OFTCPSocketDelegate_Private>)
delegate
{
NEW_WRITE(OFRunLoop_ConnectQueueItem, stream, mode)
queueItem->_delegate = [delegate retain];
QUEUE_ITEM
}
# endif
+ (void)of_addAsyncAcceptForTCPSocket: (OFTCPSocket *)stream
mode: (of_run_loop_mode_t)mode
# ifdef OF_HAVE_BLOCKS
block: (of_tcp_socket_async_accept_block_t)block
# endif
delegate: (id <OFTCPSocketDelegate>)delegate
|
| ︙ | ︙ |