Differences From Artifact [41dfcc5d04]:
- File
src/socket.m
— part of check-in
[66c1192d94]
at
2020-04-18 10:10:54
on branch trunk
— socket.m: Remove a TODO
Supporting other styles of IPv4 is non-standard and is a BSD legacy. (user: js, size: 17463) [annotate] [blame] [check-ins using]
To Artifact [685346fedf]:
- File src/socket.m — part of check-in [4a5822e7c0] at 2020-04-25 23:02:16 on branch trunk — Add OFIPXSocket (user: js, size: 19913) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 |
{
@try {
return of_socket_address_parse_ipv6(IP, port);
} @catch (OFInvalidFormatException *e) {
return of_socket_address_parse_ipv4(IP, port);
}
}
bool
of_socket_address_equal(const of_socket_address_t *address1,
const of_socket_address_t *address2)
{
const struct sockaddr_in *addrIn1, *addrIn2;
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)
| > > > > > > > > > > > > > > > > > > > > > > > > > | 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 |
{
@try {
return of_socket_address_parse_ipv6(IP, port);
} @catch (OFInvalidFormatException *e) {
return of_socket_address_parse_ipv4(IP, port);
}
}
of_socket_address_t
of_socket_address_ipx(uint32_t network, const unsigned char node[IPX_NODE_LEN],
uint16_t port)
{
of_socket_address_t ret;
memset(&ret, '\0', sizeof(ret));
ret.family = OF_SOCKET_ADDRESS_FAMILY_IPX;
ret.length = sizeof(ret.sockaddr.ipx);
#ifdef AF_IPX
ret.sockaddr.ipx.sipx_family = AF_IPX;
#else
ret.sockaddr.ipx.sipx_family = AF_UNSPEC;
#endif
network = OF_BSWAP32_IF_LE(network);
memcpy(&ret.sockaddr.ipx.sipx_network, &network,
sizeof(ret.sockaddr.ipx.sipx_network));
memcpy(ret.sockaddr.ipx.sipx_node, node, IPX_NODE_LEN);
ret.sockaddr.ipx.sipx_port = OF_BSWAP16_IF_LE(port);
return ret;
}
bool
of_socket_address_equal(const of_socket_address_t *address1,
const of_socket_address_t *address2)
{
const struct sockaddr_in *addrIn1, *addrIn2;
const struct sockaddr_in6 *addrIn6_1, *addrIn6_2;
const struct sockaddr_ipx *addrIPX1, *addrIPX2;
if (address1->family != address2->family)
return false;
switch (address1->family) {
case OF_SOCKET_ADDRESS_FAMILY_IPV4:
#if defined(OF_WII) || defined(OF_NINTENDO_3DS)
|
| ︙ | ︙ | |||
549 550 551 552 553 554 555 556 557 558 559 560 561 562 | if (addrIn6_1->sin6_port != addrIn6_2->sin6_port) return false; if (memcmp(addrIn6_1->sin6_addr.s6_addr, addrIn6_2->sin6_addr.s6_addr, sizeof(addrIn6_1->sin6_addr.s6_addr)) != 0) return false; break; default: @throw [OFInvalidArgumentException exception]; } return true; } | > > > > > > > > > > > > > > > > > > | 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 | if (addrIn6_1->sin6_port != addrIn6_2->sin6_port) return false; if (memcmp(addrIn6_1->sin6_addr.s6_addr, addrIn6_2->sin6_addr.s6_addr, sizeof(addrIn6_1->sin6_addr.s6_addr)) != 0) return false; break; case OF_SOCKET_ADDRESS_FAMILY_IPX: if (address1->length < (socklen_t)sizeof(struct sockaddr_ipx) || address2->length < (socklen_t)sizeof(struct sockaddr_ipx)) @throw [OFInvalidArgumentException exception]; addrIPX1 = &address1->sockaddr.ipx; addrIPX2 = &address2->sockaddr.ipx; if (addrIPX1->sipx_port != addrIPX2->sipx_port) return false; if (memcmp(&addrIPX1->sipx_network, &addrIPX2->sipx_network, 4) != 0) return false; if (memcmp(addrIPX1->sipx_node, addrIPX2->sipx_node, IPX_NODE_LEN) != 0) return false; break; default: @throw [OFInvalidArgumentException exception]; } return true; } |
| ︙ | ︙ | |||
595 596 597 598 599 600 601 602 603 604 605 606 607 608 | OF_HASH_ADD(hash, address->sockaddr.in6.sin6_port); for (size_t i = 0; i < sizeof(address->sockaddr.in6.sin6_addr.s6_addr); i++) OF_HASH_ADD(hash, address->sockaddr.in6.sin6_addr.s6_addr[i]); break; default: @throw [OFInvalidArgumentException exception]; } OF_HASH_FINALIZE(hash); | > > > > > > > > > > > > > > > > > > > > | 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 | OF_HASH_ADD(hash, address->sockaddr.in6.sin6_port); for (size_t i = 0; i < sizeof(address->sockaddr.in6.sin6_addr.s6_addr); i++) OF_HASH_ADD(hash, address->sockaddr.in6.sin6_addr.s6_addr[i]); break; case OF_SOCKET_ADDRESS_FAMILY_IPX:; unsigned char network[ sizeof(address->sockaddr.ipx.sipx_network)]; if (address->length < (socklen_t)sizeof(struct sockaddr_ipx)) @throw [OFInvalidArgumentException exception]; OF_HASH_ADD(hash, address->sockaddr.ipx.sipx_port >> 8); OF_HASH_ADD(hash, address->sockaddr.ipx.sipx_port); memcpy(network, &address->sockaddr.ipx.sipx_network, sizeof(network)); for (size_t i = 0; i < sizeof(network); i++) OF_HASH_ADD(hash, network[i]); for (size_t i = 0; i < IPX_NODE_LEN; i++) OF_HASH_ADD(hash, address->sockaddr.ipx.sipx_node[i]); break; default: @throw [OFInvalidArgumentException exception]; } OF_HASH_FINALIZE(hash); |
| ︙ | ︙ | |||
728 729 730 731 732 733 734 735 736 737 738 |
of_socket_address_get_port(const of_socket_address_t *address)
{
switch (address->family) {
case OF_SOCKET_ADDRESS_FAMILY_IPV4:
return OF_BSWAP16_IF_LE(address->sockaddr.in.sin_port);
case OF_SOCKET_ADDRESS_FAMILY_IPV6:
return OF_BSWAP16_IF_LE(address->sockaddr.in6.sin6_port);
default:
@throw [OFInvalidArgumentException exception];
}
}
| > > > > > > > > > > > > > > > | 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 |
of_socket_address_get_port(const of_socket_address_t *address)
{
switch (address->family) {
case OF_SOCKET_ADDRESS_FAMILY_IPV4:
return OF_BSWAP16_IF_LE(address->sockaddr.in.sin_port);
case OF_SOCKET_ADDRESS_FAMILY_IPV6:
return OF_BSWAP16_IF_LE(address->sockaddr.in6.sin6_port);
case OF_SOCKET_ADDRESS_FAMILY_IPX:
return OF_BSWAP16_IF_LE(address->sockaddr.ipx.sipx_port);
default:
@throw [OFInvalidArgumentException exception];
}
}
void
of_socket_address_ipx_get(const of_socket_address_t *address, uint32_t *network,
unsigned char node[IPX_NODE_LEN], uint16_t *port)
{
if (address->family != OF_SOCKET_ADDRESS_FAMILY_IPX)
@throw [OFInvalidArgumentException exception];
memcpy(network, &address->sockaddr.ipx.sipx_network, sizeof(*network));
*network = OF_BSWAP32_IF_LE(*network);
memcpy(node, address->sockaddr.ipx.sipx_node, IPX_NODE_LEN);
*port = OF_BSWAP16_IF_LE(address->sockaddr.ipx.sipx_port);
}
|