gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-02-22 02:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOControl/EOKeyGlobalID.m ([+assignGloballyUniqueBytes:]):

Browse source 
Handle IPv6 addresses gracefully.
	[BUG:22486 reported by Blake Nicholson].


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@26206 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2008-03-05 15:20:09 +00:00
parent d675c3dd6e
commit 9eed6a685e
2 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-03-05 David Ayers <ayers@fsfe.org>
* EOControl/EOKeyGlobalID.m ([+assignGloballyUniqueBytes:]):
Handle IPv6 addresses gracefully.
[BUG:22486 reported by Blake Nicholson].
2008-02-06 David Ayers <ayers@fsfe.org> 2008-02-06 David Ayers <ayers@fsfe.org>
* EOControl/EODefines.h (GDL2CONTROL_EXPORT/DECLARE), * EOControl/EODefines.h (GDL2CONTROL_EXPORT/DECLARE),

45
EOControl/EOGlobalID.m
View file

@ -36,11 +36,12 @@
RCS_ID("$Id$") RCS_ID("$Id$")
#ifdef GNUSTEP #ifdef GNUSTEP
#include <Foundation/NSCoder.h>
#include <Foundation/NSString.h>
#include <Foundation/NSArray.h> #include <Foundation/NSArray.h>
#include <Foundation/NSProcessInfo.h> #include <Foundation/NSCoder.h>
#include <Foundation/NSData.h>
#include <Foundation/NSHost.h> #include <Foundation/NSHost.h>
#include <Foundation/NSProcessInfo.h>
#include <Foundation/NSString.h>
#else #else
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
#endif #endif
@ -95,7 +96,7 @@ NSString *EOGlobalIDChangedNotification = @"EOGlobalIDChangedNotification";
@implementation EOTemporaryGlobalID @implementation EOTemporaryGlobalID
static unsigned short sequence = (unsigned short)-1; static unsigned short sequence = USHRT_MAX;
+ (EOTemporaryGlobalID *)temporaryGlobalID + (EOTemporaryGlobalID *)temporaryGlobalID
{ {
@ -113,7 +114,7 @@ static unsigned short sequence = (unsigned short)-1;
+ (void)assignGloballyUniqueBytes: (unsigned char *)buffer + (void)assignGloballyUniqueBytes: (unsigned char *)buffer
{ {
static int pid = 0; static int pid = 0;
static unsigned char ipComp[4]; static union { unsigned int i; unsigned char c[4]; } ipComp = { .i = 0 };
unsigned char *bPtr; unsigned char *bPtr;
unsigned short seq; unsigned short seq;
unsigned int i; unsigned int i;
@ -132,10 +133,26 @@ static unsigned short sequence = (unsigned short)-1;
ipString = [[NSHost currentHost] address]; ipString = [[NSHost currentHost] address];
ipComps = [ipString componentsSeparatedByString: @"."]; ipComps = [ipString componentsSeparatedByString: @"."];
for (i=0; i<4; i++) if ([ipComps count] == 4)
{ { /*IPv4*/
NSString *comp = [ipComps objectAtIndex: i]; for (i=0; i<4; i++)
ipComp[i] = (unsigned char)[comp intValue]; {
NSString *comp = [ipComps objectAtIndex: i];
ipComp.c[i] = (unsigned char)[comp intValue];
}
}
else
{ /*IPv6:
This is not globaly unique since we do not utilize
all available data, yet the same goes for RFC1918
IPv4 addresses so this should suffice in practice. */
/*According to C99 Annex J.1
The value of a union member other than the last one stored into
is unspecified behavior. But -base uses this to produce hash
values for NSNumber also and we are pretty much doing the same
here. (also see time union).
*/
ipComp.i = [ipString hash];
} }
} }
@ -158,14 +175,14 @@ static unsigned short sequence = (unsigned short)-1;
buffer[6] = bPtr[2]; buffer[6] = bPtr[2];
buffer[7] = bPtr[3]; buffer[7] = bPtr[3];
buffer[8] = ipComp[0]; buffer[8] = ipComp.c[0];
buffer[9] = ipComp[1]; buffer[9] = ipComp.c[1];
buffer[10] = ipComp[2]; buffer[10] = ipComp.c[2];
buffer[11] = ipComp[3]; buffer[11] = ipComp.c[3];
if (sequence == 0) if (sequence == 0)
{ {
sequence = (unsigned short)-1; sequence = USHRT_MAX;
} }
EOFLOGObjectFnStop(); EOFLOGObjectFnStop();