Merge 0.9->0.10

[prosody.git] / util / uuid.lua

diff --git a/util/uuid.lua b/util/uuid.lua
index 5a355b0248fc08184ead51e2848c55ba2eb30fbe..e10fc0f72290a996c09560632e4c94603dff74fb 100644 (file)
--- a/util/uuid.lua
+++ b/util/uuid.lua
@@ -1,18 +1,32 @@
--- Prosody IM v0.3
--- 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.
 --
 
+local random = require "util.random";
+local random_bytes = random.bytes;
+local hex = require "util.hex".to;
+local m_ceil = math.ceil;
 
+local function get_nibbles(n)
+       return hex(random_bytes(m_ceil(n/2))):sub(1, n);
+end
 
-local m_random = math.random;
-module "uuid"
+local function get_twobits()
+       return ("%x"):format(get_nibbles(1):byte() % 4 + 8);
+end
 
-function generate()
-       return m_random(0, 99999999);
+local function generate()
+       -- 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
 
-return _M;
\ No newline at end of file
+return {
+       get_nibbles=get_nibbles;
+       generate = generate ;
+       -- COMPAT
+       seed = random.seed;
+};