Overview
| Comment: | +[OFSystemInfo networkInterfaces]: Add HW address |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
1aeb540a82fa87f208d1045f087f8d79 |
| User & Date: | js on 2023-06-11 10:46:51 |
| Other Links: | manifest | tags |
Context
|
2023-06-11
| ||
| 16:45 | Add support for IPv4s embedded into IPv6s check-in: af9084b456 user: js tags: trunk | |
| 10:46 | +[OFSystemInfo networkInterfaces]: Add HW address check-in: 1aeb540a82 user: js tags: trunk | |
| 09:38 | Add missing includes for MorphOS check-in: 1796e9d305 user: js tags: trunk | |
Changes
Modified src/OFSystemInfo+NetworkInterfaces.h from [b18248e68a] to [0c237980b3].
| ︙ | ︙ | |||
37 38 39 40 41 42 43 44 45 46 47 48 49 50 | /** * @brief The index of a network interface. * * This maps to an @ref OFNumber. */ extern OFNetworkInterfaceKey OFNetworkInterfaceIndex; /** * @brief The IPv4 addresses of a network interface. * * This maps to an @ref OFData of @ref OFSocketAddress. */ extern OFNetworkInterfaceKey OFNetworkInterfaceIPv4Addresses; | > > > > > > > | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | /** * @brief The index of a network interface. * * This maps to an @ref OFNumber. */ extern OFNetworkInterfaceKey OFNetworkInterfaceIndex; /** * @brief The hardware address of a network interface. * * This maps to an @ref OFData. */ extern OFNetworkInterfaceKey OFNetworkInterfaceHardwareAddress; /** * @brief The IPv4 addresses of a network interface. * * This maps to an @ref OFData of @ref OFSocketAddress. */ extern OFNetworkInterfaceKey OFNetworkInterfaceIPv4Addresses; |
| ︙ | ︙ |
Modified src/OFSystemInfo+NetworkInterfaces.m from [f27da60e07] to [b1a1002ffe].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
*/
#include "config.h"
#import "OFSystemInfo.h"
OFNetworkInterfaceKey OFNetworkInterfaceIndex = @"OFNetworkInterfaceIndex";
OFNetworkInterfaceKey OFNetworkInterfaceIPv4Addresses =
@"OFNetworkInterfaceIPv4Addresses";
#ifdef OF_HAVE_IPV6
OFNetworkInterfaceKey OFNetworkInterfaceIPv6Addresses =
@"OFNetworkInterfaceIPv6Addresses";
#endif
#ifdef OF_HAVE_IPX
| > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 |
*/
#include "config.h"
#import "OFSystemInfo.h"
OFNetworkInterfaceKey OFNetworkInterfaceIndex = @"OFNetworkInterfaceIndex";
OFNetworkInterfaceKey OFNetworkInterfaceHardwareAddress =
@"OFNetworkInterfaceHardwareAddress";
OFNetworkInterfaceKey OFNetworkInterfaceIPv4Addresses =
@"OFNetworkInterfaceIPv4Addresses";
#ifdef OF_HAVE_IPV6
OFNetworkInterfaceKey OFNetworkInterfaceIPv6Addresses =
@"OFNetworkInterfaceIPv6Addresses";
#endif
#ifdef OF_HAVE_IPX
|
| ︙ | ︙ |
Modified src/platform/Windows/OFSystemInfo+NetworkInterfaces.m from [110ef6cce6] to [3ab22d3ec6].
| ︙ | ︙ | |||
88 89 90 91 92 93 94 95 96 97 98 99 100 101 |
interface = [OFMutableDictionary dictionary];
[ret setObject: interface forKey: name];
}
index = [OFNumber numberWithUnsignedInt: iter->IfIndex];
[interface setObject: index
forKey: OFNetworkInterfaceIndex];
for (PIP_ADAPTER_UNICAST_ADDRESS_LH addrIter =
iter->FirstUnicastAddress; addrIter != NULL;
addrIter = addrIter->Next) {
OFSocketAddress address;
int length;
OFNetworkInterfaceKey key;
| > > > > > > > > > | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 |
interface = [OFMutableDictionary dictionary];
[ret setObject: interface forKey: name];
}
index = [OFNumber numberWithUnsignedInt: iter->IfIndex];
[interface setObject: index
forKey: OFNetworkInterfaceIndex];
if (iter->PhysicalAddressLength > 0) {
const OFNetworkInterfaceKey key =
OFNetworkInterfaceHardwareAddress;
OFData *address = [OFData
dataWithItems: iter->PhysicalAddress
count: iter->PhysicalAddressLength];
[interface setObject: address forKey: key];
}
for (PIP_ADAPTER_UNICAST_ADDRESS_LH addrIter =
iter->FirstUnicastAddress; addrIter != NULL;
addrIter = addrIter->Next) {
OFSocketAddress address;
int length;
OFNetworkInterfaceKey key;
|
| ︙ | ︙ | |||
179 180 181 182 183 184 185 |
return nil;
for (PIP_ADAPTER_INFO iter = adapterInfo; iter != NULL;
iter = iter->Next) {
OFMutableDictionary *interface;
OFString *name, *IPString;
OFNumber *index;
| | > > > > > > > > > | | | | 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 |
return nil;
for (PIP_ADAPTER_INFO iter = adapterInfo; iter != NULL;
iter = iter->Next) {
OFMutableDictionary *interface;
OFString *name, *IPString;
OFNumber *index;
OFSocketAddress IPv4Address;
OFData *addresses;
name = [OFString stringWithCString: iter->AdapterName
encoding: encoding];
if ((interface = [ret objectForKey: name]) == nil) {
interface = [OFMutableDictionary dictionary];
[ret setObject: interface forKey: name];
}
index = [OFNumber numberWithUnsignedInt: iter->Index];
[interface setObject: index
forKey: OFNetworkInterfaceIndex];
if (iter->AddressLength > 0) {
const OFNetworkInterfaceKey key =
OFNetworkInterfaceHardwareAddress;
OFData *address = [OFData
dataWithItems: iter->Address
count: iter->AddressLength];
[interface setObject: address forKey: key];
}
IPString = [OFString
stringWithCString: iter->IpAddressList.IpAddress
.String
encoding: encoding];
if ([IPString isEqual: @"0.0.0.0"])
continue;
IPv4Address = OFSocketAddressParseIPv4(IPString, 0);
addresses = [OFData dataWithItems: &IPv4Address
count: 1
itemSize: sizeof(IPv4Address)];
[interface setObject: addresses
forKey: OFNetworkInterfaceIPv4Addresses];
}
} @finally {
free(adapterInfo);
}
|
| ︙ | ︙ |
Modified tests/OFSystemInfoTests.m from [0e4318d01d] to [a3f524d376].
| ︙ | ︙ | |||
132 133 134 135 136 137 138 139 140 141 142 143 144 145 |
#ifdef OF_HAVE_SOCKETS
networkInterfaces = [OFSystemInfo networkInterfaces];
[OFStdOut writeString: @"[OFSystemInfo] Network interfaces: "];
for (OFString *name in networkInterfaces) {
bool firstAddress = true;
OFNetworkInterface interface;
if (!firstInterface)
[OFStdOut writeString: @"; "];
firstInterface = false;
[OFStdOut writeFormat: @"%@(", name];
| > | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 |
#ifdef OF_HAVE_SOCKETS
networkInterfaces = [OFSystemInfo networkInterfaces];
[OFStdOut writeString: @"[OFSystemInfo] Network interfaces: "];
for (OFString *name in networkInterfaces) {
bool firstAddress = true;
OFNetworkInterface interface;
OFData *hardwareAddress;
if (!firstInterface)
[OFStdOut writeString: @"; "];
firstInterface = false;
[OFStdOut writeFormat: @"%@(", name];
|
| ︙ | ︙ | |||
156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | printAddresses([interface objectForKey: OFNetworkInterfaceIPXAddresses], &firstAddress); # endif # ifdef OF_HAVE_APPLETALK printAddresses([interface objectForKey: OFNetworkInterfaceAppleTalkAddresses], &firstAddress); # endif [OFStdOut writeString: @")"]; } [OFStdOut writeString: @"\n"]; #endif objc_autoreleasePoolPop(pool); } @end | > > > > > > > > > > > > > > > > > | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 |
printAddresses([interface objectForKey:
OFNetworkInterfaceIPXAddresses], &firstAddress);
# endif
# ifdef OF_HAVE_APPLETALK
printAddresses([interface objectForKey:
OFNetworkInterfaceAppleTalkAddresses], &firstAddress);
# endif
hardwareAddress = [interface
objectForKey: OFNetworkInterfaceHardwareAddress];
if (hardwareAddress != nil) {
const unsigned char *bytes = hardwareAddress.items;
size_t length = hardwareAddress.count;
if (!firstAddress)
[OFStdOut writeString: @", "];
for (size_t i = 0; i < length; i++) {
if (i > 0)
[OFStdOut writeString: @":"];
[OFStdOut writeFormat: @"%02X", bytes[i]];
}
}
[OFStdOut writeString: @")"];
}
[OFStdOut writeString: @"\n"];
#endif
objc_autoreleasePoolPop(pool);
}
@end
|