This is in preparation of adding support for other UUID versions. --- addons/ot/src/scope.c | 2 +- include/haproxy/tools.h | 2 +- src/flt_spoe.c | 2 +- src/sample.c | 2 +- src/tools.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/addons/ot/src/scope.c b/addons/ot/src/scope.c index efe8fe29f6..8a4c02f3cf 100644 --- a/addons/ot/src/scope.c +++ b/addons/ot/src/scope.c @@ -113,7 +113,7 @@ struct flt_ot_runtime_context *flt_ot_runtime_context_init(struct stream *s, str LIST_INIT(&(retptr->contexts)); uuid = b_make(retptr->uuid, sizeof(retptr->uuid), 0, 0); - ha_generate_uuid(&uuid); + ha_generate_uuid_v4(&uuid); #ifdef USE_OT_VARS /* diff --git a/include/haproxy/tools.h b/include/haproxy/tools.h index 11082379c8..cbce218dc6 100644 --- a/include/haproxy/tools.h +++ b/include/haproxy/tools.h @@ -1056,7 +1056,7 @@ static inline void *my_realloc2(void *ptr, size_t size) int parse_dotted_uints(const char *s, unsigned int **nums, size_t *sz); /* PRNG */ -void ha_generate_uuid(struct buffer *output); +void ha_generate_uuid_v4(struct buffer *output); void ha_random_seed(const unsigned char *seed, size_t len); void ha_random_jump96(uint32_t dist); uint64_t ha_random64(void); diff --git a/src/flt_spoe.c b/src/flt_spoe.c index 3fc058c283..b180ba2dd5 100644 --- a/src/flt_spoe.c +++ b/src/flt_spoe.c @@ -249,7 +249,7 @@ static const char *spoe_appctx_state_str[SPOE_APPCTX_ST_END+1] = { static char * generate_pseudo_uuid() { - ha_generate_uuid(&trash); + ha_generate_uuid_v4(&trash); return my_strndup(trash.area, trash.data); } diff --git a/src/sample.c b/src/sample.c index 334782c173..8daa92424d 100644 --- a/src/sample.c +++ b/src/sample.c @@ -4794,7 +4794,7 @@ static int smp_check_uuid(struct arg *args, char **err) static int smp_fetch_uuid(const struct arg *args, struct sample *smp, const char *kw, void *private) { if (args[0].data.sint == 4 || !args[0].type) { - ha_generate_uuid(&trash); + ha_generate_uuid_v4(&trash); smp->data.type = SMP_T_STR; smp->flags = SMP_F_VOL_TEST | SMP_F_MAY_CHANGE; smp->data.u.str = trash; diff --git a/src/tools.c b/src/tools.c index 09de5db201..f3b095569a 100644 --- a/src/tools.c +++ b/src/tools.c @@ -5581,10 +5581,10 @@ void ha_random_jump96(uint32_t dist) } } -/* Generates an RFC4122 UUID into chunk <output> which must be at least 37 +/* Generates an RFC4122 version 4 UUID into chunk <output> which must be at least 37 * bytes large. */ -void ha_generate_uuid(struct buffer *output) +void ha_generate_uuid_v4(struct buffer *output) { uint32_t rnd[4]; uint64_t last; -- 2.43.2