Merge 0.9->0.10

[prosody.git] / util / uuid.lua

diff --git a/util/uuid.lua b/util/uuid.lua
index 0b8526f905ea987ce69285ff852b66e6c5ff8119..e10fc0f72290a996c09560632e4c94603dff74fb 100644 (file)
--- a/util/uuid.lua
+++ b/util/uuid.lua
@@ -1,29 +1,32 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
--- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- 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;
+};