Differences From Artifact [93c697cb3c]:
- File
src/socket.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: 9786) [annotate] [blame] [check-ins using]
To Artifact [06c3fc8fe2]:
- File src/socket.m — part of check-in [4f49f55859] at 2018-08-05 20:00:03 on branch trunk — Add a few missing casts (user: js, size: 9819) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
313 314 315 316 317 318 319 | return false; if (addrIn1->sin_addr.s_addr != addrIn2->sin_addr.s_addr) return false; break; #ifdef OF_HAVE_IPV6 case AF_INET6: | | | | 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 | return false; if (addrIn1->sin_addr.s_addr != addrIn2->sin_addr.s_addr) return false; break; #ifdef OF_HAVE_IPV6 case AF_INET6: if (address1->length < (socklen_t)sizeof(struct sockaddr_in6) || address2->length < (socklen_t)sizeof(struct sockaddr_in6)) @throw [OFInvalidArgumentException exception]; addrIn6_1 = (struct sockaddr_in6 *)&address1->address; addrIn6_2 = (struct sockaddr_in6 *)&address2->address; if (addrIn6_1->sin6_port != addrIn6_2->sin6_port) return false; |
| ︙ | ︙ | |||
366 367 368 369 370 371 372 | hash += (addrIn->sin_port << 1); hash ^= addrIn->sin_addr.s_addr; break; #ifdef OF_HAVE_IPV6 case AF_INET6: | | | 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 | hash += (addrIn->sin_port << 1); hash ^= addrIn->sin_addr.s_addr; break; #ifdef OF_HAVE_IPV6 case AF_INET6: if (address->length < (socklen_t)sizeof(struct sockaddr_in6)) @throw [OFInvalidArgumentException exception]; addrIn6 = (struct sockaddr_in6 *)&address->address; hash += (addrIn6->sin6_port << 1); OF_HASH_INIT(subhash); |
| ︙ | ︙ |