RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-28 13:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: tools: Rename ha_generate_uuid to ha_generate_uuid_v4

Browse Source 
This is in preparation of adding support for other UUID versions.
This commit is contained in:
Tim Duesterhus 2024-04-19 21:01:25 +02:00 committed by Willy Tarreau
parent 19f8762a98
commit c6cea750a9
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/ot/src/scope.c
View File

@ -113,7 +113,7 @@ struct flt_ot_runtime_context *flt_ot_runtime_context_init(struct stream *s, str
LIST_INIT(&(retptr->contexts)); LIST_INIT(&(retptr->contexts));
uuid = b_make(retptr->uuid, sizeof(retptr->uuid), 0, 0); uuid = b_make(retptr->uuid, sizeof(retptr->uuid), 0, 0);
ha_generate_uuid(&uuid); ha_generate_uuid_v4(&uuid);
#ifdef USE_OT_VARS #ifdef USE_OT_VARS
/* /*

2
include/haproxy/tools.h
View File

@ -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); int parse_dotted_uints(const char *s, unsigned int **nums, size_t *sz);
/* PRNG */ /* 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_seed(const unsigned char *seed, size_t len);
void ha_random_jump96(uint32_t dist); void ha_random_jump96(uint32_t dist);
uint64_t ha_random64(void); uint64_t ha_random64(void);

2
src/flt_spoe.c
View File

@ -249,7 +249,7 @@ static const char *spoe_appctx_state_str[SPOE_APPCTX_ST_END+1] = {
static char * static char *
generate_pseudo_uuid() generate_pseudo_uuid()
{ {
ha_generate_uuid(&trash); ha_generate_uuid_v4(&trash);
return my_strndup(trash.area, trash.data); return my_strndup(trash.area, trash.data);
} }

2
src/sample.c
View File

@ -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) 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) { 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->data.type = SMP_T_STR;
smp->flags = SMP_F_VOL_TEST | SMP_F_MAY_CHANGE; smp->flags = SMP_F_VOL_TEST | SMP_F_MAY_CHANGE;
smp->data.u.str = trash; smp->data.u.str = trash;

4
src/tools.c
View File

@ -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. * bytes large.
*/ */
void ha_generate_uuid(struct buffer *output) void ha_generate_uuid_v4(struct buffer *output)
{ {
uint32_t rnd[4]; uint32_t rnd[4];
uint64_t last; uint64_t last;