@@ -80,11 +80,11 @@ _block(_exception); else { #endif if ([_delegate respondsToSelector: @selector(socket:didConnectToHost:port:exception:)]) - [_delegate socket: _socket + [_delegate socket: _socket didConnectToHost: _host port: _port exception: _exception]; #ifdef OF_HAVE_BLOCKS } @@ -102,12 +102,11 @@ _exception = [exception retain]; [self didConnect]; return; } - data = [OFData dataWithItems: "\x05\x01\x00" - count: 3]; + data = [OFData dataWithItems: "\x05\x01\x00" count: 3]; _SOCKS5State = OF_SOCKS5_STATE_SEND_AUTHENTICATION; [_socket asyncWriteData: data runLoopMode: [OFRunLoop currentRunLoop].currentMode]; } @@ -146,26 +145,22 @@ } [_request release]; _request = [[OFMutableData alloc] init]; - [_request addItems: "\x05\x01\x00\x03" - count: 4]; + [_request addItems: "\x05\x01\x00\x03" count: 4]; hostLength = (uint8_t)_host.UTF8StringLength; [_request addItem: &hostLength]; - [_request addItems: _host.UTF8String - count: hostLength]; + [_request addItems: _host.UTF8String count: hostLength]; port[0] = _port >> 8; port[1] = _port & 0xFF; - [_request addItems: port - count: 2]; + [_request addItems: port count: 2]; _SOCKS5State = OF_SOCKS5_STATE_SEND_REQUEST; - [_socket asyncWriteData: _request - runLoopMode: runLoopMode]; + [_socket asyncWriteData: _request runLoopMode: runLoopMode]; return false; case OF_SOCKS5_STATE_READ_RESPONSE: response = buffer; if (response[0] != 5 || response[2] != 0) {