Overview
| Comment: | OFSocketAddressString: Add IPX support |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
bd332cc15f017a1acba5a536680bdceb |
| User & Date: | js on 2023-05-20 21:07:31 |
| Other Links: | manifest | tags |
Context
|
2023-05-21
| ||
| 08:43 | utils/ofdns: Add --tcp option check-in: 55d7e1741e user: js tags: trunk | |
|
2023-05-20
| ||
| 21:07 | OFSocketAddressString: Add IPX support check-in: bd332cc15f user: js tags: trunk | |
| 20:54 | OFSocketAddressString: Add AppleTalk support check-in: 79c5eeefcc user: js tags: trunk | |
Changes
Modified src/OFSocket.m from [8fc5b1646d] to [788a494072].
| ︙ | ︙ | |||
904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 |
[string appendFormat: @"%%%u", addrIn6->sin6_scope_id];
}
[string makeImmutable];
return string;
}
static OFString *
appleTalkString(const OFSocketAddress *address)
{
const struct sockaddr_at *addrAT = &address->sockaddr.at;
return [OFString stringWithFormat: @"%d.%d",
OFFromBigEndian16(addrAT->sat_net), addrAT->sat_node];
}
OFString *
OFSocketAddressString(const OFSocketAddress *address)
{
switch (address->family) {
case OFSocketAddressFamilyIPv4:
return IPv4String(address);
case OFSocketAddressFamilyIPv6:
return IPv6String(address);
case OFSocketAddressFamilyAppleTalk:
return appleTalkString(address);
default:
@throw [OFInvalidArgumentException exception];
}
}
| > > > > > > > > > > > > > > > > > > > > > | 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 |
[string appendFormat: @"%%%u", addrIn6->sin6_scope_id];
}
[string makeImmutable];
return string;
}
static OFString *
IPXString(const OFSocketAddress *address)
{
const struct sockaddr_ipx *addrIPX = &address->sockaddr.ipx;
uint32_t network;
uint64_t node;
memcpy(&network, &addrIPX->sipx_network, sizeof(addrIPX->sipx_network));
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;
return [OFString stringWithFormat: @"%d.%d",
OFFromBigEndian16(addrAT->sat_net), addrAT->sat_node];
}
OFString *
OFSocketAddressString(const OFSocketAddress *address)
{
switch (address->family) {
case OFSocketAddressFamilyIPv4:
return IPv4String(address);
case OFSocketAddressFamilyIPv6:
return IPv6String(address);
case OFSocketAddressFamilyIPX:
return IPXString(address);
case OFSocketAddressFamilyAppleTalk:
return appleTalkString(address);
default:
@throw [OFInvalidArgumentException exception];
}
}
|
| ︙ | ︙ |