Differences From Artifact [4fc1cbbf22]:
- File src/OFSocket.m — part of check-in [d1c9ed8498] at 2022-10-22 18:46:25 on branch appletalk — Merge trunk into branch "appletalk" (user: js, size: 25643) [annotate] [blame] [check-ins using] [more...]
To Artifact [da4b96c1d5]:
- File
src/OFSocket.m
— part of check-in
[4571eada47]
at
2022-11-02 20:26:49
on branch trunk
— Use native endian for AppleTalk network on Windows
For some strange reason, Windows does not use big endian here like
everyone else. (user: js, size: 25851) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 | ret.length = sizeof(ret.sockaddr.at); #ifdef AF_APPLETALK ret.sockaddr.at.sat_family = AF_APPLETALK; #else ret.sockaddr.at.sat_family = AF_UNSPEC; #endif ret.sockaddr.at.sat_net = OFToBigEndian16(network); ret.sockaddr.at.sat_node = node; ret.sockaddr.at.sat_port = port; return ret; } bool | > > > > | 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 | ret.length = sizeof(ret.sockaddr.at); #ifdef AF_APPLETALK ret.sockaddr.at.sat_family = AF_APPLETALK; #else ret.sockaddr.at.sat_family = AF_UNSPEC; #endif #ifdef OF_WINDOWS ret.sockaddr.at.sat_net = network; #else ret.sockaddr.at.sat_net = OFToBigEndian16(network); #endif ret.sockaddr.at.sat_node = node; ret.sockaddr.at.sat_port = port; return ret; } bool |
| ︙ | ︙ | |||
998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 |
void
OFSocketAddressSetAppleTalkNetwork(OFSocketAddress *address, uint16_t network)
{
if (address->family != OFSocketAddressFamilyAppleTalk)
@throw [OFInvalidArgumentException exception];
address->sockaddr.at.sat_net = OFToBigEndian16(network);
}
uint16_t
OFSocketAddressAppleTalkNetwork(const OFSocketAddress *address)
{
if (address->family != OFSocketAddressFamilyAppleTalk)
@throw [OFInvalidArgumentException exception];
return OFFromBigEndian16(address->sockaddr.at.sat_net);
}
void
OFSocketAddressSetAppleTalkNode(OFSocketAddress *address, uint8_t node)
{
if (address->family != OFSocketAddressFamilyAppleTalk)
@throw [OFInvalidArgumentException exception];
| > > > > > > > > | 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 |
void
OFSocketAddressSetAppleTalkNetwork(OFSocketAddress *address, uint16_t network)
{
if (address->family != OFSocketAddressFamilyAppleTalk)
@throw [OFInvalidArgumentException exception];
#ifdef OF_WINDOWS
address->sockaddr.at.sat_net = network;
#else
address->sockaddr.at.sat_net = OFToBigEndian16(network);
#endif
}
uint16_t
OFSocketAddressAppleTalkNetwork(const OFSocketAddress *address)
{
if (address->family != OFSocketAddressFamilyAppleTalk)
@throw [OFInvalidArgumentException exception];
#ifdef OF_WINDOWS
return address->sockaddr.at.sat_net;
#else
return OFFromBigEndian16(address->sockaddr.at.sat_net);
#endif
}
void
OFSocketAddressSetAppleTalkNode(OFSocketAddress *address, uint8_t node)
{
if (address->family != OFSocketAddressFamilyAppleTalk)
@throw [OFInvalidArgumentException exception];
|
| ︙ | ︙ |