Differences From Artifact [9f8d11c4a6]:
- File
src/OFTCPSocket.m
— part of check-in
[e36455441d]
at
2018-08-04 15:35:14
on branch trunk
— Use OF_HAVE_IPV6 instead of HAVE_IPV6
This has always been wrong. (user: js, size: 15491) [annotate] [blame] [check-ins using]
To Artifact [61b4b17037]:
- File src/OFTCPSocket.m — part of check-in [7de9d67be9] at 2018-08-04 16:23:38 on branch trunk — Support for non-blocking UDP sockets (user: js, size: 15533) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
283 284 285 286 287 288 289 290 291 292 293 294 295 296 |
if ((_socket = socket(result->family,
result->type | SOCK_CLOEXEC,
result->protocol)) == INVALID_SOCKET) {
errNo = of_socket_errno();
continue;
}
#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
if (connect(_socket, result->address,
| > > | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 |
if ((_socket = socket(result->family,
result->type | SOCK_CLOEXEC,
result->protocol)) == INVALID_SOCKET) {
errNo = of_socket_errno();
continue;
}
_blocking = 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
if (connect(_socket, result->address,
|
| ︙ | ︙ | |||
392 393 394 395 396 397 398 399 400 401 402 403 404 405 | results[0]->type | SOCK_CLOEXEC, results[0]->protocol)) == INVALID_SOCKET) @throw [OFBindFailedException exceptionWithHost: host port: port socket: self errNo: of_socket_errno()]; #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 setsockopt(_socket, SOL_SOCKET, SO_REUSEADDR, | > > | 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 | results[0]->type | SOCK_CLOEXEC, results[0]->protocol)) == INVALID_SOCKET) @throw [OFBindFailedException exceptionWithHost: host port: port socket: self errNo: of_socket_errno()]; _blocking = 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 setsockopt(_socket, SOL_SOCKET, SO_REUSEADDR, |
| ︙ | ︙ | |||
629 630 631 632 633 634 635 |
- (void)setKeepAliveEnabled: (bool)enabled
{
int v = enabled;
if (setsockopt(_socket, SOL_SOCKET, SO_KEEPALIVE,
(char *)&v, (socklen_t)sizeof(v)) != 0)
@throw [OFSetOptionFailedException
| | | 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 |
- (void)setKeepAliveEnabled: (bool)enabled
{
int v = enabled;
if (setsockopt(_socket, SOL_SOCKET, SO_KEEPALIVE,
(char *)&v, (socklen_t)sizeof(v)) != 0)
@throw [OFSetOptionFailedException
exceptionWithObject: self
errNo: of_socket_errno()];
}
- (bool)isKeepAliveEnabled
{
int v;
socklen_t len = sizeof(v);
|
| ︙ | ︙ | |||
656 657 658 659 660 661 662 |
- (void)setTCPNoDelayEnabled: (bool)enabled
{
int v = enabled;
if (setsockopt(_socket, IPPROTO_TCP, TCP_NODELAY,
(char *)&v, (socklen_t)sizeof(v)) != 0)
@throw [OFSetOptionFailedException
| | | 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 |
- (void)setTCPNoDelayEnabled: (bool)enabled
{
int v = enabled;
if (setsockopt(_socket, IPPROTO_TCP, TCP_NODELAY,
(char *)&v, (socklen_t)sizeof(v)) != 0)
@throw [OFSetOptionFailedException
exceptionWithObject: self
errNo: of_socket_errno()];
}
- (bool)isTCPNoDelayEnabled
{
int v;
socklen_t len = sizeof(v);
|
| ︙ | ︙ |