X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fuuid.cpp;h=4c64c08acedafe03de2e3d32b168146b97271134;hb=HEAD;hp=a820a8a4191defbef75ae63c2085540f8f5dfcae;hpb=328c2fe7297c941aa9cbcfa4ce944fca1bd7300f;p=lttng-tools.git

diff --git a/src/common/uuid.cpp b/src/common/uuid.cpp
index a820a8a41..4c64c08ac 100644
--- a/src/common/uuid.cpp
+++ b/src/common/uuid.cpp
@@ -6,7 +6,13 @@
  *
  */
 
+#include "uuid.hpp"
+
 #include <common/compat/string.hpp>
+#include <common/error.hpp>
+#include <common/format.hpp>
+#include <common/random.hpp>
+
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -14,8 +20,6 @@
 #include <string.h>
 #include <time.h>
 
-#include "uuid.hpp"
-
 namespace {
 const lttng_uuid nil_uuid = {};
 bool lttng_uuid_is_init;
@@ -23,13 +27,25 @@ bool lttng_uuid_is_init;
 
 void lttng_uuid_to_str(const lttng_uuid& uuid, char *uuid_str)
 {
-	sprintf(uuid_str, LTTNG_UUID_FMT, LTTNG_UUID_FMT_VALUES(uuid));
+	snprintf(uuid_str, LTTNG_UUID_STR_LEN, LTTNG_UUID_FMT, LTTNG_UUID_FMT_VALUES(uuid));
+}
+
+std::string lttng::utils::uuid_to_str(const lttng_uuid& uuid)
+{
+	std::string uuid_str(LTTNG_UUID_STR_LEN, '\0');
+
+	::lttng_uuid_to_str(uuid, &uuid_str[0]);
+
+	/* Don't include '\0' in the C++ string. */
+	uuid_str.resize(uuid_str.size() - 1);
+
+	return uuid_str;
 }
 
 int lttng_uuid_from_str(const char *str_in, lttng_uuid& uuid_out)
 {
 	int ret = 0;
-	lttng_uuid uuid_scan;
+	lttng_uuid uuid_scan = {};
 
 	if (str_in == nullptr) {
 		ret = -1;
@@ -42,9 +58,9 @@ int lttng_uuid_from_str(const char *str_in, lttng_uuid& uuid_out)
 	}
 
 	/* Scan to a temporary location in case of a partial match. */
-	if (sscanf(str_in, LTTNG_UUID_FMT, LTTNG_UUID_SCAN_VALUES(uuid_scan)) !=
-			LTTNG_UUID_LEN) {
+	if (sscanf(str_in, LTTNG_UUID_FMT, LTTNG_UUID_SCAN_VALUES(uuid_scan)) != LTTNG_UUID_LEN) {
 		ret = -1;
+		goto end;
 	}
 
 	uuid_out = uuid_scan;
@@ -65,18 +81,15 @@ int lttng_uuid_generate(lttng_uuid& uuid_out)
 	int i, ret = 0;
 
 	if (!lttng_uuid_is_init) {
-		/*
-		 * We don't need cryptographic quality randomness to
-		 * generate UUIDs, seed rand with the epoch.
-		 */
-		const time_t epoch = time(NULL);
-
-		if (epoch == (time_t) -1) {
+		try {
+			srand(lttng::random::produce_best_effort_random_seed());
+		} catch (const std::exception& e) {
+			ERR("Failed to initialize random seed during generation of UUID: %s",
+			    e.what());
 			ret = -1;
 			goto end;
 		}
 
-		srand(epoch);
 		lttng_uuid_is_init = true;
 	}