Differences From Artifact [df2fd645d0]:
- File
src/OFUDPSocket.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: 12952) [annotate] [blame] [check-ins using]
To Artifact [6754e57a6e]:
- File
src/OFUDPSocket.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: 12961) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
278 279 280 281 282 283 284 |
port: (uint16_t)port
{
of_resolver_result_t **results;
#if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
union {
struct sockaddr_storage storage;
struct sockaddr_in in;
| | | 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 |
port: (uint16_t)port
{
of_resolver_result_t **results;
#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
results = of_resolve_host(host, port, SOCK_DGRAM);
|
| ︙ | ︙ | |||
336 337 338 339 340 341 342 |
switch (results[0]->family) {
case AF_INET:
((struct sockaddr_in *)
results[0]->address)->sin_port =
OF_BSWAP16_IF_LE(rnd);
break;
| | | 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 |
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:
|
| ︙ | ︙ | |||
395 396 397 398 399 400 401 | port: port socket: self errNo: errNo]; } if (addr.storage.ss_family == AF_INET) return OF_BSWAP16_IF_LE(addr.in.sin_port); | | | 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 | 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; |
| ︙ | ︙ |