ObjFW  Check-in [198e8b6aff]

Overview
Comment:Fix OFSocketAddressString() for IPX
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 198e8b6aff458dd855492c1ae482aeed1ff6e809466ba4bd15b98b108b4456b5
User & Date: js on 2023-08-01 22:25:09
Other Links: manifest | tags
Context
2023-08-02
15:38
OFDNSResolverSettings: Don't assume AmiTCP check-in: 52044cf719 user: js tags: trunk
2023-08-01
22:25
Fix OFSocketAddressString() for IPX check-in: 198e8b6aff user: js tags: trunk
22:23
+[OFSystemInfo networkInterfaces]: IPX on Linux check-in: da63fcc9b0 user: js tags: trunk
Changes

Modified src/OFSocket.m from [602607c474] to [0cd5c67cfd].

954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
	node = ((uint64_t)addrIPX->sipx_node[0] << 40) |
	    ((uint64_t)addrIPX->sipx_node[1] << 32) |
	    ((uint64_t)addrIPX->sipx_node[2] << 24) |
	    ((uint64_t)addrIPX->sipx_node[3] << 16) |
	    ((uint64_t)addrIPX->sipx_node[4] << 8) |
	    (uint64_t)addrIPX->sipx_node[5];

	return [OFString stringWithFormat: @"%X.%X",
	    OFFromBigEndian32(network), node];
}

static OFString *
appleTalkString(const OFSocketAddress *address)
{
	const struct sockaddr_at *addrAT = &address->sockaddr.at;







|







954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
	node = ((uint64_t)addrIPX->sipx_node[0] << 40) |
	    ((uint64_t)addrIPX->sipx_node[1] << 32) |
	    ((uint64_t)addrIPX->sipx_node[2] << 24) |
	    ((uint64_t)addrIPX->sipx_node[3] << 16) |
	    ((uint64_t)addrIPX->sipx_node[4] << 8) |
	    (uint64_t)addrIPX->sipx_node[5];

	return [OFString stringWithFormat: @"%" PRIX32 ".%" PRIX64,
	    OFFromBigEndian32(network), node];
}

static OFString *
appleTalkString(const OFSocketAddress *address)
{
	const struct sockaddr_at *addrAT = &address->sockaddr.at;