Differences From Artifact [5c97e81fe5]:
- File src/OFTCPSocket.m — part of check-in [9611851a89] at 2024-10-27 18:10:06 on branch trunk — OFTCPSocket: Rework blocks-based API (user: js, size: 12208) [annotate] [blame] [check-ins using]
To Artifact [31cc0fb260]:
- File
src/OFTCPSocket.m
— part of check-in
[1abe178915]
at
2024-10-30 21:11:27
on branch mptcp
— Always use AF_INET6 for MPTCP on Linux
This allows using IPv4 and IPv6 for the same connection. (user: js, size: 15414) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | #import "OFAlreadyOpenException.h" #import "OFBindIPSocketFailedException.h" #import "OFGetOptionFailedException.h" #import "OFNotImplementedException.h" #import "OFNotOpenException.h" #import "OFSetOptionFailedException.h" static const OFRunLoopMode connectRunLoopMode = @"OFTCPSocketConnectRunLoopMode"; static OFString *defaultSOCKS5Host = nil; static uint16_t defaultSOCKS5Port = 1080; @interface OFTCPSocket () <OFAsyncIPSocketConnecting> @end @interface OFTCPSocketConnectDelegate: OFObject <OFTCPSocketDelegate> { @public | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 48 49 50 51 52 53 54 55 56 57 58 59 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 96 97 98 99 100 101 102 103 | #import "OFAlreadyOpenException.h" #import "OFBindIPSocketFailedException.h" #import "OFGetOptionFailedException.h" #import "OFNotImplementedException.h" #import "OFNotOpenException.h" #import "OFSetOptionFailedException.h" #ifdef OF_LINUX # include <linux/mptcp.h> #endif #if defined(OF_MACOS) || defined(OF_IOS) # ifndef AF_MULTIPATH # define AF_MULTIPATH 39 # endif #endif enum { flagUseMPTCP = 1, flagMapIPv4 = 2, flagUseConnectX = 4 }; static const OFRunLoopMode connectRunLoopMode = @"OFTCPSocketConnectRunLoopMode"; static OFString *defaultSOCKS5Host = nil; static uint16_t defaultSOCKS5Port = 1080; #if defined(OF_LINUX) && defined(IPPROTO_MPTCP) static OFSocketAddress mapIPv4(const OFSocketAddress *IPv4Address) { OFSocketAddress IPv6Address = { .family = OFSocketAddressFamilyIPv6, .length = sizeof(struct sockaddr_in6) }; IPv6Address.sockaddr.in6.sin6_family = AF_INET6; IPv6Address.sockaddr.in6.sin6_port = IPv4Address->sockaddr.in.sin_port; memcpy(&IPv6Address.sockaddr.in6.sin6_addr.s6_addr[12], &IPv4Address->sockaddr.in.sin_addr.s_addr, 4); IPv6Address.sockaddr.in6.sin6_addr.s6_addr[10] = 0xFF; IPv6Address.sockaddr.in6.sin6_addr.s6_addr[11] = 0xFF; return IPv6Address; } #endif @interface OFTCPSocket () <OFAsyncIPSocketConnecting> @end @interface OFTCPSocketConnectDelegate: OFObject <OFTCPSocketDelegate> { @public |
︙ | ︙ | |||
142 143 144 145 146 147 148 | #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) int flags; #endif if (_socket != OFInvalidSocketHandle) @throw [OFAlreadyOpenException exceptionWithObject: self]; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | > > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > | | | | | | 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 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) int flags; #endif if (_socket != OFInvalidSocketHandle) @throw [OFAlreadyOpenException exceptionWithObject: self]; #if defined(OF_LINUX) && defined(IPPROTO_MPTCP) if (_flags & flagUseMPTCP) { /* * For MPTCP sockets, we always use AF_INET6, so that IPv4 and * IPv6 can both be used for a single connection. */ _socket = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_MPTCP); if (_socket != OFInvalidSocketHandle && address->family == OFSocketAddressFamilyIPv4) _flags |= flagMapIPv4; else _flags &= ~flagMapIPv4; } #elif defined(OF_MACOS) || defined(OF_IOS) if (_flags & flagUseMPTCP) { _socket = socket(AF_MULTIPATH, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP); if (_socket != OFInvalidSocketHandle) _flags |= flagUseConnectX; else _flags &= ~flagUseConnectX; } #endif if (_socket == OFInvalidSocketHandle) { if ((_socket = socket( ((struct sockaddr *)&address->sockaddr)->sa_family, SOCK_STREAM | SOCK_CLOEXEC, 0)) == OFInvalidSocketHandle) { *errNo = _OFSocketErrNo(); return false; } } #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) if ((flags = fcntl(_socket, F_GETFD, 0)) != -1) fcntl(_socket, F_SETFD, flags | FD_CLOEXEC); #endif return true; } - (bool)of_connectSocketToAddress: (const OFSocketAddress *)address errNo: (int *)errNo { #if defined(OF_LINUX) && defined(IPPROTO_MPTCP) OFSocketAddress mappedIPv4; #endif if (_socket == OFInvalidSocketHandle) { @throw [OFNotOpenException exceptionWithObject: self]; } #if defined(OF_LINUX) && defined(IPPROTO_MPTCP) if (_flags & flagMapIPv4) { /* * For MPTCP sockets, we always use AF_INET6, so that IPv4 and * IPv6 can both be used for a single connection. */ mappedIPv4 = mapIPv4(address); address = &mappedIPv4; } #endif #if defined(OF_MACOS) || defined(OF_IOS) if (_flags & flagUseConnectX) { sa_endpoints_t endpoints = { .sae_dstaddr = (struct sockaddr *)&address->sockaddr, .sae_dstaddrlen = address->length }; if (connectx(_socket, &endpoints, SAE_ASSOCID_ANY, 0, NULL, 0, NULL, NULL) != 0) { *errNo = _OFSocketErrNo(); return false; } } else #endif /* * Cast needed for AmigaOS, where the argument is declared * non-const. */ if (connect(_socket, (struct sockaddr *)&address->sockaddr, address->length) != 0) { *errNo = _OFSocketErrNo(); return false; } return true; } - (void)of_closeSocket { closesocket(_socket); |
︙ | ︙ | |||
344 345 346 347 348 349 350 | socketAddresses = [[OFThread DNSResolver] resolveAddressesForHost: host addressFamily: OFSocketAddressFamilyAny]; address = *(OFSocketAddress *)[socketAddresses itemAtIndex: 0]; OFSocketAddressSetIPPort(&address, port); | > > > > > > > > > > > > > > > > | | | | | | | | | 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 | socketAddresses = [[OFThread DNSResolver] resolveAddressesForHost: host addressFamily: OFSocketAddressFamilyAny]; address = *(OFSocketAddress *)[socketAddresses itemAtIndex: 0]; OFSocketAddressSetIPPort(&address, port); #if defined(OF_LINUX) && defined(IPPROTO_MPTCP) if (_flags & flagUseMPTCP) { /* * For MPTCP sockets, we always use AF_INET6, so that IPv4 and * IPv6 can both be used for a single connection. */ _socket = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_MPTCP); if (_socket != OFInvalidSocketHandle && address.family == OFSocketAddressFamilyIPv4) address = mapIPv4(&address); } #endif if (_socket == OFInvalidSocketHandle) if ((_socket = socket( ((struct sockaddr *)&address.sockaddr)->sa_family, SOCK_STREAM | SOCK_CLOEXEC, 0)) == OFInvalidSocketHandle) @throw [OFBindIPSocketFailedException exceptionWithHost: host port: port socket: self errNo: _OFSocketErrNo()]; _canBlock = true; #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) if ((flags = fcntl(_socket, F_GETFD, 0)) != -1) fcntl(_socket, F_SETFD, flags | FD_CLOEXEC); #endif |
︙ | ︙ | |||
507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 | @throw [OFGetOptionFailedException exceptionWithObject: self errNo: _OFSocketErrNo()]; return !v; } #endif - (void)close { #ifdef OF_WII _port = 0; #endif [super close]; } @end | > > > > > > > > > > > > > > > > > > > > > | 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 | @throw [OFGetOptionFailedException exceptionWithObject: self errNo: _OFSocketErrNo()]; return !v; } #endif - (void)setUsesMPTCP: (bool)usesMPTCP { if (usesMPTCP) _flags |= flagUseMPTCP; else _flags &= ~flagUseMPTCP; } - (bool)usesMPTCP { #if defined(OF_LINUX) && defined(SOL_MPTCP) && defined(MPTCP_INFO) struct mptcp_info info; socklen_t infoLen = (socklen_t)sizeof(info); if (getsockopt(_socket, SOL_MPTCP, MPTCP_INFO, &info, &infoLen) != -1) return true; #endif return false; } - (void)close { #ifdef OF_WII _port = 0; #endif [super close]; } @end |