Overview
| Comment: | +[OFSystemInfo networkInterfaces]: More IPv6 |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
d4db12a5c9195ee8194c87bb0c43a7e8 |
| User & Date: | js on 2023-06-06 19:38:46 |
| Other Links: | manifest | tags |
Context
|
2023-06-06
| ||
| 19:55 | +[OFSystemInfo networkInterfaces]: Add AppleTalk check-in: c428ff651c user: js tags: trunk | |
| 19:38 | +[OFSystemInfo networkInterfaces]: More IPv6 check-in: d4db12a5c9 user: js tags: trunk | |
|
2023-06-05
| ||
| 19:40 | Fix MorphOS build check-in: 62d8cbe31f user: js tags: trunk | |
Changes
Modified src/OFSystemInfo.m from [12190864cf] to [dd5c0db750].
| ︙ | ︙ | |||
890 891 892 893 894 895 896 897 898 899 900 901 902 903 |
}
return true;
# else
return false;
# endif
}
static bool
queryNetworkInterfaceIPv6Addresses(OFMutableDictionary *ret)
{
# if defined(OF_LINUX) && defined(OF_HAVE_FILES)
OFFile *file;
OFString *line;
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 890 891 892 893 894 895 896 897 898 899 900 901 902 903 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 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 |
}
return true;
# else
return false;
# endif
}
# if defined(HAVE_IOCTL) && defined(HAVE_NET_IF_H)
static bool
queryNetworkInterfaceAddresses(OFMutableDictionary *ret,
OFNetworkInterfaceKey key, OFSocketAddressFamily addressFamily, int family,
size_t sockaddrSize)
{
OFStringEncoding encoding = [OFLocale encoding];
int sock = socket(family, SOCK_DGRAM, 0);
struct ifconf ifc;
struct ifreq *ifrs;
OFMutableDictionary *interface;
OFEnumerator *enumerator;
if (sock < 0)
return false;
ifrs = malloc(128 * sizeof(struct ifreq));
if (ifrs == NULL) {
closesocket(sock);
return false;
}
@try {
memset(&ifc, 0, sizeof(ifc));
ifc.ifc_buf = (void *)ifrs;
ifc.ifc_len = 128 * sizeof(struct ifreq);
if (ioctl(sock, SIOCGIFCONF, &ifc) < 0)
return false;
for (size_t i = 0; i < ifc.ifc_len / sizeof(struct ifreq);
i++) {
OFString *name;
OFMutableData *addresses;
OFSocketAddress address;
if (ifrs[i].ifr_addr.sa_family != family)
continue;
name = [OFString stringWithCString: ifrs[i].ifr_name
encoding: encoding];
interface = [ret objectForKey: name];
if (interface == nil) {
interface = [OFMutableDictionary dictionary];
[ret setObject: interface forKey: name];
}
addresses = [interface objectForKey: key];
if (addresses == nil) {
addresses = [OFMutableData
dataWithItemSize: sizeof(OFSocketAddress)];
[interface setObject: addresses forKey: key];
}
memset(&address, 0, sizeof(address));
address.family = addressFamily;
memcpy(&address.sockaddr.in, &ifrs[i].ifr_addr,
sockaddrSize);
[addresses addItem: &address];
}
} @finally {
free(ifrs);
closesocket(sock);
}
enumerator = [ret objectEnumerator];
while ((interface = [enumerator nextObject]) != nil)
[[interface objectForKey: key] makeImmutable];
return true;
}
# endif
static bool
queryNetworkInterfaceIPv6Addresses(OFMutableDictionary *ret)
{
# if defined(OF_LINUX) && defined(OF_HAVE_FILES)
OFFile *file;
OFString *line;
|
| ︙ | ︙ | |||
971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 |
enumerator = [ret objectEnumerator];
while ((interface = [enumerator nextObject]) != nil)
[[interface objectForKey: OFNetworkInterfaceIPv4Addresses]
makeImmutable];
return false;
# else
return false;
# endif
}
static bool
queryNetworkInterfaceIPv4Addresses(OFMutableDictionary *ret)
{
# if defined(HAVE_IOCTL) && defined(HAVE_NET_IF_H)
| > > > > < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < | < < < < < < < < < < < < < < | 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 |
enumerator = [ret objectEnumerator];
while ((interface = [enumerator nextObject]) != nil)
[[interface objectForKey: OFNetworkInterfaceIPv4Addresses]
makeImmutable];
return false;
# elif defined(HAVE_IOCTL) && defined(HAVE_NET_IF_H)
return queryNetworkInterfaceAddresses(ret,
OFNetworkInterfaceIPv6Addresses, OFSocketAddressFamilyIPv6,
AF_INET6, sizeof(struct sockaddr_in6));
# else
return false;
# endif
}
static bool
queryNetworkInterfaceIPv4Addresses(OFMutableDictionary *ret)
{
# if defined(HAVE_IOCTL) && defined(HAVE_NET_IF_H)
return queryNetworkInterfaceAddresses(ret,
OFNetworkInterfaceIPv4Addresses, OFSocketAddressFamilyIPv4,
AF_INET, sizeof(struct sockaddr_in));
# else
return false;
# endif
}
+ (OFDictionary OF_GENERIC(OFString *, OFNetworkInterface) *)networkInterfaces
{
|
| ︙ | ︙ |