Rework.

Author: andywolk

Makefile.am

@@ -300,7 +300,6 @@ library_include_HEADERS = \
 	libs/libteletone/src/libteletone_detect.h \
 	libs/libteletone/src/libteletone_generate.h \
 	libs/libteletone/src/libteletone.h \
-	src/include/switch_uuidv7.h \
 	src/include/switch_limit.h \
 	src/include/switch_odbc.h \
 	src/include/switch_hashtable.h \
@@ -812,3 +811,4 @@ support:
 	@cp support-d/.screenrc ~
 	@cp support-d/.bashrc ~
 	@test -f ~/.cc-mode-installed || sh support-d/install-cc-mode.sh && touch ~/.cc-mode-installed
+

src/include/switch_uuidv7.h renamed to src/include/private/switch_uuidv7_pvt.h

@@ -283,7 +283,7 @@ static inline int uuidv7_from_string(const char *string, uint8_t *uuid_out) {
  *                  process. The implementation-dependent code must be out of
  *                  the range of `int8_t` and negative if it reports an error.
  */
-int uuidv7_new(uint8_t *uuid_out);
+SWITCH_DECLARE(int) uuidv7_new(uint8_t *uuid_out);
 
 /**
  * Generates an 8-4-4-4-12 hexadecimal string representation of new UUIDv7.

src/mod/applications/mod_commands/mod_commands.c

@@ -2660,6 +2660,7 @@ SWITCH_STANDARD_API(ctl_function)
 			} else {
 				arg = 0;
 			}
+
 			switch_core_session_ctl(SCSC_SPS, &arg);
 			stream->write_function(stream, "+OK sessions per second: %d\n", arg);
 		} else if (!strcasecmp(argv[0], "uuid_version")) {
@@ -2668,6 +2669,7 @@ SWITCH_STANDARD_API(ctl_function)
 			} else {
 				arg = 0;
 			}
+
 			switch_core_session_ctl(SCSC_UUID_VERSION, &arg);
 			stream->write_function(stream, "+OK set uuid version: %d\n", arg);
 		} else if (!strcasecmp(argv[0], "sync_clock")) {

src/switch_apr.c

@@ -89,7 +89,8 @@
 #ifndef WIN32
 #include <uuid/uuid.h>
 #endif
-#include <switch_uuidv7.h>
+
+#include <private/switch_uuidv7_pvt.h>
 
 /* apr stubs */
 
@@ -1153,15 +1154,16 @@ SWITCH_DECLARE(void) switch_uuid_format(char *buffer, const switch_uuid_t *uuid)
 SWITCH_DECLARE(void) switch_uuid_get(switch_uuid_t *uuid)
 {
 	switch_mutex_lock(runtime.uuid_mutex);
-#ifndef WIN32
 	if (runtime.uuid_version == 7) {
 		uuidv7_new(uuid->data);
 	} else {
+#ifndef WIN32
 		uuid_generate(uuid->data);
-	}
 #else
-	UuidCreate((UUID *) uuid);
+		UuidCreate((UUID *)uuid);
 #endif
+	}
+
 	switch_mutex_unlock(runtime.uuid_mutex);
 }
 

src/switch_core.c

@@ -2963,13 +2963,15 @@ SWITCH_DECLARE(int32_t) switch_core_session_ctl(switch_session_ctl_t cmd, void *
 		if (oldintval > 0) {
 			runtime.sps_total = oldintval;
 		}
+
 		newintval = runtime.sps_total;
 		switch_mutex_unlock(runtime.throttle_mutex);
 		break;
 	case SCSC_UUID_VERSION:
 		if(oldintval > 0){
 			runtime.uuid_version = oldintval;
 		}
+
 		newintval = runtime.uuid_version;
 		break;
 	case SCSC_RECLAIM:

src/switch_uuidv7.c

@@ -30,15 +30,18 @@
  */
 
 #include <switch.h>
-#include "switch_uuidv7.h"
+#include "private/switch_uuidv7_pvt.h"
 #ifdef __APPLE__
-#include <sys/random.h> // for macOS getentropy()
+#include <sys/random.h> /* for macOS getentropy() */
+#endif
+#ifdef _MSC_VER
+#include <bcrypt.h> /* for BCryptGenRandom */
 #endif
 
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
 	#define SWITCH_THREAD_LOCAL static _Thread_local
 #else
-	// Fallback to compiler-specific or other methods
+	/* Fallback to compiler-specific or other methods */
 	#ifdef _MSC_VER
 		#define SWITCH_THREAD_LOCAL __declspec(thread)
 	#elif defined(__GNUC__)
@@ -56,6 +59,24 @@ SWITCH_THREAD_LOCAL uint8_t rand_bytes[10] = {0};
 SWITCH_THREAD_LOCAL size_t n_rand_consumed = 10;
 #endif
 
+static void switch_getentropy(unsigned char *rand_bytes, size_t n_rand_consumed) {
+#ifdef _MSC_VER
+	NTSTATUS status = BCryptGenRandom(
+		NULL,                          /* Algorithm handle (NULL for system-preferred RNG) */
+		rand_bytes,                    /* Buffer to receive random bytes */
+		(ULONG)n_rand_consumed,        /* Size of buffer in bytes */
+		BCRYPT_USE_SYSTEM_PREFERRED_RNG  /* Flag for system RNG */
+	);
+	if (status != 0) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error generating random bytes: 0x%lx\n", status);
+	}
+#else
+	if (getentropy(rand_bytes, n_rand_consumed) != 0) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "getentropy failed");
+	}
+#endif
+}
+
 SWITCH_DECLARE(int) uuidv7_new(uint8_t *uuid_out)
 {
 	int8_t status;
@@ -66,7 +87,7 @@ SWITCH_DECLARE(int) uuidv7_new(uint8_t *uuid_out)
 	uint8_t rand_bytes[10] = {0};
 #endif
 
-	getentropy(rand_bytes, n_rand_consumed);
+	switch_getentropy(rand_bytes, n_rand_consumed);
 #ifdef SWITCH_THREAD_LOCAL_NOT_SUPPORTED
 	status = uuidv7_generate(uuid_out, unix_ts_ms, rand_bytes, NULL);
 #else
@@ -77,6 +98,7 @@ SWITCH_DECLARE(int) uuidv7_new(uint8_t *uuid_out)
 	} else if (status == UUIDV7_STATUS_CLOCK_ROLLBACK) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "uuidv7_generate: clock rollback detected\n");
 	}
+
 #ifdef SWITCH_THREAD_LOCAL_NOT_SUPPORTED
 	return status;
 #else

tests/unit/switch_core.c

@@ -33,8 +33,7 @@
 #include <test/switch_test.h>
 
 #include <string.h>
-#include <uuid/uuid.h>
-#include <switch_uuidv7.h>
+#include <private/switch_uuidv7_pvt.h>
 
 #if defined(HAVE_OPENSSL)
 #include <openssl/ssl.h>
@@ -621,14 +620,20 @@ FST_CORE_BEGIN("./conf")
 		{
 			switch_uuid_t uuid;
 			char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1] = { 0 };
+			int version = 7;
+
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "test_create_uuid:\n");
+			switch_core_session_ctl(SCSC_UUID_VERSION, &version);
 			for (int i = 0; i < 100; i++) {
 				uint8_t status = uuidv7_new(uuid.data);
 				switch_uuid_format(uuid_str, &uuid);
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "uuidv7: %s\n", uuid_str);
 				fst_check(status >=0 && status < 4);
 			}
-			uuid_generate(uuid.data);
+
+			version = 4;
+			switch_core_session_ctl(SCSC_UUID_VERSION, &version);
+			switch_uuid_get(&uuid);
 			switch_uuid_format(uuid_str, &uuid);
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "uuidv4: %s\n", uuid_str);
 		}
@@ -640,7 +645,9 @@ FST_CORE_BEGIN("./conf")
 			switch_thread_t *thread[10] = {0};
 			switch_threadattr_t *thd_attr = NULL;
 			switch_status_t status;
+			int version = 7;
 
+			switch_core_session_ctl(SCSC_UUID_VERSION, &version);
 			switch_threadattr_create(&thd_attr, fst_pool);
 			switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
 
@@ -657,20 +664,24 @@ FST_CORE_BEGIN("./conf")
 		FST_TEST_BEGIN(test_create_uuid_speed)
 		{
 			int n;
+			int version = 4;
+
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "test_create_uuid_speed:\n");
+			switch_core_session_ctl(SCSC_UUID_VERSION, &version);
 			for (n = 1; n < 4; n++) {
 				switch_time_t started_at = switch_time_now();
 				double delta = 0;
 				switch_uuid_t uuid;
+
 				for (int i = 0; i < 1000 * pow(10, n); i++) {
 					uuidv7_new(uuid.data);
 				}
 				delta = (switch_time_now() - started_at) / 1000000.0;
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%d uuidv7_new used: %f seconds\n", 1000 * (int)pow(10, n), delta);
-
+				
 				started_at = switch_time_now();
 				for (long long int i = 0; i < 1000 * pow(10, n); i++) {
-					uuid_generate(uuid.data);
+					switch_uuid_get(&uuid);
 				}
 				delta = (switch_time_now() - started_at) / 1000000.0;
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%d uuid_generate used: %f seconds\n", 1000 * (int)pow(10, n), delta);

w32/Library/FreeSwitchCore.2017.vcxproj

@@ -412,6 +412,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
     <ClCompile Include="..\..\src\switch_stun.c" />
     <ClCompile Include="..\..\src\switch_time.c" />
     <ClCompile Include="..\..\src\switch_utils.c" />
+    <ClCompile Include="..\..\src\switch_uuidv7.c" />
     <ClCompile Include="..\..\src\switch_vad.c" />
     <ClCompile Include="..\..\src\switch_version.c" />
     <ClCompile Include="..\..\src\switch_vpx.c" />
@@ -748,6 +749,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
     <ClInclude Include="..\..\src\include\switch_stun.h" />
     <ClInclude Include="..\..\src\include\switch_types.h" />
     <ClInclude Include="..\..\src\include\switch_utils.h" />
+    <ClInclude Include="..\..\src\include\private\switch_uuidv7_pvt.h" />
     <ClInclude Include="..\..\src\include\switch_vad.h" />
     <ClInclude Include="..\..\src\include\switch_version.h" />
     <ClInclude Include="..\..\src\include\switch_vpx.h" />