Differences From Artifact [b98f01fc09]:
- File
src/OFTCPSocket.m
— part of check-in
[6b77a5dd8b]
at
2017-05-21 21:28:57
on branch trunk
— Prefix private methods with of_ instead of OF_
This matches Apple's style. (user: js, size: 14831) [annotate] [blame] [check-ins using]
To Artifact [16f6a959b9]:
- File
src/OFTCPSocket.m
— part of check-in
[b4cd87cd81]
at
2017-05-21 23:57:34
on branch trunk
— Use closesocket() instead of close()
Previously, socket_helpers.h would just define close() to whatever is
needed to close a socket. However, this makes it possible to
accidentally call a socket-specific close on something that is not a
socket. Having to explicitly call closesocket() (and defining it to
close() on platforms where it's the same) prevents this. (user: js, size: 14861) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
283 284 285 286 287 288 289 |
fcntl(_socket, F_SETFD, flags | FD_CLOEXEC);
#endif
if (connect(_socket, result->address,
result->addressLength) == -1) {
errNo = of_socket_errno();
| | | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 |
fcntl(_socket, F_SETFD, flags | FD_CLOEXEC);
#endif
if (connect(_socket, result->address,
result->addressLength) == -1) {
errNo = of_socket_errno();
closesocket(_socket);
_socket = INVALID_SOCKET;
continue;
}
break;
}
|
| ︙ | ︙ | |||
396 397 398 399 400 401 402 |
#if defined(OF_WII) || defined(OF_NINTENDO_3DS)
if (port != 0) {
#endif
if (bind(_socket, results[0]->address,
results[0]->addressLength) != 0) {
int errNo = of_socket_errno();
| | | 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 |
#if defined(OF_WII) || defined(OF_NINTENDO_3DS)
if (port != 0) {
#endif
if (bind(_socket, results[0]->address,
results[0]->addressLength) != 0) {
int errNo = of_socket_errno();
closesocket(_socket);
_socket = INVALID_SOCKET;
@throw [OFBindFailedException
exceptionWithHost: host
port: port
socket: self
errNo: errNo];
|
| ︙ | ︙ | |||
443 444 445 446 447 448 449 |
port = rnd;
break;
}
if (of_socket_errno() != EADDRINUSE) {
int errNo = of_socket_errno();
| | | 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 |
port = rnd;
break;
}
if (of_socket_errno() != EADDRINUSE) {
int errNo = of_socket_errno();
closesocket(_socket);
_socket = INVALID_SOCKET;
@throw [OFBindFailedException
exceptionWithHost: host
port: port
socket: self
errNo: errNo];
|
| ︙ | ︙ | |||
468 469 470 471 472 473 474 |
#if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
addrLen = (socklen_t)sizeof(addr.storage);
if (of_getsockname(_socket, (struct sockaddr *)&addr.storage,
&addrLen) != 0) {
int errNo = of_socket_errno();
| | | | 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 |
#if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
addrLen = (socklen_t)sizeof(addr.storage);
if (of_getsockname(_socket, (struct sockaddr *)&addr.storage,
&addrLen) != 0) {
int errNo = of_socket_errno();
closesocket(_socket);
_socket = INVALID_SOCKET;
@throw [OFBindFailedException exceptionWithHost: host
port: port
socket: self
errNo: errNo];
}
if (addr.storage.ss_family == AF_INET)
return OF_BSWAP16_IF_LE(addr.in.sin_port);
# ifdef HAVE_IPV6
if (addr.storage.ss_family == AF_INET6)
return OF_BSWAP16_IF_LE(addr.in6.sin6_port);
# endif
#endif
closesocket(_socket);
_socket = INVALID_SOCKET;
@throw [OFBindFailedException exceptionWithHost: host
port: port
socket: self
errNo: EAFNOSUPPORT];
}
|
| ︙ | ︙ |