generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-24 17:30:44 +02:00
Code Issues Projects Releases Wiki Activity

On Linux, Poco::Environment::nodeId() first always tries to obtain the MAC address of eth0 before trying other interfaces

Browse Source
This commit is contained in:
Guenter Obiltschnig
2013-02-14 16:26:19 +01:00
parent 72b5b7acae
commit e9ec584733
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Foundation/src/Environment_UNIX.cpp
View File

@@ -42,7 +42,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <sys/param.h> #include <sys/param.h>
#include <cstring>
#if defined(POCO_OS_FAMILY_BSD) #if defined(POCO_OS_FAMILY_BSD)
#include <sys/sysctl.h> #include <sys/sysctl.h>
#elif POCO_OS == POCO_OS_HPUX #elif POCO_OS == POCO_OS_HPUX
@@ -215,6 +214,10 @@ void EnvironmentImpl::nodeIdImpl(NodeId& id)
#endif #endif
#include <arpa/inet.h> #include <arpa/inet.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <cstdio>
namespace Poco { namespace Poco {
@@ -223,6 +226,26 @@ namespace Poco {
void EnvironmentImpl::nodeIdImpl(NodeId& id) void EnvironmentImpl::nodeIdImpl(NodeId& id)
{ {
std::memset(&id, 0, sizeof(id)); std::memset(&id, 0, sizeof(id));
// ideally, the following code should be rewritten
// to use netlink
// first try to obtain the MAC address of eth0 using /sys/class/net
int fd = open("/sys/class/net/eth0/address", O_RDONLY);
if (fd >= 0)
{
char buffer[18];
int n = read(fd, buffer, 17);
close(fd);
if (n == 17)
{
buffer[n] = 0;
if (std::sscanf(buffer, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &id[0], &id[1], &id[2], &id[3], &id[4], &id[5]) == 6)
return;
}
}
// if that did not work, search active interfaces
int sock = socket(PF_INET, SOCK_DGRAM, 0); int sock = socket(PF_INET, SOCK_DGRAM, 0);
if (sock == -1) return; if (sock == -1) return;