Differences From Artifact [7dca3c8c74]:
- File
src/OFTCPSocket.m
— part of check-in
[8aeee6680a]
at
2018-07-28 20:21:01
on branch trunk
— Add of_socket_address_ip_string()
This replaces of_address_to_string_and_port(). (user: js, size: 15482) [annotate] [blame] [check-ins using]
To 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]
| ︙ | ︙ | |||
364 365 366 367 368 369 370 |
{
of_resolver_result_t **results;
const int one = 1;
#if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
union {
struct sockaddr_storage storage;
struct sockaddr_in in;
| | | 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 |
{
of_resolver_result_t **results;
const int one = 1;
#if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
union {
struct sockaddr_storage storage;
struct sockaddr_in in;
# ifdef OF_HAVE_IPV6
struct sockaddr_in6 in6;
# endif
} addr;
socklen_t addrLen;
#endif
if (_socket != INVALID_SOCKET)
|
| ︙ | ︙ | |||
432 433 434 435 436 437 438 |
switch (results[0]->family) {
case AF_INET:
((struct sockaddr_in *)
results[0]->address)->sin_port =
OF_BSWAP16_IF_LE(rnd);
break;
| | | 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 |
switch (results[0]->family) {
case AF_INET:
((struct sockaddr_in *)
results[0]->address)->sin_port =
OF_BSWAP16_IF_LE(rnd);
break;
# ifdef OF_HAVE_IPV6
case AF_INET6:
((struct sockaddr_in6 *)
results[0]->address)->sin6_port =
OF_BSWAP16_IF_LE(rnd);
break;
# endif
default:
|
| ︙ | ︙ | |||
491 492 493 494 495 496 497 | port: port socket: self errNo: errNo]; } if (addr.storage.ss_family == AF_INET) return OF_BSWAP16_IF_LE(addr.in.sin_port); | | | 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 | port: port socket: self errNo: errNo]; } if (addr.storage.ss_family == AF_INET) return OF_BSWAP16_IF_LE(addr.in.sin_port); # ifdef OF_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; |
| ︙ | ︙ |