Overview
| Comment: | +[OFSystemInfo networkInterfaces]: Windows support |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
ca4632c14ccde82ed3ee192557caff05 |
| User & Date: | js on 2023-06-06 23:42:09 |
| Other Links: | manifest | tags |
Context
|
2023-06-08
| ||
| 21:03 | +[OFSystemInfo networkInterface]: Fix some BSDs check-in: d4ea9e536c user: js tags: trunk | |
|
2023-06-06
| ||
| 23:42 | +[OFSystemInfo networkInterfaces]: Windows support check-in: ca4632c14c user: js tags: trunk | |
| 19:56 | Doxyfile: Add missing defines check-in: 9de6538e45 user: js tags: trunk | |
Changes
Modified src/OFSystemInfo.m from [2cc1e954ae] to [fabe0e6c7e].
| ︙ | ︙ | |||
93 94 95 96 97 98 99 100 101 102 103 104 105 106 | #if defined(OF_MACOS) || defined(OF_IOS) # ifdef HAVE_SYSDIR_H # include <sysdir.h> # endif #endif #ifdef OF_WINDOWS # include <windows.h> #endif #ifdef OF_HAIKU # include <FindDirectory.h> #endif #ifdef OF_QNX # include <sys/syspage.h> #endif | > > > | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | #if defined(OF_MACOS) || defined(OF_IOS) # ifdef HAVE_SYSDIR_H # include <sysdir.h> # endif #endif #ifdef OF_WINDOWS # include <windows.h> # define interface struct # include <iphlpapi.h> # undef interface #endif #ifdef OF_HAIKU # include <FindDirectory.h> #endif #ifdef OF_QNX # include <sys/syspage.h> #endif |
| ︙ | ︙ | |||
937 938 939 940 941 942 943 | OFSocketAddress address; if (ifrs[i].ifr_addr.sa_family != family) continue; name = [OFString stringWithCString: ifrs[i].ifr_name encoding: encoding]; | | < | 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 |
OFSocketAddress address;
if (ifrs[i].ifr_addr.sa_family != family)
continue;
name = [OFString stringWithCString: ifrs[i].ifr_name
encoding: encoding];
if ((interface = [ret objectForKey: name]) == nil) {
interface = [OFMutableDictionary dictionary];
[ret setObject: interface forKey: name];
}
addresses = [interface objectForKey: key];
if (addresses == nil) {
addresses = [OFMutableData
|
| ︙ | ︙ | |||
1003 1004 1005 1006 1007 1008 1009 | addressString = [components objectAtIndex: 0]; name = [components objectAtIndex: 5]; if (addressString.length != 32) continue; | | < | 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 |
addressString = [components objectAtIndex: 0];
name = [components objectAtIndex: 5];
if (addressString.length != 32)
continue;
if ((interface = [ret objectForKey: name]) == nil) {
interface = [OFMutableDictionary dictionary];
[ret setObject: interface forKey: name];
}
memset(&address, 0, sizeof(address));
address.family = OFSocketAddressFamilyIPv6;
|
| ︙ | ︙ | |||
1030 1031 1032 1033 1034 1035 1036 | if (byte > 0xFF) goto next_line; address.sockaddr.in6.sin6_addr.s6_addr[i / 2] = (unsigned char)byte; } | | | < | 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 |
if (byte > 0xFF)
goto next_line;
address.sockaddr.in6.sin6_addr.s6_addr[i / 2] =
(unsigned char)byte;
}
if ((addresses = [interface
objectForKey: OFNetworkInterfaceIPv6Addresses]) == nil) {
addresses = [OFMutableData
dataWithItemSize: sizeof(OFSocketAddress)];
[interface setObject: addresses
forKey: OFNetworkInterfaceIPv6Addresses];
}
[addresses addItem: &address];
|
| ︙ | ︙ | |||
1064 1065 1066 1067 1068 1069 1070 |
# endif
}
# endif
static bool
queryNetworkInterfaceIPv4Addresses(OFMutableDictionary *ret)
{
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 |
# endif
}
# endif
static bool
queryNetworkInterfaceIPv4Addresses(OFMutableDictionary *ret)
{
# if defined(OF_WINDOWS)
OFStringEncoding encoding = [OFLocale encoding];
ULONG adapterInfoSize = sizeof(IP_ADAPTER_INFO);
PIP_ADAPTER_INFO adapterInfo = malloc(adapterInfoSize);
OFMutableDictionary *interface;
OFEnumerator *enumerator;
if (adapterInfo == NULL)
return false;
@try {
ULONG error = GetAdaptersInfo(adapterInfo, &adapterInfoSize);
if (error == ERROR_BUFFER_OVERFLOW) {
PIP_ADAPTER_INFO newAdapterInfo = realloc(
adapterInfo, adapterInfoSize);
if (newAdapterInfo == NULL)
return false;
adapterInfo = newAdapterInfo;
error = GetAdaptersInfo(adapterInfo, &adapterInfoSize);
}
if (error != ERROR_SUCCESS)
return false;
for (PIP_ADAPTER_INFO iter = adapterInfo; iter != NULL;
iter = iter->Next) {
OFString *name, *IPString;
OFMutableData *addresses;
OFSocketAddress address;
name = [OFString stringWithCString: iter->AdapterName
encoding: encoding];
if ((interface = [ret objectForKey: name]) == nil) {
interface = [OFMutableDictionary dictionary];
[ret setObject: interface forKey: name];
}
IPString = [OFString
stringWithCString: iter->IpAddressList.IpAddress
.String
encoding: encoding];
if ([IPString isEqual: @"0.0.0.0"])
continue;
if ((addresses = [interface objectForKey:
OFNetworkInterfaceIPv4Addresses]) == nil) {
addresses = [OFMutableData
dataWithItemSize: sizeof(OFSocketAddress)];
[interface
setObject: addresses
forKey: OFNetworkInterfaceIPv4Addresses];
}
address = OFSocketAddressParseIPv4(IPString, 0);
[addresses addItem: &address];
}
} @finally {
free(adapterInfo);
}
enumerator = [ret objectEnumerator];
while ((interface = [enumerator nextObject]) != nil)
[[interface objectForKey: OFNetworkInterfaceIPv4Addresses]
makeImmutable];
return true;
# elif defined(HAVE_IOCTL) && defined(HAVE_NET_IF_H)
return queryNetworkInterfaceAddresses(ret,
OFNetworkInterfaceIPv4Addresses, OFSocketAddressFamilyIPv4,
AF_INET, sizeof(struct sockaddr_in));
# else
return false;
# endif
}
|
| ︙ | ︙ |