Differences From Artifact [16116f3ca3]:
- File
src/OFSocket.m
— part of check-in
[a30a0ab261]
at
2022-07-31 13:55:49
on branch nintendo-switch
— Add initial socket code for Nintendo Switch
This doesn't work yet (it crashes on recvfrom), so it's not enabled in
configure for now. (user: js, size: 22537) [annotate] [blame] [check-ins using] [more...]
To 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...]
| ︙ | ︙ | |||
516 517 518 519 520 521 522 |
} @catch (OFInvalidFormatException *e) {
ret = OFSocketAddressParseIPv4(IP, port);
}
return ret;
}
| < < < < < < < < < < < < < < < < < < < < < < < < | 516 517 518 519 520 521 522 523 524 525 526 527 528 529 |
} @catch (OFInvalidFormatException *e) {
ret = OFSocketAddressParseIPv4(IP, port);
}
return ret;
}
OFSocketAddress
OFSocketAddressMakeUNIX(OFString *path)
{
void *pool = objc_autoreleasePoolPush();
OFStringEncoding encoding = [OFLocale encoding];
size_t length = [path cStringLengthWithEncoding: encoding];
OFSocketAddress ret;
|
| ︙ | ︙ | |||
566 567 568 569 570 571 572 573 574 575 576 577 578 579 |
ret.sockaddr.un.sun_family = AF_UNSPEC;
#endif
memcpy(ret.sockaddr.un.sun_path,
[path cStringWithEncoding: encoding], length);
objc_autoreleasePoolPop(pool);
return ret;
}
bool
OFSocketAddressEqual(const OFSocketAddress *address1,
const OFSocketAddress *address2)
{
| > > > > > > > > > > > > > > > > > > > > > > > > | 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 |
ret.sockaddr.un.sun_family = AF_UNSPEC;
#endif
memcpy(ret.sockaddr.un.sun_path,
[path cStringWithEncoding: encoding], length);
objc_autoreleasePoolPop(pool);
return ret;
}
OFSocketAddress
OFSocketAddressMakeIPX(uint32_t network, const unsigned char node[IPX_NODE_LEN],
uint16_t port)
{
OFSocketAddress ret;
memset(&ret, '\0', sizeof(ret));
ret.family = OFSocketAddressFamilyIPX;
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 = OFToBigEndian32(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 = OFToBigEndian16(port);
return ret;
}
bool
OFSocketAddressEqual(const OFSocketAddress *address1,
const OFSocketAddress *address2)
{
|
| ︙ | ︙ | |||
619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 | 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; return true; case OFSocketAddressFamilyIPX: 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; return true; | > > > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < | 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 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 |
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;
return true;
case OFSocketAddressFamilyUNIX:
pool = objc_autoreleasePoolPush();
path1 = OFSocketAddressUNIXPath(address1);
path2 = OFSocketAddressUNIXPath(address2);
if (path1 == nil || path2 == nil) {
objc_autoreleasePoolPop(pool);
return false;
}
ret = [path1 isEqual: path2];
objc_autoreleasePoolPop(pool);
return ret;
case OFSocketAddressFamilyIPX:
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;
return true;
default:
@throw [OFInvalidArgumentException exception];
}
}
unsigned long
OFSocketAddressHash(const OFSocketAddress *address)
|
| ︙ | ︙ | |||
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 | for (size_t i = 0; i < sizeof(address->sockaddr.in6.sin6_addr.s6_addr); i++) OFHashAdd(&hash, address->sockaddr.in6.sin6_addr.s6_addr[i]); break; case OFSocketAddressFamilyIPX:; unsigned char network[ sizeof(address->sockaddr.ipx.sipx_network)]; if (address->length < (socklen_t)sizeof(struct sockaddr_ipx)) @throw [OFInvalidArgumentException exception]; OFHashAdd(&hash, address->sockaddr.ipx.sipx_port >> 8); OFHashAdd(&hash, address->sockaddr.ipx.sipx_port); memcpy(network, &address->sockaddr.ipx.sipx_network, sizeof(network)); for (size_t i = 0; i < sizeof(network); i++) OFHashAdd(&hash, network[i]); for (size_t i = 0; i < IPX_NODE_LEN; i++) OFHashAdd(&hash, address->sockaddr.ipx.sipx_node[i]); break; | > > > > > > > > > < < < < < < < < < | 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 | for (size_t i = 0; i < sizeof(address->sockaddr.in6.sin6_addr.s6_addr); i++) OFHashAdd(&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]; OFHashAdd(&hash, address->sockaddr.ipx.sipx_port >> 8); OFHashAdd(&hash, address->sockaddr.ipx.sipx_port); memcpy(network, &address->sockaddr.ipx.sipx_network, sizeof(network)); for (size_t i = 0; i < sizeof(network); i++) OFHashAdd(&hash, network[i]); for (size_t i = 0; i < IPX_NODE_LEN; i++) OFHashAdd(&hash, address->sockaddr.ipx.sipx_node[i]); break; default: @throw [OFInvalidArgumentException exception]; } OFHashFinalize(&hash); return hash; |
| ︙ | ︙ | |||
862 863 864 865 866 867 868 869 870 871 872 873 874 875 |
return OFFromBigEndian16(address->sockaddr.in6.sin6_port);
case OFSocketAddressFamilyIPX:
return OFFromBigEndian16(address->sockaddr.ipx.sipx_port);
default:
@throw [OFInvalidArgumentException exception];
}
}
void
OFSocketAddressSetIPXNetwork(OFSocketAddress *address, uint32_t network)
{
if (address->family != OFSocketAddressFamilyIPX)
@throw [OFInvalidArgumentException exception];
| > > > > > > > > > > > > > > > > > > > > > > | 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 |
return OFFromBigEndian16(address->sockaddr.in6.sin6_port);
case OFSocketAddressFamilyIPX:
return OFFromBigEndian16(address->sockaddr.ipx.sipx_port);
default:
@throw [OFInvalidArgumentException exception];
}
}
OFString *
OFSocketAddressUNIXPath(const OFSocketAddress *_Nonnull address)
{
socklen_t length;
if (address->family != OFSocketAddressFamilyUNIX)
@throw [OFInvalidArgumentException exception];
length = address->length - offsetof(struct sockaddr_un, sun_path);
for (socklen_t i = 0; i < length; i++)
if (address->sockaddr.un.sun_path[i] == 0)
length = i;
if (length <= 0)
return nil;
return [OFString stringWithCString: address->sockaddr.un.sun_path
encoding: [OFLocale encoding]
length: length];
}
void
OFSocketAddressSetIPXNetwork(OFSocketAddress *address, uint32_t network)
{
if (address->family != OFSocketAddressFamilyIPX)
@throw [OFInvalidArgumentException exception];
|
| ︙ | ︙ | |||
906 907 908 909 910 911 912 |
unsigned char node[IPX_NODE_LEN])
{
if (address->family != OFSocketAddressFamilyIPX)
@throw [OFInvalidArgumentException exception];
memcpy(node, address->sockaddr.ipx.sipx_node, IPX_NODE_LEN);
}
| < < < < < < < < < < < < < < < < < < < < < < | 928 929 930 931 932 933 934 |
unsigned char node[IPX_NODE_LEN])
{
if (address->family != OFSocketAddressFamilyIPX)
@throw [OFInvalidArgumentException exception];
memcpy(node, address->sockaddr.ipx.sipx_node, IPX_NODE_LEN);
}
|