X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fuuid.lua;h=796c8ee4c47247dd049e6bb3561ab5223ced74bc;hb=9a348d3d643e3768b5a6d882683cfbbd356ffd3b;hp=e928259d617f9872222193869580ff2858895673;hpb=43ef081e34bc38d0ab014f1b187bc0524424d3f0;p=prosody.git

diff --git a/util/uuid.lua b/util/uuid.lua
index e928259d..796c8ee4 100644
--- a/util/uuid.lua
+++ b/util/uuid.lua
@@ -1,6 +1,6 @@
--- Prosody IM v0.4
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -27,8 +27,24 @@ local function new_random(x)
 	return sha1(x..os_clock()..tostring({}), true);
 end
 
+local buffer = new_random(uniq_time());
+local function _seed(x)
+	buffer = new_random(buffer..x);
+end
+local function get_nibbles(n)
+	if #buffer < n then _seed(uniq_time()); end
+	local r = buffer:sub(0, n);
+	buffer = buffer:sub(n+1);
+	return r;
+end
+local function get_twobits()
+	return ("%x"):format(get_nibbles(1):byte() % 4 + 8);
+end
+
 function generate()
-	return new_random(uniq_time());
+	-- generate RFC 4122 complaint UUIDs (version 4 - random)
+	return get_nibbles(8).."-"..get_nibbles(4).."-4"..get_nibbles(3).."-"..(get_twobits())..get_nibbles(3).."-"..get_nibbles(12);
 end
+seed = _seed;
 
 return _M;