Differences From Artifact [b7640aefbf]:
- File
src/OFTCPSocket.m
— part of check-in
[4d9a641d87]
at
2012-09-19 23:02:02
on branch trunk
— Make async I/O possible without blocks.
Async connecting is still missing. (user: js, size: 13089) [annotate] [blame] [check-ins using]
To Artifact [0e43bc61fd]:
- File src/OFTCPSocket.m — part of check-in [4f149012e9] at 2012-09-19 23:57:01 on branch trunk — Make async connecting possible without blocks. (user: js, size: 15495) [annotate] [blame] [check-ins using]
| ︙ | |||
72 73 74 75 76 77 78 79 80 81 82 83 84 85 | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
void _references_to_categories_of_OFTCPSocket(void)
{
_OFTCPSocket_SOCKS5_reference = 1;
}
static OFString *defaultSOCKS5Host = nil;
static uint16_t defaultSOCKS5Port = 1080;
@interface OFTCPSocket_ConnectThread: OFThread
{
OFThread *sourceThread;
OFTCPSocket *sock;
OFString *host;
uint16_t port;
id target;
SEL selector;
#ifdef OF_HAVE_BLOCKS
of_tcpsocket_async_connect_block_t connectBlock;
#endif
}
- initWithSourceThread: (OFThread*)sourceThread
socket: (OFTCPSocket*)socket
host: (OFString*)host
port: (uint16_t)port
target: (id)target
selector: (SEL)selector;
#ifdef OF_HAVE_BLOCKS
- initWithSourceThread: (OFThread*)sourceThread
socket: (OFTCPSocket*)socket
host: (OFString*)host
port: (uint16_t)port
block: (of_tcpsocket_async_connect_block_t)block;
#endif
@end
@implementation OFTCPSocket_ConnectThread
- initWithSourceThread: (OFThread*)sourceThread_
socket: (OFTCPSocket*)sock_
host: (OFString*)host_
port: (uint16_t)port_
target: (id)target_
selector: (SEL)selector_
{
self = [super init];
@try {
sourceThread = [sourceThread_ retain];
sock = [sock_ retain];
host = [host_ copy];
port = port_;
target = [target_ retain];
selector = selector_;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
#ifdef OF_HAVE_BLOCKS
- initWithSourceThread: (OFThread*)sourceThread_
socket: (OFTCPSocket*)sock_
host: (OFString*)host_
port: (uint16_t)port_
block: (of_tcpsocket_async_connect_block_t)block_
{
self = [super init];
@try {
sourceThread = [sourceThread_ retain];
sock = [sock_ retain];
host = [host_ copy];
port = port_;
connectBlock = [block_ copy];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
#endif
- (void)dealloc
{
[sourceThread release];
[sock release];
[host release];
[target release];
#ifdef OF_HAVE_BLOCKS
[connectBlock release];
#endif
[super dealloc];
}
- (void)didConnect
{
[self join];
#ifdef OF_HAVE_BLOCKS
if (connectBlock != NULL)
connectBlock(sock);
else {
#endif
void (*func)(id, SEL, OFTCPSocket*) =
(void(*)(id, SEL, OFTCPSocket*))[target
methodForSelector: selector];
func(target, selector, sock);
#ifdef OF_HAVE_BLOCKS
}
#endif
}
- (id)main
{
void *pool = objc_autoreleasePoolPush();
[sock connectToHost: host
port: port];
[self performSelector: @selector(didConnect)
onThread: sourceThread
waitUntilDone: NO];
objc_autoreleasePoolPop(pool);
return nil;
}
@end
@implementation OFTCPSocket
#if defined(OF_THREADS) && !defined(HAVE_THREADSAFE_GETADDRINFO)
+ (void)initialize
{
if (self == [OFTCPSocket class])
mutex = [[OFMutex alloc] init];
|
| ︙ | |||
285 286 287 288 289 290 291 292 293 294 295 296 297 298 | 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 | + + + + + + + + + + + + + + + + + + - - + - - - + - - - - + + + - - - - - - - - - - - - - + |
host: host
port: port];
if (SOCKS5Host != nil)
[self OF_SOCKS5ConnectToHost: destinationHost
port: destinationPort];
}
- (void)asyncConnectToHost: (OFString*)host
port: (uint16_t)port
target: (id)target
selector: (SEL)selector
{
void *pool = objc_autoreleasePoolPush();
[[[[OFTCPSocket_ConnectThread alloc]
initWithSourceThread: [OFThread currentThread]
socket: self
host: host
port: port
target: target
selector: selector] autorelease] start];
objc_autoreleasePoolPop(pool);
}
#ifdef OF_HAVE_BLOCKS
- (void)asyncConnectToHost: (OFString*)host
port: (uint16_t)port
block: (of_tcpsocket_async_connect_block_t)block
{
void *pool = objc_autoreleasePoolPush();
|
| ︙ |