Differences From Artifact [4c91a4fb68]:
- File src/socket.m — part of check-in [0509d7a844] at 2019-01-03 19:13:03 on branch trunk — Update copyright (user: js, size: 14670) [annotate] [blame] [check-ins using]
To Artifact [e7074a55dd]:
- File
src/socket.m
— part of check-in
[ab89c47f42]
at
2019-01-07 22:59:58
on branch trunk
— Partially fix sockets on Nintendo 3DS/Wii
This does not fully fix it yet, but at least the socket tests in the
test suite pass on 3DS now. (user: js, size: 14769) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
237 238 239 240 241 242 243 | of_socket_address_t ret; struct sockaddr_in *addrIn = &ret.sockaddr.in; OFArray OF_GENERIC(OFString *) *components; uint32_t addr; memset(&ret, '\0', sizeof(ret)); ret.family = OF_SOCKET_ADDRESS_FAMILY_IPV4; | | | | | 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 | of_socket_address_t ret; struct sockaddr_in *addrIn = &ret.sockaddr.in; OFArray OF_GENERIC(OFString *) *components; uint32_t addr; memset(&ret, '\0', sizeof(ret)); ret.family = OF_SOCKET_ADDRESS_FAMILY_IPV4; #if defined(OF_WII) || defined(OF_NINTENDO_3DS) ret.length = 8; #else ret.length = sizeof(ret.sockaddr.in); #endif addrIn->sin_family = AF_INET; addrIn->sin_port = OF_BSWAP16_IF_LE(port); #ifdef OF_WII addrIn->sin_len = ret.length; #endif |
| ︙ | ︙ | |||
401 402 403 404 405 406 407 |
const struct sockaddr_in6 *addrIn6_1, *addrIn6_2;
if (address1->family != address2->family)
return false;
switch (address1->family) {
case OF_SOCKET_ADDRESS_FAMILY_IPV4:
| | | < | > | 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 |
const struct sockaddr_in6 *addrIn6_1, *addrIn6_2;
if (address1->family != address2->family)
return false;
switch (address1->family) {
case OF_SOCKET_ADDRESS_FAMILY_IPV4:
#if defined(OF_WII) || defined(OF_NINTENDO_3DS)
if (address1->length < 8 || address2->length < 8)
@throw [OFInvalidArgumentException exception];
#else
if (address1->length < (socklen_t)sizeof(struct sockaddr_in) ||
address2->length < (socklen_t)sizeof(struct sockaddr_in))
@throw [OFInvalidArgumentException exception];
#endif
addrIn1 = &address1->sockaddr.in;
addrIn2 = &address2->sockaddr.in;
if (addrIn1->sin_port != addrIn2->sin_port)
|
| ︙ | ︙ | |||
452 453 454 455 456 457 458 |
uint32_t hash;
OF_HASH_INIT(hash);
OF_HASH_ADD(hash, address->family);
switch (address->family) {
case OF_SOCKET_ADDRESS_FAMILY_IPV4:
| | | | | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 |
uint32_t hash;
OF_HASH_INIT(hash);
OF_HASH_ADD(hash, address->family);
switch (address->family) {
case OF_SOCKET_ADDRESS_FAMILY_IPV4:
#if defined(OF_WII) || defined(OF_NINTENDO_3DS)
if (address->length < 8)
@throw [OFInvalidArgumentException exception];
#else
if (address->length < (socklen_t)sizeof(struct sockaddr_in))
@throw [OFInvalidArgumentException exception];
#endif
OF_HASH_ADD(hash, address->sockaddr.in.sin_port >> 8);
OF_HASH_ADD(hash, address->sockaddr.in.sin_port);
OF_HASH_ADD(hash, address->sockaddr.in.sin_addr.s_addr >> 24);
OF_HASH_ADD(hash, address->sockaddr.in.sin_addr.s_addr >> 16);
|
| ︙ | ︙ |