From a1c94fece82f2445e538de0c93345d34c4abdf17 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Thu, 28 Mar 2013 23:59:20 +0000 Subject: Add uuid wrapper API call ast_uuid_generate_str(). * Updated test_uuid.c to test the new API call. * Made system use the new API call to eliminate "10's of lines" where used. * Fixed untested ast_strdup() return in stasis_subscribe() by eliminating the need for it. struct stasis_subscription now contains the uniqueid[] string. * Fixed some issues in exchangecal_write_event(): Create uid with enough space for a UUID string to avoid a realloc. Fix off by one error if the calendar event provided a UUID string. There is no need to check for NULL before calling ast_free(). git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384302 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/sorcery.c | 10 +--------- main/stasis.c | 18 ++++-------------- main/uuid.c | 37 ++++++++++++++++++++++++++++++------- 3 files changed, 35 insertions(+), 30 deletions(-) (limited to 'main') diff --git a/main/sorcery.c b/main/sorcery.c index f7731d9c8..d0f2e7d5c 100644 --- a/main/sorcery.c +++ b/main/sorcery.c @@ -807,15 +807,7 @@ void *ast_sorcery_alloc(const struct ast_sorcery *sorcery, const char *type, con } if (ast_strlen_zero(id)) { - struct ast_uuid *uuid = ast_uuid_generate(); - - if (!uuid) { - ao2_ref(details, -1); - return NULL; - } - - ast_uuid_to_str(uuid, details->id, AST_UUID_STR_LEN); - ast_free(uuid); + ast_uuid_generate_str(details->id, sizeof(details->id)); } else { ast_copy_string(details->id, id, sizeof(details->id)); } diff --git a/main/stasis.c b/main/stasis.c index d1baa442b..2bd432a0c 100644 --- a/main/stasis.c +++ b/main/stasis.c @@ -106,7 +106,7 @@ const char *stasis_topic_name(const struct stasis_topic *topic) /*! \internal */ struct stasis_subscription { /*! Unique ID for this subscription */ - char *uniqueid; + char uniqueid[AST_UUID_STR_LEN]; /*! Topic subscribed to. */ struct stasis_topic *topic; /*! Mailbox for processing incoming messages. */ @@ -121,8 +121,6 @@ static void subscription_dtor(void *obj) { struct stasis_subscription *sub = obj; ast_assert(!stasis_subscription_is_subscribed(sub)); - ast_free(sub->uniqueid); - sub->uniqueid = NULL; ao2_cleanup(sub->topic); sub->topic = NULL; ast_taskprocessor_unreference(sub->mailbox); @@ -134,27 +132,19 @@ static void send_subscription_change_message(struct stasis_topic *topic, char *u struct stasis_subscription *stasis_subscribe(struct stasis_topic *topic, stasis_subscription_cb callback, void *data) { RAII_VAR(struct stasis_subscription *, sub, NULL, ao2_cleanup); - RAII_VAR(struct ast_uuid *, id, NULL, ast_free); - char uniqueid[AST_UUID_STR_LEN]; sub = ao2_alloc(sizeof(*sub), subscription_dtor); if (!sub) { return NULL; } - id = ast_uuid_generate(); - if (!id) { - ast_log(LOG_ERROR, "UUID generation failed\n"); - return NULL; - } - ast_uuid_to_str(id, uniqueid, sizeof(uniqueid)); + ast_uuid_generate_str(sub->uniqueid, sizeof(sub->uniqueid)); - sub->mailbox = ast_threadpool_serializer(uniqueid, pool); + sub->mailbox = ast_threadpool_serializer(sub->uniqueid, pool); if (!sub->mailbox) { return NULL; } - sub->uniqueid = ast_strdup(uniqueid); ao2_ref(topic, +1); sub->topic = topic; sub->callback = callback; @@ -163,7 +153,7 @@ struct stasis_subscription *stasis_subscribe(struct stasis_topic *topic, stasis_ if (topic_add_subscription(topic, sub) != 0) { return NULL; } - send_subscription_change_message(topic, uniqueid, "Subscribe"); + send_subscription_change_message(topic, sub->uniqueid, "Subscribe"); ao2_ref(sub, +1); return sub; diff --git a/main/uuid.c b/main/uuid.c index 46ac63d20..e95a4265e 100644 --- a/main/uuid.c +++ b/main/uuid.c @@ -38,13 +38,17 @@ struct ast_uuid { uuid_t uu; }; -struct ast_uuid *ast_uuid_generate(void) +/*! + * \internal + * \brief Generate a UUID. + * \since 12.0.0 + * + * \param uuid Fill this with a generated UUID. + * + * \return Nothing + */ +static void generate_uuid(struct ast_uuid *uuid) { - struct ast_uuid *uuid = ast_malloc(sizeof(*uuid)); - - if (!uuid) { - return NULL; - } /* libuuid provides three methods of generating uuids, * uuid_generate(), uuid_generate_random(), and uuid_generate_time(). * @@ -114,6 +118,16 @@ struct ast_uuid *ast_uuid_generate(void) if (!has_dev_urandom) { ast_mutex_unlock(&uuid_lock); } +} + +struct ast_uuid *ast_uuid_generate(void) +{ + struct ast_uuid *uuid = ast_malloc(sizeof(*uuid)); + + if (!uuid) { + return NULL; + } + generate_uuid(uuid); return uuid; } @@ -124,10 +138,19 @@ char *ast_uuid_to_str(const struct ast_uuid *uuid, char *buf, size_t size) return buf; } +char *ast_uuid_generate_str(char *buf, size_t size) +{ + struct ast_uuid uuid; + + generate_uuid(&uuid); + return ast_uuid_to_str(&uuid, buf, size); +} + struct ast_uuid *ast_str_to_uuid(const char *str) { struct ast_uuid *uuid = ast_malloc(sizeof(*uuid)); int res; + if (!uuid) { return NULL; } @@ -143,6 +166,7 @@ struct ast_uuid *ast_str_to_uuid(const char *str) struct ast_uuid *ast_uuid_copy(const struct ast_uuid *src) { struct ast_uuid *dst = ast_malloc(sizeof(*dst)); + if (!dst) { return NULL; } @@ -202,5 +226,4 @@ void ast_uuid_init(void) uuid_generate_random(uu); ast_debug(1, "UUID system initiated\n"); - return; } -- cgit v1.2.3