generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-30 22:31:29 +01:00
Code Issues Projects Releases Wiki Activity

trunk/branch integration: fix

Browse Source
This commit is contained in:
Marian Krivos 2011-08-23 06:43:12 +00:00
parent 52e8c4f75b
commit 1fedc0d674
1 changed files with 175 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Foundation/src/Environment_VX.cpp
View File

@ -1,7 +1,7 @@
// Environment_VX.cpp // Environment_VX.cpp
// //
// $Id: //poco/1.4/Foundation/src/Environment_VX.cpp#1 $ // $Id: //poco/1.4/Foundation/src/Environment_VX.cpp#2 $
// //
// Library: Foundation // Library: Foundation
// Package: Core // Package: Core
@ -53,8 +53,8 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <net/if.h> #include <net/if.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <net/if.h> #include <netinet/if_ether.h>
#include <net/if_arp.h> #include <ifLib.h>
#include <unistd.h> #include <unistd.h>
@ -151,34 +151,23 @@ unsigned EnvironmentImpl::processorCountImpl()
void EnvironmentImpl::nodeIdImpl(NodeId& id) void EnvironmentImpl::nodeIdImpl(NodeId& id)
{ {
std::memset(&id, 0, sizeof(id)); std::memset(&id, 0, sizeof(id));
int ifIndex = 0;
int ifIndex = 1;
char ifName[32]; char ifName[32];
char ifAddr[4];
int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (s == -1) return;
for (;;) for (;;)
{ {
if (ifIndexToIfName(ifIndex, ifName) == OK) if (ifIndexToIfName(ifIndex, ifName) == OK)
{ {
if (ifAddrGet(ifName, ifAddr) == OK) struct ifnet* pIf = ifunit(ifName);
if (pIf)
{ {
struct arpreq ar; std::memcpy(&id, ((struct arpcom *) pIf)->ac_enaddr, sizeof(id));
std::memset(&ar, 0, sizeof(ar));
struct sockaddr_in* pAddr = reinterpret_cast<struct sockaddr_in*>(&ar.arp_pa);
pAddr->sin_family = AF_INET;
std::memcpy(&pAddr->sin_addr, ifAddr, sizeof(struct in_addr));
int rc = ioctl(s, SIOCGARP, reinterpret_cast<int>(&ar));
if (rc < 0) continue;
std::memcpy(&id, ar.arp_ha.sa_data, sizeof(id));
close(s);
return; return;
} }
} }
else break; else break;
++ifIndex;
} }
close(s);
throw SystemException("cannot get Ethernet hardware address"); throw SystemException("cannot get Ethernet hardware address");
} }