Overview
| Comment: | Rename OFIPSocketAsyncConnector |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
24ff63b586a0293dd47e19a21eabf334 |
| User & Date: | js on 2022-11-06 20:36:11 |
| Other Links: | manifest | tags |
Context
|
2022-11-06
| ||
| 21:19 | Work around an ICE in Clang 3.7.0 on Windows/x86 (check-in: 5c0117205d user: js tags: trunk) | |
| 20:36 | Rename OFIPSocketAsyncConnector (check-in: 24ff63b586 user: js tags: trunk) | |
| 20:31 | OFDatagramSocket: Make sender nullable (check-in: 6ed8be900e user: js tags: trunk) | |
Changes
Modified src/Makefile from [90eb2c6ebd] to [47fba670b3].
| ︙ | ︙ | |||
209 210 211 212 213 214 215 |
OFSubarray.m \
OFUTF8String.m \
${LIBBASES_M} \
${RUNTIME_AUTORELEASE_M} \
${RUNTIME_INSTANCE_M} \
${UNICODE_M}
SRCS_FILES += OFFileURIHandler.m
| > | < | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 |
OFSubarray.m \
OFUTF8String.m \
${LIBBASES_M} \
${RUNTIME_AUTORELEASE_M} \
${RUNTIME_INSTANCE_M} \
${UNICODE_M}
SRCS_FILES += OFFileURIHandler.m
SRCS_SOCKETS += OFAsyncIPSocketConnector.m \
OFDNSResolverSettings.m \
${OF_EPOLL_KERNEL_EVENT_OBSERVER_M} \
OFHTTPURIHandler.m \
OFHostAddressResolver.m \
OFKernelEventObserver.m \
${OF_KQUEUE_KERNEL_EVENT_OBSERVER_M} \
${OF_POLL_KERNEL_EVENT_OBSERVER_M} \
${OF_SELECT_KERNEL_EVENT_OBSERVER_M} \
OFTCPSocketSOCKS5Connector.m
SRCS_WINDOWS += platform/Windows/OFWin32ConsoleStdIOStream.m \
versioninfo.rc
|
| ︙ | ︙ |
Renamed and modified src/OFIPSocketAsyncConnector.h [248ffd2ce4] to src/OFAsyncIPSocketConnector.h [00aff2415e].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 | #import "OFDNSResolver.h" #import "OFRunLoop.h" #import "OFRunLoop+Private.h" OF_ASSUME_NONNULL_BEGIN | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 |
#import "OFDNSResolver.h"
#import "OFRunLoop.h"
#import "OFRunLoop+Private.h"
OF_ASSUME_NONNULL_BEGIN
@protocol OFAsyncIPSocketConnecting
- (bool)of_createSocketForAddress: (const OFSocketAddress *)address
errNo: (int *)errNo;
- (bool)of_connectSocketToAddress: (const OFSocketAddress *)address
errNo: (int *)errNo;
- (void)of_closeSocket;
@end
@interface OFAsyncIPSocketConnector: OFObject <OFRunLoopConnectDelegate,
OFDNSResolverHostDelegate>
{
id _socket;
OFString *_host;
uint16_t _port;
id _Nullable _delegate;
id _Nullable _block;
|
| ︙ | ︙ |
Renamed and modified src/OFIPSocketAsyncConnector.m [ca32b06485] to src/OFAsyncIPSocketConnector.m [b9084cfb8c].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 | * file. */ #include "config.h" #include <errno.h> | | | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 |
* file.
*/
#include "config.h"
#include <errno.h>
#import "OFAsyncIPSocketConnector.h"
#import "OFData.h"
#import "OFTCPSocket.h"
#import "OFThread.h"
#import "OFTimer.h"
#import "OFConnectIPSocketFailedException.h"
#import "OFInvalidFormatException.h"
@implementation OFAsyncIPSocketConnector
- (instancetype)initWithSocket: (id)sock
host: (OFString *)host
port: (uint16_t)port
delegate: (id)delegate
block: (id)block
{
self = [super init];
|
| ︙ | ︙ |
Modified src/OFTCPSocket.m from [246d2d6fc1] to [bab73573da].
| ︙ | ︙ | |||
27 28 29 30 31 32 33 34 35 36 | #include <string.h> #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif #import "OFTCPSocket.h" #import "OFDNSResolver.h" #import "OFData.h" #import "OFDate.h" | > < | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | #include <string.h> #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif #import "OFTCPSocket.h" #import "OFAsyncIPSocketConnector.h" #import "OFDNSResolver.h" #import "OFData.h" #import "OFDate.h" #import "OFRunLoop.h" #import "OFRunLoop+Private.h" #import "OFSocket.h" #import "OFSocket+Private.h" #import "OFString.h" #import "OFTCPSocketSOCKS5Connector.h" #import "OFThread.h" |
| ︙ | ︙ | |||
52 53 54 55 56 57 58 |
static const OFRunLoopMode connectRunLoopMode =
@"OFTCPSocketConnectRunLoopMode";
static OFString *defaultSOCKS5Host = nil;
static uint16_t defaultSOCKS5Port = 1080;
| | | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 |
static const OFRunLoopMode connectRunLoopMode =
@"OFTCPSocketConnectRunLoopMode";
static OFString *defaultSOCKS5Host = nil;
static uint16_t defaultSOCKS5Port = 1080;
@interface OFTCPSocket () <OFAsyncIPSocketConnecting>
@end
@interface OFTCPSocketConnectDelegate: OFObject <OFTCPSocketDelegate>
{
@public
bool _done;
id _exception;
|
| ︙ | ︙ | |||
232 233 234 235 236 237 238 | #endif ] autorelease]; host = _SOCKS5Host; port = _SOCKS5Port; } else delegate = _delegate; | | | 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 | #endif ] autorelease]; host = _SOCKS5Host; port = _SOCKS5Port; } else delegate = _delegate; [[[[OFAsyncIPSocketConnector alloc] initWithSocket: self host: host port: port delegate: delegate block: NULL ] autorelease] startWithRunLoopMode: runLoopMode]; |
| ︙ | ︙ | |||
273 274 275 276 277 278 279 | port: port delegate: nil block: block] autorelease]; host = _SOCKS5Host; port = _SOCKS5Port; } | | | 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 | port: port delegate: nil block: block] autorelease]; host = _SOCKS5Host; port = _SOCKS5Port; } [[[[OFAsyncIPSocketConnector alloc] initWithSocket: self host: host port: port delegate: delegate block: (delegate == nil ? block : NULL)] autorelease] startWithRunLoopMode: runLoopMode]; |
| ︙ | ︙ |