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 [2efb3cbab4]:
- File
src/OFTCPSocket.m
— part of check-in
[4e763857b8]
at
2024-10-28 23:46:55
on branch mptcp
— Initial MPTCP implementation for macOS/iOS
Unfortunately, I haven't found a way to reliably check if a connection
is using MPTCP on macOS/iOS yet, so -[usesMPTCP] always returns false
for now. In my tests with SIOCGCONNINFO, the flags were always 0. (user: js, size: 14627) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
48 49 50 51 52 53 54 55 56 57 58 59 60 61 |
#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;
| > > > > > > > > > > > > > > > | 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 |
#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,
flagUseConnectX = 2
};
static const OFRunLoopMode connectRunLoopMode =
@"OFTCPSocketConnectRunLoopMode";
static OFString *defaultSOCKS5Host = nil;
static uint16_t defaultSOCKS5Port = 1080;
|
| ︙ | ︙ | |||
139 140 141 142 143 144 145 |
- (bool)of_createSocketForAddress: (const OFSocketAddress *)address
errNo: (int *)errNo
{
#if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
int flags;
#endif
| | | > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | > > > > > > > > > > > > > > > > | > > | | | | | | 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 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 |
- (bool)of_createSocketForAddress: (const OFSocketAddress *)address
errNo: (int *)errNo
{
#if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
int flags;
#endif
if (_socket != OFInvalidSocketHandle) {
@throw [OFAlreadyOpenException exceptionWithObject: self];
}
#if defined(OF_LINUX)
if (_flags & flagUseMPTCP) {
if ((_socket = socket(
((struct sockaddr *)&address->sockaddr)->sa_family,
SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_MPTCP)) ==
OFInvalidSocketHandle) {
if ((_socket = socket(
((struct sockaddr *)&address->sockaddr)->sa_family,
SOCK_STREAM | SOCK_CLOEXEC, 0)) ==
OFInvalidSocketHandle) {
*errNo = _OFSocketErrNo();
return false;
}
}
} else
#elif defined(OF_MACOS) || defined(OF_IOS)
if (_flags & flagUseMPTCP) {
if ((_socket = socket(AF_MULTIPATH, SOCK_STREAM | SOCK_CLOEXEC,
IPPROTO_TCP)) != OFInvalidSocketHandle)
_flags |= flagUseConnectX;
else {
if ((_socket = socket(
((struct sockaddr *)&address->sockaddr)->sa_family,
SOCK_STREAM | SOCK_CLOEXEC, 0)) ==
OFInvalidSocketHandle) {
*errNo = _OFSocketErrNo();
return false;
}
_flags &= ~flagUseConnectX;
}
} else
#endif
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 (_socket == OFInvalidSocketHandle) {
@throw [OFNotOpenException exceptionWithObject: self];
}
#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); | > > | | > > > > > > > > > > > > > > > > | | | | | | | 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 |
socketAddresses = [[OFThread DNSResolver]
resolveAddressesForHost: host
addressFamily: OFSocketAddressFamilyAny];
address = *(OFSocketAddress *)[socketAddresses itemAtIndex: 0];
OFSocketAddressSetIPPort(&address, port);
#ifdef OF_LINUX
if (_flags & flagUseMPTCP) {
if ((_socket = socket(
((struct sockaddr *)&address.sockaddr)->sa_family,
SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_MPTCP)) ==
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()];
}
} else
#endif
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
| > > > > > > > > > > > > > > > > > > > > > | 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 |
@throw [OFGetOptionFailedException
exceptionWithObject: self
errNo: _OFSocketErrNo()];
return !v;
}
#endif
- (void)setUsesMPTCP: (bool)usesMPTCP
{
if (usesMPTCP)
_flags |= flagUseMPTCP;
else
_flags &= ~flagUseMPTCP;
}
- (bool)usesMPTCP
{
#ifdef OF_LINUX
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
|