Differences From Artifact [b9058d4f4d]:
- File
src/OFSocket.m
— part of check-in
[ccc6a77c55]
at
2022-08-06 14:43:01
on branch trunk
— Reorder node and network of IPX sockets
This is more standard, albeit -[connectToNetwork:node:port:] sounding a
little bit more like you connect to a network rather than a node. (user: js, size: 22537) [annotate] [blame] [check-ins using] [more...]
To Artifact [6267eed94e]:
- File src/OFSocket.m — part of check-in [4ad0c363f3] at 2022-08-30 00:48:41 on branch trunk — OFObject: Small API change (user: js, size: 22612) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
665 666 667 668 669 670 671 |
unsigned long
OFSocketAddressHash(const OFSocketAddress *address)
{
unsigned long hash;
OFHashInit(&hash);
| | | | > | > | | | | | | | | | > | | 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 |
unsigned long
OFSocketAddressHash(const OFSocketAddress *address)
{
unsigned long hash;
OFHashInit(&hash);
OFHashAddByte(&hash, address->family);
switch (address->family) {
case OFSocketAddressFamilyIPv4:
#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
OFHashAddByte(&hash, address->sockaddr.in.sin_port >> 8);
OFHashAddByte(&hash, address->sockaddr.in.sin_port);
OFHashAddByte(&hash,
address->sockaddr.in.sin_addr.s_addr >> 24);
OFHashAddByte(&hash,
address->sockaddr.in.sin_addr.s_addr >> 16);
OFHashAddByte(&hash, address->sockaddr.in.sin_addr.s_addr >> 8);
OFHashAddByte(&hash, address->sockaddr.in.sin_addr.s_addr);
break;
case OFSocketAddressFamilyIPv6:
if (address->length < (socklen_t)sizeof(struct sockaddr_in6))
@throw [OFInvalidArgumentException exception];
OFHashAddByte(&hash, address->sockaddr.in6.sin6_port >> 8);
OFHashAddByte(&hash, address->sockaddr.in6.sin6_port);
for (size_t i = 0;
i < sizeof(address->sockaddr.in6.sin6_addr.s6_addr); i++)
OFHashAddByte(&hash,
address->sockaddr.in6.sin6_addr.s6_addr[i]);
break;
case OFSocketAddressFamilyUNIX:;
void *pool = objc_autoreleasePoolPush();
OFString *path = OFSocketAddressUNIXPath(address);
hash = path.hash;
objc_autoreleasePoolPop(pool);
return hash;
case OFSocketAddressFamilyIPX:;
unsigned char network[
sizeof(address->sockaddr.ipx.sipx_network)];
if (address->length < (socklen_t)sizeof(struct sockaddr_ipx))
@throw [OFInvalidArgumentException exception];
OFHashAddByte(&hash, address->sockaddr.ipx.sipx_port >> 8);
OFHashAddByte(&hash, address->sockaddr.ipx.sipx_port);
memcpy(network, &address->sockaddr.ipx.sipx_network,
sizeof(network));
for (size_t i = 0; i < sizeof(network); i++)
OFHashAddByte(&hash, network[i]);
for (size_t i = 0; i < IPX_NODE_LEN; i++)
OFHashAddByte(&hash,
address->sockaddr.ipx.sipx_node[i]);
break;
default:
@throw [OFInvalidArgumentException exception];
}
OFHashFinalize(&hash);
|
| ︙ | ︙ |