Overview
| Comment: | +[OFSystemInfo networkInterfaces]: MAC on *BSD |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
8bb7b534a8afc4fafcf39d58a0475e54 |
| User & Date: | js on 2023-06-18 14:29:52 |
| Other Links: | manifest | tags |
Context
|
2023-06-19
| ||
| 19:22 | Minor style fixes check-in: da7db4d68c user: js tags: trunk | |
|
2023-06-18
| ||
| 14:29 | +[OFSystemInfo networkInterfaces]: MAC on *BSD check-in: 8bb7b534a8 user: js tags: trunk | |
|
2023-06-17
| ||
| 21:55 | OFSPX*SocketTests: Connect to specific net + node check-in: 652dc3c52b user: js tags: trunk | |
Changes
Modified configure.ac from [f817109140] to [d991473ff0].
| ︙ | ︙ | |||
1442 1443 1444 1445 1446 1447 1448 | AC_DEFINE(OF_HAVE_NETINET_IN_H, 1, [Whether we have netinet/in.h]) ]) AC_CHECK_HEADER(netinet/tcp.h, [ AC_DEFINE(OF_HAVE_NETINET_TCP_H, 1, [Whether we have netinet/tcp.h]) ]) | | > > > > > > > > > | 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 | AC_DEFINE(OF_HAVE_NETINET_IN_H, 1, [Whether we have netinet/in.h]) ]) AC_CHECK_HEADER(netinet/tcp.h, [ AC_DEFINE(OF_HAVE_NETINET_TCP_H, 1, [Whether we have netinet/tcp.h]) ]) AC_CHECK_HEADERS([arpa/inet.h netdb.h]) AC_CHECK_HEADERS([net/if.h net/if_arp.h net/if_dl.h net/if_types.h]) AC_CHECK_FUNCS([if_indextoname if_nametoindex]) AC_CHECK_TYPES([struct sockaddr_dl], [], [], [ #ifdef HAVAE_SYS_TYPES_H # include <sys/types.h> #endif #ifdef HAVE_NET_IF_DL_H # include <net/if_dl.h> #endif ]) AC_CHECK_HEADER(sys/un.h, [ AC_DEFINE(OF_HAVE_SYS_UN_H, 1, [Whether we have sys/un.h]) ]) AC_CHECK_MEMBER([struct sockaddr_in6.sin6_addr], [ AC_EGREP_CPP(egrep_cpp_yes, [ #ifdef _WIN32 typedef int BOOL; |
| ︙ | ︙ |
Modified src/platform/POSIX/OFSystemInfo+NetworkInterfaces.m from [1453e7f2e0] to [5833caf501].
| ︙ | ︙ | |||
20 21 22 23 24 25 26 27 28 29 30 31 32 33 | #endif #ifdef OF_HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif #ifdef HAVE_NET_IF_H # include <net/if.h> #endif #import "OFSystemInfo.h" #import "OFSystemInfo+NetworkInterfaces.h" #import "OFArray.h" #import "OFData.h" #import "OFDictionary.h" #ifdef OF_HAVE_FILES | > > > > > > > > > | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | #endif #ifdef OF_HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif #ifdef HAVE_NET_IF_H # include <net/if.h> #endif #ifdef HAVE_NET_IF_ARP_H # include <net/if_arp.h> #endif #ifdef HAVE_NET_IF_DL_H # include <net/if_dl.h> #endif #ifdef HAVE_NET_IF_TYPES_H # include <net/if_types.h> #endif #import "OFSystemInfo.h" #import "OFSystemInfo+NetworkInterfaces.h" #import "OFArray.h" #import "OFData.h" #import "OFDictionary.h" #ifdef OF_HAVE_FILES |
| ︙ | ︙ | |||
314 315 316 317 318 319 320 | memset(&ifr, 0, sizeof(ifr)); memcpy(&ifr.ifr_name, [name cStringWithEncoding: encoding], nameLength); if (ioctl(sock, SIOCGIFHWADDR, &ifr) < 0) continue; | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 |
memset(&ifr, 0, sizeof(ifr));
memcpy(&ifr.ifr_name, [name cStringWithEncoding: encoding],
nameLength);
if (ioctl(sock, SIOCGIFHWADDR, &ifr) < 0)
continue;
if (ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER)
continue;
hardwareAddress = [OFData dataWithItems: ifr.ifr_hwaddr.sa_data
count: 6];
[[ret objectForKey: name]
setObject: hardwareAddress
forKey: OFNetworkInterfaceHardwareAddress];
}
return true;
#elif defined(HAVE_IOCTL) && defined(HAVE_NET_IF_H) && \
defined(HAVE_STRUCT_SOCKADDR_DL)
OFStringEncoding encoding = [OFLocale encoding];
int sock = socket(AF_INET, SOCK_DGRAM, 0);
struct ifconf ifc;
struct ifreq *ifrs;
if (sock < 0)
return false;
ifrs = malloc(128 * sizeof(struct ifreq));
if (ifrs == NULL) {
closesocket(sock);
return false;
}
@try {
char *buffer;
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;
buffer = ifc.ifc_buf;
while (buffer < (char *)ifc.ifc_buf + ifc.ifc_len) {
struct ifreq *current = (struct ifreq *)(void *)buffer;
struct sockaddr_dl *sdl;
OFString *name;
OFMutableDictionary *interface;
OFData *hardwareAddress;
if (current->ifr_addr.sa_family != AF_LINK)
goto next;
sdl = (struct sockaddr_dl *)(void *)¤t->ifr_addr;
if (sdl->sdl_type != IFT_ETHER)
goto next;
name = [OFString stringWithCString: current->ifr_name
encoding: encoding];
if ((interface = [ret objectForKey: name]) == nil) {
interface = [OFMutableDictionary dictionary];
[ret setObject: interface forKey: name];
}
hardwareAddress = [OFData dataWithItems: LLADDR(sdl)
count: sdl->sdl_alen];
[interface
setObject: hardwareAddress
forKey: OFNetworkInterfaceHardwareAddress];
next:
# ifdef _SIZEOF_ADDR_IFREQ
buffer += _SIZEOF_ADDR_IFREQ(*current);
# else
buffer += sizeof(struct ifreq);
# endif
}
} @finally {
free(ifrs);
closesocket(sock);
}
return true;
#else
return false;
#endif
}
|
| ︙ | ︙ |