Differences From Artifact [76d38f9e30]:
- File
src/OFTCPSocket+SOCKS5.m
— part of check-in
[c5ef582958]
at
2013-03-04 17:20:15
on branch trunk
— Replace BOOL with bool.
The only places where BOOL is left are those where they are required by
the ABI. (user: js, size: 2409) [annotate] [blame] [check-ins using]
To Artifact [8d47abae82]:
- File
src/OFTCPSocket+SOCKS5.m
— part of check-in
[3d16a30f41]
at
2013-06-22 12:12:36
on branch trunk
— Rework exceptions.
This mostly removes the argument for the class in which the exception
occurred. As backtraces were recently added for all platforms, the
passed class does not give any extra information on where the exception
occurred anymore.This also removes a few other arguments which were not too helpful. In
the past, the idea was to pass as many arguments as possible so that it
is easier to find the origin of the exception. However, as backtraces
are a much better way to find the origin, those are not useful anymore
and just make the exception more cumbersome to use. The rule is now to
only pass arguments that might help in recovering from the exception or
provide information that is otherwise not easily accessible. (user: js, size: 2352) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
36 37 38 39 40 41 42 |
length: 3];
[self readIntoBuffer: reply
exactLength: 2];
if (reply[0] != 5 || reply[1] != 0) {
[self close];
| | | | < < | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
length: 3];
[self readIntoBuffer: reply
exactLength: 2];
if (reply[0] != 5 || reply[1] != 0) {
[self close];
@throw [OFConnectionFailedException exceptionWithHost: host
port: port
socket: self];
}
wasWriteBufferEnabled = [self isWriteBufferEnabled];
[self setWriteBufferEnabled: true];
/* CONNECT request */
[self writeBuffer: request
|
| ︙ | ︙ | |||
62 63 64 65 66 67 68 |
[self setWriteBufferEnabled: wasWriteBufferEnabled];
[self readIntoBuffer: reply
exactLength: 4];
if (reply[0] != 5 || reply[1] != 0 || reply[2] != 0) {
[self close];
| | | | < < | | | < < | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 |
[self setWriteBufferEnabled: wasWriteBufferEnabled];
[self readIntoBuffer: reply
exactLength: 4];
if (reply[0] != 5 || reply[1] != 0 || reply[2] != 0) {
[self close];
@throw [OFConnectionFailedException exceptionWithHost: host
port: port
socket: self];
}
/* Skip the rest of the reply */
switch (reply[3]) {
case 1: /* IPv4 */
[self readIntoBuffer: reply
exactLength: 4];
break;
case 3: /* Domainname */
[self readIntoBuffer: reply
exactLength: [self readInt8]];
break;
case 4: /* IPv6 */
[self readIntoBuffer: reply
exactLength: 16];
break;
default:
[self close];
@throw [OFConnectionFailedException exceptionWithHost: host
port: port
socket: self];
}
[self readBigEndianInt16];
}
@end
|