Differences From Artifact [4fe5e359bb]:
- File
src/OFTCPSocket+SOCKS5.m
— part of check-in
[c658e97994]
at
2017-05-21 20:03:06
on branch trunk
— Cast several socket-related arguments to void *
This is required to make it work on MorphOS with -noixemul, as socket
functions take UBYTE * arguments instead then, resulting in a warning
about signedness because char is signed. (user: js, size: 3472) [annotate] [blame] [check-ins using]
To Artifact [f778008a7d]:
- File
src/OFTCPSocket+SOCKS5.m
— part of check-in
[4f36894ce7]
at
2017-06-05 17:36:28
on branch trunk
— Clean up exceptions a little
This removes several initializers that omitted the errNo. Removing those
forces to think about whether there is a meaningful errNo to set instead
of just omitting it. (user: js, size: 4130) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "OFTCPSocket+SOCKS5.h" #import "OFDataArray.h" #import "OFConnectionFailedException.h" #import "OFOutOfRangeException.h" #import "OFReadFailedException.h" | > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <errno.h> #import "OFTCPSocket+SOCKS5.h" #import "OFDataArray.h" #import "OFConnectionFailedException.h" #import "OFOutOfRangeException.h" #import "OFReadFailedException.h" |
| ︙ | ︙ | |||
72 73 74 75 76 77 78 |
/* 5 1 0 -> no authentication */
send_or_exception(self, _socket, request, 3);
recv_exact(self, _socket, reply, 2);
if (reply[0] != 5 || reply[1] != 0) {
[self close];
| | > | | > | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 |
/* 5 1 0 -> no authentication */
send_or_exception(self, _socket, request, 3);
recv_exact(self, _socket, reply, 2);
if (reply[0] != 5 || reply[1] != 0) {
[self close];
@throw [OFConnectionFailedException
exceptionWithHost: host
port: port
socket: self
errNo: EPROTONOSUPPORT];
}
/* CONNECT request */
pool = objc_autoreleasePoolPush();
connectRequest = [OFDataArray dataArray];
[connectRequest addItems: request
|
| ︙ | ︙ | |||
104 105 106 107 108 109 110 | send_or_exception(self, _socket, [connectRequest items], (int)[connectRequest count]); objc_autoreleasePoolPop(pool); recv_exact(self, _socket, reply, 4); | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | > | | > | 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 |
send_or_exception(self, _socket,
[connectRequest items], (int)[connectRequest count]);
objc_autoreleasePoolPop(pool);
recv_exact(self, _socket, reply, 4);
if (reply[0] != 5 || reply[2] != 0) {
[self close];
@throw [OFConnectionFailedException
exceptionWithHost: host
port: port
socket: self
errNo: EPROTONOSUPPORT];
}
if (reply[1] != 0) {
int errNo;
[self close];
switch (reply[1]) {
case 0x02:
errNo = EACCES;
break;
case 0x03:
errNo = ENETUNREACH;
break;
case 0x04:
errNo = EHOSTUNREACH;
break;
case 0x05:
errNo = ECONNREFUSED;
break;
case 0x06:
errNo = ETIMEDOUT;
break;
case 0x07:
errNo = EPROTONOSUPPORT;
break;
case 0x08:
errNo = EAFNOSUPPORT;
break;
default:
errNo = 0;
break;
}
@throw [OFConnectionFailedException exceptionWithHost: host
port: port
socket: self
errNo: errNo];
}
/* Skip the rest of the reply */
switch (reply[3]) {
case 1: /* IPv4 */
recv_exact(self, _socket, reply, 4);
break;
case 3: /* Domain name */
recv_exact(self, _socket, reply, 1);
recv_exact(self, _socket, reply, reply[0]);
break;
case 4: /* IPv6 */
recv_exact(self, _socket, reply, 16);
break;
default:
[self close];
@throw [OFConnectionFailedException
exceptionWithHost: host
port: port
socket: self
errNo: EPROTONOSUPPORT];
}
recv_exact(self, _socket, reply, 2);
}
@end
|