diff options
-rw-r--r-- | res/res_pjsip.c | 13 | ||||
-rw-r--r-- | res/res_pjsip_authenticator_digest.c | 9 | ||||
-rw-r--r-- | res/res_pjsip_pubsub.c | 9 | ||||
-rw-r--r-- | res/res_pjsip_session.c | 9 |
4 files changed, 11 insertions, 29 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c index b87be9140..a7f684650 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -1978,11 +1978,7 @@ static int sip_dialog_create_from(pj_pool_t *pool, pj_str_t *from, const char *u char uuid_str[AST_UUID_STR_LEN]; if (ast_strlen_zero(user)) { - RAII_VAR(struct ast_uuid *, uuid, ast_uuid_generate(), ast_free_ptr); - if (!uuid) { - return -1; - } - user = ast_uuid_to_str(uuid, uuid_str, sizeof(uuid_str)); + user = ast_uuid_generate_str(uuid_str, sizeof(uuid_str)); } /* Parse the provided target URI so we can determine what transport it will end up using */ @@ -2731,14 +2727,9 @@ int ast_sip_append_body(pjsip_tx_data *tdata, const char *body_text) struct ast_taskprocessor *ast_sip_create_serializer(void) { struct ast_taskprocessor *serializer; - RAII_VAR(struct ast_uuid *, uuid, ast_uuid_generate(), ast_free_ptr); char name[AST_UUID_STR_LEN]; - if (!uuid) { - return NULL; - } - - ast_uuid_to_str(uuid, name, sizeof(name)); + ast_uuid_generate_str(name, sizeof(name)); serializer = ast_threadpool_serializer(name, sip_threadpool); if (!serializer) { diff --git a/res/res_pjsip_authenticator_digest.c b/res/res_pjsip_authenticator_digest.c index d0ce36afb..2688553e5 100644 --- a/res/res_pjsip_authenticator_digest.c +++ b/res/res_pjsip_authenticator_digest.c @@ -443,15 +443,16 @@ static struct ast_sip_authenticator digest_authenticator = { static int build_entity_id(void) { - RAII_VAR(struct ast_uuid *, uu, ast_uuid_generate(), ast_free_ptr); - RAII_VAR(char *, eid, ao2_alloc(AST_UUID_STR_LEN, NULL), ao2_cleanup); + char *eid; - if (!uu || !eid) { + eid = ao2_alloc(AST_UUID_STR_LEN, NULL); + if (!eid) { return -1; } - ast_uuid_to_str(uu, eid, AST_UUID_STR_LEN); + ast_uuid_generate_str(eid, AST_UUID_STR_LEN); ao2_global_obj_replace_unref(entity_id, eid); + ao2_ref(eid, -1); return 0; } diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c index da632d877..b4d0be98d 100644 --- a/res/res_pjsip_pubsub.c +++ b/res/res_pjsip_pubsub.c @@ -2188,6 +2188,7 @@ static void subscription_datastore_destroy(void *obj) struct ast_datastore *ast_sip_subscription_alloc_datastore(const struct ast_datastore_info *info, const char *uid) { RAII_VAR(struct ast_datastore *, datastore, NULL, ao2_cleanup); + char uuid_buf[AST_UUID_STR_LEN]; const char *uid_ptr = uid; if (!info) { @@ -2202,13 +2203,7 @@ struct ast_datastore *ast_sip_subscription_alloc_datastore(const struct ast_data datastore->info = info; if (ast_strlen_zero(uid)) { /* They didn't provide an ID so we'll provide one ourself */ - struct ast_uuid *uuid = ast_uuid_generate(); - char uuid_buf[AST_UUID_STR_LEN]; - if (!uuid) { - return NULL; - } - uid_ptr = ast_uuid_to_str(uuid, uuid_buf, sizeof(uuid_buf)); - ast_free(uuid); + uid_ptr = ast_uuid_generate_str(uuid_buf, sizeof(uuid_buf)); } datastore->uid = ast_strdup(uid_ptr); diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c index 3b924ac2f..42f7281a8 100644 --- a/res/res_pjsip_session.c +++ b/res/res_pjsip_session.c @@ -550,6 +550,7 @@ static void session_datastore_destroy(void *obj) struct ast_datastore *ast_sip_session_alloc_datastore(const struct ast_datastore_info *info, const char *uid) { RAII_VAR(struct ast_datastore *, datastore, NULL, ao2_cleanup); + char uuid_buf[AST_UUID_STR_LEN]; const char *uid_ptr = uid; if (!info) { @@ -564,13 +565,7 @@ struct ast_datastore *ast_sip_session_alloc_datastore(const struct ast_datastore datastore->info = info; if (ast_strlen_zero(uid)) { /* They didn't provide an ID so we'll provide one ourself */ - struct ast_uuid *uuid = ast_uuid_generate(); - char uuid_buf[AST_UUID_STR_LEN]; - if (!uuid) { - return NULL; - } - uid_ptr = ast_uuid_to_str(uuid, uuid_buf, sizeof(uuid_buf)); - ast_free(uuid); + uid_ptr = ast_uuid_generate_str(uuid_buf, sizeof(uuid_buf)); } datastore->uid = ast_strdup(uid_ptr); |