Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

David 5 Nov 2008 

- client: make host CPID a function of:
        MAC addresses + hostname + IP addr
        This means that a given host will generally always get the same CPID.
        Helpful e.g. on grids where the client gets installed repeatedly.
        From Artyom Sharov.

    client/
        hostinfo_network.cpp
    lib/
        hostinfo.cpp
        mac_address.cpp,h
    win_build/
        boinc_cli_curl.vcproj
        libboinc.vcproj

svn path=/trunk/boinc/; revision=16432
This commit is contained in:
David Anderson 2008-11-05 20:11:45 +00:00
parent ab9985cc28
commit 5141a6eabe
7 changed files with 271 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
checkin_notes
View File

@ -9233,3 +9233,19 @@ Rom 5 Nov 2008
clientgui/
BOINCGUIApp.cpp
DlgExitMessage.cpp
David 5 Nov 2008
- client: make host CPID a function of:
MAC addresses + hostname + IP addr
This means that a given host will generally always get the same CPID.
Helpful e.g. on grids where the client gets installed repeatedly.
From Artyom Sharov.
client/
hostinfo_network.cpp
lib/
hostinfo.cpp
mac_address.cpp,h
win_build/
boinc_cli_curl.vcproj
libboinc.vcproj

37
client/hostinfo_network.cpp
View File

@ -47,9 +47,11 @@
#include "str_util.h"
#include "parse.h"
#include "util.h"
#include "file_names.h"
#include "client_msgs.h"
#include "error_numbers.h"
#include "mac_address.h"
#include "hostinfo.h"
@ -76,4 +78,39 @@ int HOST_INFO::get_local_network_info() {
return 0;
}
// make a random string using host info.
// Not recommended for password generation;
// use as a last resort if more secure methods fail
//
void HOST_INFO::make_random_string(const char* salt, char* out) {
char buf[1024];
sprintf(buf, "%f%s%s%f%s", dtime(), domain_name, ip_addr, d_free, salt);
md5_block((const unsigned char*) buf, (int)strlen(buf), out);
}
// make a host cross-project ID.
// Should be unique across hosts with very high probability
//
void HOST_INFO::generate_host_cpid() {
#if defined(__linux__) || defined(_WIN32) || defined(__APPLE__ )
char buffer[8192] = "";
// must be big enough to accommodate aa:bb:cc:dd:ee:ff
// times the number of network interfaces,
// plus the domain name, plus the ip addr.
// 8K should suffice
if (!get_mac_addresses(buffer) || ! strcmp(buffer, "")) {
make_random_string("", host_cpid);
return;
}
strcat(buffer, domain_name);
strcat(buffer, ip_addr);
md5_block((unsigned char*)buffer, (int)strlen(buffer), host_cpid);
#else
make_random_string("", host_cpid);
#endif
}
const char *BOINC_RCSID_9275b20aa5 = "$Id$";

19
lib/hostinfo.cpp
View File

@ -201,23 +201,4 @@ int HOST_INFO::write_cpu_benchmarks(FILE* out) {
return 0;
}
// make a random string using host info.
// Not recommended for password generation;
// use as a last resort if more secure methods fail
//
void HOST_INFO::make_random_string(const char* salt, char* out) {
char buf[1024];
sprintf(buf, "%f%s%s%f%s", dtime(), domain_name, ip_addr, d_free, salt);
md5_block((const unsigned char*) buf, (int)strlen(buf), out);
}
// make a host cross-project ID.
// Should be unique across hosts with very high probability
//
void HOST_INFO::generate_host_cpid() {
make_random_string("", host_cpid);
}
const char *BOINC_RCSID_edf7e5c147 = "$Id$";

200
lib/mac_address.cpp Normal file
View File

@ -0,0 +1,200 @@
#include "mac_address.h"
#include <string.h>
#if defined(__linux__)
#include <stdio.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <net/if.h>
#include <netinet/ether.h>
#elif defined(_WIN32)
#include <windows.h>
#include <Iphlpapi.h>
#elif defined(__APPLE__)
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <paths.h>
#include <sysexits.h>
#include <sys/param.h>
#include <CoreFoundation/CoreFoundation.h>
#include <IOKit/IOKitLib.h>
#include <IOKit/network/IOEthernetInterface.h>
#include <IOKit/network/IOEthernetController.h>
// Returns an iterator across all known Ethernet interfaces. Caller is responsible for
// releasing the iterator when iteration is complete.
static kern_return_t
FindEthernetInterfaces(io_iterator_t *matchingServices)
{
kern_return_t kernResult;
mach_port_t masterPort;
CFMutableDictionaryRef classesToMatch;
kernResult = IOMasterPort(MACH_PORT_NULL, &masterPort);
if (KERN_SUCCESS != kernResult) fprintf(stderr, "IOMasterPort returned %d\n", kernResult);
// Ethernet interfaces are instances of class kIOEthernetInterfaceClass
classesToMatch = IOServiceMatching(kIOEthernetInterfaceClass);
// Note that another option here would be: classesToMatch = IOBSDMatching("enX");
// where X is a number from 0 to the number of Ethernet interfaces on the system - 1.
if (classesToMatch == NULL) fprintf(stderr, "IOServiceMatching returned a NULL dictionary.\n");
kernResult = IOServiceGetMatchingServices(masterPort, classesToMatch, matchingServices);
if (KERN_SUCCESS != kernResult) fprintf(stderr, "IOServiceGetMatchingServices returned %d\n", kernResult);
return kernResult;
}
// Given an iterator across a set of Ethernet interfaces, return the MAC address of the first one.
// If no interfaces are found the MAC address is set to an empty string.
static kern_return_t
GetMACAddress(io_iterator_t intfIterator, char* buffer)
{
io_object_t intfService;
io_object_t controllerService;
kern_return_t kernResult = KERN_FAILURE;
char delimiter[2] = "\0";
while (intfService = IOIteratorNext(intfIterator))
{
CFTypeRef MACAddressAsCFData;
// IONetworkControllers can't be found directly by the IOServiceGetMatchingServices call,
// matching mechanism. So we've found the IONetworkInterface and will get its parent controller
// by asking for it specifically.
kernResult = IORegistryEntryGetParentEntry( intfService, kIOServicePlane, &controllerService );
if (KERN_SUCCESS != kernResult) fprintf(stderr, "IORegistryEntryGetParentEntry returned 0x%08x\n", kernResult);
else {
MACAddressAsCFData = IORegistryEntryCreateCFProperty( controllerService, CFSTR(kIOMACAddress), kCFAllocatorDefault, 0);
if (MACAddressAsCFData)
{
const __CFData* refData = (const __CFData*)MACAddressAsCFData;
UInt8 MACAddress[ kIOEthernetAddressSize ];
CFDataGetBytes(refData, CFRangeMake(0,CFDataGetLength(refData)), MACAddress);
sprintf(buffer, "%s%s%02x:%02x:%02x:%02x:%02x:%02x",
buffer, delimiter,
MACAddress[0], MACAddress[1], MACAddress[2], MACAddress[3], MACAddress[4], MACAddress[5]);
CFRelease(MACAddressAsCFData);
delimiter[0] = ':';
delimiter[1] = '\0';
}
(void) IOObjectRelease(controllerService);
}
// We have sucked this service dry of information so release it now.
(void) IOObjectRelease(intfService);
// We're just interested in the first interface so exit the loop.
//break;
}
return kernResult;
}
#endif
bool
get_mac_addresses(char* addresses) {
#if defined(_WIN32)
IP_ADAPTER_INFO AdapterInfo[16]; // Allocate information for up to 16 NICs
DWORD dwBufLen = sizeof(AdapterInfo); // Save memory size of buffer
// Call GetAdapterInfo
DWORD dwStatus = GetAdaptersInfo(AdapterInfo, &dwBufLen);
if(dwStatus == ERROR_SUCCESS)
{
strcpy(addresses, "");
char delimiter[2] = "\0";
// valid, no buffer overflow
PIP_ADAPTER_INFO pAdapterInfo = AdapterInfo; // Contains pointer to current adapter info
do {
sprintf(addresses, "%s%s%02x:%02x:%02x:%02x:%02x:%02x", addresses, delimiter,
pAdapterInfo->Address[0], pAdapterInfo->Address[1], pAdapterInfo->Address[2],
pAdapterInfo->Address[3], pAdapterInfo->Address[4], pAdapterInfo->Address[5]);
delimiter[0] = ':';
delimiter[1] = '\0';
pAdapterInfo = pAdapterInfo->Next;
}
while(pAdapterInfo);
}
else
{
fprintf(stderr, "Adapters information not found\n");
return false;
}
return true;
#elif defined(__linux__)
char buf[1024];
struct ifconf ifc;
struct ifreq *ifr;
int sck;
int nInterfaces;
int i;
/* Get a socket handle. */
sck = socket(AF_INET, SOCK_DGRAM, 0);
if(sck < 0)
{
perror("socket");
return false;
}
/* Query available interfaces. */
ifc.ifc_len = sizeof(buf);
ifc.ifc_buf = buf;
if(ioctl(sck, SIOCGIFCONF, &ifc) < 0)
{
perror("ioctl(SIOCGIFCONF)");
return false;
}
/* Iterate through the list of interfaces. */
ifr = ifc.ifc_req;
nInterfaces = ifc.ifc_len / sizeof(struct ifreq);
strcpy(addresses, "");
char delimiter[2] = "\0";
for(i = 0; i < nInterfaces; i++)
{
struct ifreq *item = &ifr[i];
/* Get the MAC address */
if(ioctl(sck, SIOCGIFHWADDR, item) < 0)
{
perror("ioctl(SIOCGIFHWADDR)");
return false;
}
strcat(addresses, delimiter);
delimiter[0] = ':';
delimiter[1] = '\0';
strcat(addresses, ether_ntoa((struct ether_addr *)item->ifr_hwaddr.sa_data));
}
return true;
#elif defined(__APPLE__)
kern_return_t kernResult = KERN_SUCCESS; // on PowerPC this is an int (4 bytes)
/*
* error number layout as follows (see mach/error.h and IOKitLib/IOReturn.h):
*
* hi lo
* | system(6) | subsystem(12) | code(14) |
*/
io_iterator_t intfIterator;
kernResult = FindEthernetInterfaces(&intfIterator);
if (KERN_SUCCESS != kernResult) fprintf(stderr, "FindEthernetInterfaces returned 0x%08x\n", kernResult);
else
{
kernResult = GetMACAddress(intfIterator, addresses);
if (KERN_SUCCESS != kernResult) fprintf(stderr, "GetMACAddress returned 0x%08x\n", kernResult);
}
IOObjectRelease(intfIterator);
return kernResult;
#endif
}

9
lib/mac_address.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef MAC_ADDRESS_H
#define MAC_ADDRESS_H
// Note: the code on Mac OS X requires the following linkage flags
// -framework CoreFoundation -lIOKit
bool
get_mac_addresses(char* addresses);
#endif // MAC_ADDRESS_H

2
win_build/boinc_cli_curl.vcproj
View File

@ -85,7 +85,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="zlib1d.lib ssleay32.lib libeay32.lib libcurld_imp.lib MSVCRTD.LIB MSVCPRTD.LIB wsock32.lib wininet.lib winmm.lib sensapi.lib"
AdditionalDependencies="zlib1d.lib ssleay32.lib libeay32.lib libcurld_imp.lib MSVCRTD.LIB MSVCPRTD.LIB wsock32.lib wininet.lib winmm.lib sensapi.lib Iphlpapi.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc.exe"
LinkIncremental="2"
SuppressStartupBanner="true"

8
win_build/libboinc.vcproj
View File

@ -963,6 +963,10 @@
RelativePath="..\lib\hostinfo.cpp"
>
</File>
<File
RelativePath="..\lib\mac_address.cpp"
>
</File>
<File
RelativePath="..\lib\md5.c"
>
@ -1297,6 +1301,10 @@
RelativePath="..\lib\hostinfo.h"
>
</File>
<File
RelativePath="..\lib\mac_address.h"
>
</File>
<File
RelativePath="..\lib\md5.h"
>